diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-08-15 03:19:25 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-08-15 03:19:25 +0000 |
| commit | 4acba7611290bd479f9e241bb250c4b02e882f94 (patch) | |
| tree | a9d3801eb7f85eeb65c83a0ad4c24e4ddbec27a5 /main | |
| parent | 3feb2747624921c5d5b50910180a15e0641787e3 (diff) | |
| parent | 36391698192e29551a9bf815633b973c4faa4415 (diff) | |
| download | aports-4acba7611290bd479f9e241bb250c4b02e882f94.tar.bz2 aports-4acba7611290bd479f9e241bb250c4b02e882f94.tar.xz | |
Merge remote branch 'alpine/master'
Conflicts:
main/vsftpd/APKBUILD
Diffstat (limited to 'main')
63 files changed, 5785 insertions, 3951 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index d123e77540..f1d6b6cd8f 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.4 -pkgrel=1 +pkgver=2.5 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - remove-mkalpine.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -34,5 +33,4 @@ package() { install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="84cde3b9c263b91b2381591a6342aaa6 abuild-2.4.tar.bz2 -feea2c852e422e910613c5528b40c5d5 remove-mkalpine.patch" +md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2" diff --git a/main/abuild/abuild-conflict-message.patch b/main/abuild/abuild-conflict-message.patch deleted file mode 100644 index b560634adb..0000000000 --- a/main/abuild/abuild-conflict-message.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit c30c346362223658980275d54d5b7911a3a7486c -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed Jun 30 14:59:07 2010 +0000 - - abuild: detect and report conflicting dependencies properly - -diff --git a/abuild.in b/abuild.in -index 0c94653..4034a86 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -841,15 +841,16 @@ builddeps() { - # find which deps are missing - for i in $deps; do - if [ "${i#\!}" != "$i" ]; then -- list_has ${i#\!} $installed_deps \ -+ $APK info -q -e "${i#\!}" \ - && conflicts="$conflicts ${i#\!}" - elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then - missing="$missing $i" - fi - done -- -+ - if [ -n "$conflicts" ]; then -- die "Conflicting package(s) installed:$conflics" -+ error "Conflicting package(s) installed:$conflicts" -+ return 1 - fi - - if [ -z "$install_deps" ] && [ -z "$recursive" ]; then diff --git a/main/abuild/remove-mkalpine.patch b/main/abuild/remove-mkalpine.patch deleted file mode 100644 index 867b0033b1..0000000000 --- a/main/abuild/remove-mkalpine.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit af22a92fa6f4e787ac6c4a22bedb65b66786427a -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue Jul 20 11:31:43 2010 +0000 - - mkalpine: removed - -diff --git a/Makefile b/Makefile -index 7f20208..da99953 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,7 @@ sysconfdir ?= /etc - datadir ?= $(prefix)/share/$(PACKAGE) - abuildrepo ?= ~/.cache/apks - --SCRIPTS := abuild devbuild mkalpine buildrepo abuild-keygen \ -+SCRIPTS := abuild devbuild buildrepo abuild-keygen \ - abuild-sign newapkbuild - USR_BIN_FILES := $(SCRIPTS) abuild-tar - SAMPLES := sample.APKBUILD sample.initd sample.confd \ -diff --git a/mkalpine.in b/mkalpine.in -deleted file mode 100755 -index e31980a..0000000 ---- a/mkalpine.in -+++ /dev/null -@@ -1,40 +0,0 @@ --#!/bin/sh -- --# check if what we need is here --needed="cramfs syslinux cdrkit" --for i in $needed; do -- if ! apk info -e $i; then -- missing="$missing $i" -- fi --done -- --# try install the missing parts --if [ -n "$missing" ]; then -- if ! sudo apk add $missing; then -- echo "Need $missing to build alpine" >&2 -- exit 1 -- fi --fi -- --# first look for alpine.mk in current dir. Fallback to /usr/share/abuild --mk=./alpine.mk --if ! [ -f $mk ]; then -- mk=/usr/share/abuild/alpine.mk --fi -- --make -f "$mk" APK_BIN= $@ --rc=$? -- --# beep when done --if [ $rc -eq 0 ]; then -- for i in $(seq 0 3); do -- echo -n -e "\007" -- sleep 0.2 -- done --fi -- --# uninstall the stuff we installed --[ -n "$missing" ] && sudo apk del $missing -- -- --exit $? diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD new file mode 100644 index 0000000000..101c0f660e --- /dev/null +++ b/main/apache2/APKBUILD @@ -0,0 +1,197 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=apache2 +pkgver=2.2.16 +pkgrel=3 +pkgdesc="A high performance Unix-based HTTP server" +url="http://httpd.apache.org/" +license="APACHE" +depends="" +pkgusers="apache" +pkggroups="apache" +makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev + autoconf automake" +subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-ssl + $pkgname-ldap" +source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2 + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/03-add-mpm-to-build-system.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/04-correct-output-makefile-location.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/05-add-copyright.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/06-hook-just-after-merging-perdir-config.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/07-base-functionality.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/08-max-clients-per-vhost.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/09-capabilities.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/10-nice.patch + apache2.confd + apache2.logrotate + apache2.initd + httpd.conf + ssl.conf + ldap.conf + alpine.layout" + +prepare() { + cd "$srcdir" + cat "$srcdir/alpine.layout" >> httpd-$pkgver/config.layout + + # create symlinks to soruces for prefork and worker + ln -s httpd-$pkgver prefork + ln -s httpd-$pkgver worker + + # make a patched clone of itk sources + cp -ra httpd-$pkgver itk + cd itk + mkdir -p server/mpm/experimental/itk + cp -r server/mpm/prefork/* \ + server/mpm/experimental/itk/ || return 1 + mv server/mpm/experimental/itk/prefork.c \ + server/mpm/experimental/itk/itk.c || return 1 + patch -Np1 -i "$srcdir/02-rename-prefork-to-itk.patch" || return 1 + patch -Np1 -i "$srcdir/03-add-mpm-to-build-system.patch" || return 1 + patch -Np1 -i "$srcdir/04-correct-output-makefile-location.patch" || return 1 + patch -Np1 -i "$srcdir/05-add-copyright.patch" || return 1 + patch -Np1 -i "$srcdir/06-hook-just-after-merging-perdir-config.patch" || return 1 + patch -Np1 -i "$srcdir/07-base-functionality.patch" || return 1 + patch -Np1 -i "$srcdir/08-max-clients-per-vhost.patch" || return 1 + patch -Np1 -i "$srcdir/09-capabilities.patch" || return 1 + patch -Np1 -i "$srcdir/10-nice.patch" || return 1 + autoconf || return 1 +} + +_buildmpm() { + local mpm=$1 + shift + mkdir "$srcdir"/build-${mpm} + cd "$srcdir"/build-${mpm} + "$srcdir"/$mpm/configure --prefix=/usr \ + --enable-layout=Alpine \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=http \ + --with-suexec-docroot=/var/www/localhost/htdocs \ + --with-suexec-logfile=/var/log/httpd/suexec.log \ + --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-uidmin=99 \ + --with-suexec-gidmin=99 \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr \ + --with-mpm=${mpm} \ + $@ \ + || return 1 + make || return 1 +} + +build () { + local mpm + + # build prefork with everything + _buildmpm prefork \ + --enable-mods-shared=all \ + --enable-ssl --with-ssl \ + --enable-proxy \ + --enable-cache \ + --enable-disk-cache \ + --enable-mem-cache \ + --enable-file-cache \ + --enable-ldap --enable-authnz-ldap \ + --enable-cgid \ + --enable-authn-anon --enable-authn-alias \ + --disable-imagemap \ + --enable-proxy-connect \ + --enable-proxy-http \ + --enable-proxy-ftp \ + --enable-deflate \ + --enable-dbd \ + || return 1 + + #build the alternative mpms, but without modules + for mpm in worker itk; do + _buildmpm $mpm --enable-modules=none + done +} + +package() { + cd "$srcdir"/build-prefork + make -j1 DESTDIR="$pkgdir" install || return 1 + for mpm in worker itk; do + install -m755 "$srcdir"/build-$mpm/httpd \ + "$pkgdir/usr/sbin/httpd.${mpm}" || return 1 + done + + # config + rm -r "$pkgdir"/etc/apache2/httpd.conf \ + "$pkgdir"/etc/apache2/extra + install -D -m644 "$srcdir"/httpd.conf "$pkgdir"/etc/apache2/httpd.conf + install -d "$pkgdir"/etc/apache2/conf.d + + # init scripts and logrotate + install -D -m755 "$srcdir/apache2.initd" \ + "$pkgdir/etc/init.d/apache2" || return 1 + install -D -m644 "$srcdir/apache2.logrotate" \ + "$pkgdir/etc/logrotate.d/apache2" || return 1 + install -D -m644 "$srcdir/apache2.confd" \ + "$pkgdir/etc/conf.d/apache2" || return 1 + + install -d "$pkgdir"/var/www + ln -fs /var/log/apache2 "$pkgdir/var/www/logs" + ln -fs /var/run/apache2 "$pkgdir/var/www/run" + ln -fs /usr/lib/apache2 "$pkgdir/var/www/modules" + ln -fs /etc/apache2/conf.d "$pkgdir/var/www/conf.d" +} + +# include the builddir and apxs in -dev package +dev() { + default_dev + depends="$depends perl apr-util-dev" + install -d "$subpkgdir"/usr/share/apache2/ \ + "$subpkgdir"/usr/sbin + mv "$pkgdir"/usr/sbin/apxs "$subpkgdir"/usr/sbin/ || return 1 + mv "$pkgdir"/usr/share/apache2/build "$subpkgdir"/usr/share/apache2/ +} + +utils() { + pkgdesc="Apache utility programs for webservers" + install -d "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin + cd "$pkgdir"/usr/sbin + mv ab dbmmanage htdbm htdigest htpasswd logresolve "$subpkgdir"/usr/bin + mv checkgid htcacheclean rotatelogs "$subpkgdir"/usr/sbin +} + +ssl() { + pkgdesc="SSL/TLS module for the Apache HTTP Server" + install="apache2-ssl.post-install" + depends="apache2 openssl" + install -d "$subpkgdir"/usr/lib/apache2 \ + "$subpkgdir"/etc/ssl/apache2 + mv "$pkgdir"/usr/lib/apache2/mod_ssl.so "$subpkgdir"/usr/lib/apache2/ \ + || return 1 + install -m644 -D "$srcdir"/ssl.conf "$subpkgdir"/etc/apache2/conf.d/ssl.conf +} + +ldap() { + pkgdesc="LDAP authentication/authorization module for the Apache HTTP Server" + url="http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html" + depends="apache2" + install -d "$subpkgdir"/usr/lib/apache2 + mv "$pkgdir"/usr/lib/apache2/mod_*ldap*.so "$subpkgdir"/usr/lib/apache2 + install -m644 -D "$srcdir"/ldap.conf "$subpkgdir"/etc/apache2/conf.d/ldap.conf +} + +md5sums="c8ff2a07c884300bc7766a2e7f662d33 httpd-2.2.16.tar.bz2 +db42cfcc18ae1c32aaaff2347e35b79d 02-rename-prefork-to-itk.patch +131408ad4dc7b18547b4e062e7e495ab 03-add-mpm-to-build-system.patch +ee488f391054d528547c3a372faa2aa7 04-correct-output-makefile-location.patch +b202944761b2f0516196488b12504236 05-add-copyright.patch +78fa15f8ca3a284b7d71f942e24e47fb 06-hook-just-after-merging-perdir-config.patch +d33e39350e987721d50e6fb8e164ab6b 07-base-functionality.patch +9f7a8935f9cabc7b46d0052906634cef 08-max-clients-per-vhost.patch +1b28e3363e1b0d05b738a21e7ddd264f 09-capabilities.patch +d9667fcd2ffecc63e446edd4d6666731 10-nice.patch +e322b5211e49511cac6e40c86af1b1da apache2.confd +75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate +0261136ff734c3ae8dcf878a46ed5830 apache2.initd +1dfc079be3fec873b67bca19b60c56b1 httpd.conf +5d0d024ca43571b863874ab871b2c109 ssl.conf +b70fe826486043e3953cfe21f9e6fa16 ldap.conf +c66ff5f70260d5266e6803a59b39bd7f alpine.layout" diff --git a/main/apache2/alpine.layout b/main/apache2/alpine.layout new file mode 100644 index 0000000000..99f20df529 --- /dev/null +++ b/main/apache2/alpine.layout @@ -0,0 +1,22 @@ +<Layout Alpine> + prefix: /usr + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin + libdir: ${prefix}/lib + libexecdir: ${prefix}/lib+ + mandir: ${prefix}/share/man + sysconfdir: /etc+ + datadir: ${prefix}/share+ + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: /var/www/localhost/htdocs + manualdir: /usr/share/doc/apache2/manual + cgidir: /var/www/cgi-bin + includedir: /usr/include+ + localstatedir: /var + runtimedir: ${localstatedir}/run+ + logfiledir: ${localstatedir}/log+ + proxycachedir: ${localstatedir}/cache+ +</Layout> diff --git a/main/apache2/apache2-ssl.post-install b/main/apache2/apache2-ssl.post-install new file mode 100644 index 0000000000..d73b5fc622 --- /dev/null +++ b/main/apache2/apache2-ssl.post-install @@ -0,0 +1,32 @@ +#!/bin/sh + +ssldir=/etc/ssl/apache2 +sslkey=$ssldir/server.key +sslcert=$ssldir/server.pem + +umask 077 + +if [ ! -f ${sslkey} ] ; then + openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > ${sslkey} 2> /dev/null +fi + +FQDN=`hostname -f` +if [ "x${FQDN}" = "x" ]; then + FQDN=localhost.localdomain +fi + +if [ ! -f ${sslcert} ] ; then +cat << EOF | openssl req -new -key ${sslkey} \ + -x509 -days 365 -set_serial $RANDOM \ + -out ${sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF +fi + + diff --git a/main/apache2/apache2.confd b/main/apache2/apache2.confd new file mode 100644 index 0000000000..faf02fa979 --- /dev/null +++ b/main/apache2/apache2.confd @@ -0,0 +1,54 @@ +# /etc/conf.d/apache2: config file for /etc/init.d/apache2 + +# +# The default processing model (MPM) is the process-based +# 'prefork' model. A thread-based model, 'worker', is also +# available, but does not work with some modules (such as PHP). +# +#HTTPD=/usr/sbin/httpd.worker + +HTTPD="/usr/sbin/httpd" + +# +# To pass additional options (for instance, -D definitions) to the +# httpd binary at startup, set HTTPD_OPTS here. +# +HTTPD_OPTS= + +# Extended options for advanced uses of Apache ONLY +# You don't need to edit these unless you are doing crazy Apache stuff +# As not having them set correctly, or feeding in an incorrect configuration +# via them will result in Apache failing to start +# YOU HAVE BEEN WARNED. + +# PID file +#PIDFILE=/var/run/apache2/httpd.pid + +# timeout for startup/shutdown checks +#TIMEOUT=10 + +# ServerRoot setting +#SERVERROOT=/var/www + +# Configuration file location +# - If this does NOT start with a '/', then it is treated relative to +# $SERVERROOT by Apache +#CONFIGFILE=/etc/apache2/httpd.conf + +# Location to log startup errors to +# They are normally dumped to your terminal. +#STARTUPERRORLOG="/var/log/apache2/startuperror.log" + +# A command that outputs a formatted text version of the HTML at the URL +# of the command line. Designed for lynx, however other programs may work. +#LYNX="lynx -dump" + +# The URL to your server's mod_status status page. +# Required for status and fullstatus +#STATUSURL="http://localhost/server-status" + +# Method to use when reloading the server +# Valid options are 'restart' and 'graceful' +# See http://httpd.apache.org/docs/2.2/stopping.html for information on +# what they do and how they differ. +#RELOAD_TYPE="graceful" diff --git a/main/apache2/apache2.initd b/main/apache2/apache2.initd new file mode 100755 index 0000000000..03a6d03032 --- /dev/null +++ b/main/apache2/apache2.initd @@ -0,0 +1,154 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +opts="configdump configtest fullstatus graceful gracefulstop modules reload virtualhosts" + +depend() { + need net + use mysql dns logger netmount postgresql + after sshd +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +checkconfd() { + PIDFILE="${PIDFILE:-/var/run/apache2/httpd.pid}" + TIMEOUT=${TIMEOUT:-10} + + SERVERROOT="${SERVERROOT:-/var/www}" + if [ ! -d ${SERVERROOT} ]; then + eerror "SERVERROOT does not exist: ${SERVERROOT}" + return 1 + fi + + CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}" + [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}" + if [ ! -r "${CONFIGFILE}" ]; then + eerror "Unable to read configuration file: ${CONFIGFILE}" + return 1 + fi + + HTTPD_OPTS="${HTTPD_OPTS} -d ${SERVERROOT}" + HTTPD_OPTS="${HTTPD_OPTS} -f ${CONFIGFILE}" + [ -n "${STARTUPERRORLOG}" ] && HTTPD_OPTS="${HTTPD_OPTS} -E ${STARTUPERRORLOG}" + return 0 + +} + +checkconfig() { + checkconfd || return 1 + + ${HTTPD} ${HTTPD_OPTS} -t 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your setup:" + ${HTTPD} ${HTTPD_OPTS} -t + fi + + return $ret +} + +start() { + checkconfig || return 1 + + [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${HTTPD} \ + -- ${HTTPD_OPTS} -k start + eend $? +} + +stop() { + checkconfd || return 1 + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry ${TIMEOUT} + eend $? +} + +reload() { + RELOAD_TYPE="${RELOAD_TYPE:-graceful}" + + checkconfig || return 1 + service_started "${SVCNAME}" || return + + if [ "${RELOAD_TYPE}" = "restart" ]; then + ebegin "Restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k restart + eend $? + elif [ "${RELOAD_TYPE}" = "graceful" ]; then + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? + else + eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}" + fi +} + +graceful() { + checkconfig || return 1 + service_started "${SVCNAME}" || return + ebegin "Gracefully restarting ${SVCNAME}" + ${HTTPD} ${HTTPD_OPTS} -k graceful + eend $? +} + +gracefulstop() { + checkconfig || return 1 + ebegin "Gracefully stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${HTTPD} \ + --retry SIGWINCH/${TIMEOUT} + eend $? +} + +modules() { + checkconfig || return 1 + + ${HTTPD} ${HTTPD_OPTS} -M 2>&1 +} + +fullstatus() { + LYNX="${LYNX:-lynx -dump}" + STATUSURL="${STATUSURL:-http://localhost/server-status}" + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not found! you need to emerge www-client/lynx" + else + ${LYNX} ${STATUSURL} + fi +} + +virtualhosts() { + checkconfd || return 1 + ${HTTPD} ${HTTPD_OPTS} -S +} + +configdump() { + LYNX="${LYNX:-lynx -dump}" + INFOURL="${INFOURL:-http://localhost/server-info}" + + checkconfd || return 1 + + if ! service_started "${SVCNAME}"; then + eerror "${SVCNAME} not started" + elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + eerror "lynx not found! you need to emerge www-client/lynx" + else + echo "${HTTPD} started with '${HTTPD_OPTS}'" + for i in config server list; do + ${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q' + done + fi +} + diff --git a/main/apache2/apache2.logrotate b/main/apache2/apache2.logrotate new file mode 100644 index 0000000000..fe19a4381f --- /dev/null +++ b/main/apache2/apache2.logrotate @@ -0,0 +1,10 @@ +/var/log/apache2/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /sbin/rc-service --quiet apache2 reload > /dev/null 2>/dev/null || true + endscript +} + diff --git a/main/apache2/httpd.conf b/main/apache2/httpd.conf new file mode 100644 index 0000000000..88d983a9b2 --- /dev/null +++ b/main/apache2/httpd.conf @@ -0,0 +1,1007 @@ +# +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information. +# In particular, see +# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html> +# for a discussion of each configuration directive. +# +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# The configuration directives are grouped into three basic sections: +# 1. Directives that control the operation of the Apache server process as a +# whole (the 'global environment'). +# 2. Directives that define the parameters of the 'main' or 'default' server, +# which responds to requests that aren't handled by a virtual host. +# These directives also provide default values for the settings +# of all virtual hosts. +# 3. Settings for virtual hosts, which allow Web requests to be sent to +# different IP addresses or hostnames and have them handled by the +# same Apache server process. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" +# with ServerRoot set to "/etc/httpd" will be interpreted by the +# server as "/etc/httpd/logs/foo.log". +# + +### Section 1: Global Environment +# +# The directives in this section affect the overall operation of Apache, +# such as the number of concurrent requests it can handle or where it +# can find its configuration files. +# + +# +# Don't give away too much information about all the subcomponents +# we are running. Comment out this line if you don't mind remote sites +# finding out what major optional modules you are running +ServerTokens OS + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the LockFile documentation +# (available at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +ServerRoot "/var/www" + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. Note the PIDFILE variable in +# /etc/conf.d/apache2 must be set appropriately if this location is +# changed. +# +PidFile run/httpd.pid + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 60 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive Off + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 5 + +## +## Server-Pool Size Regulation (MPM specific) +## + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# ServerLimit: maximum value for MaxClients for the lifetime of the server +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves +<IfModule prefork.c> +StartServers 8 +MinSpareServers 5 +MaxSpareServers 20 +ServerLimit 256 +MaxClients 256 +MaxRequestsPerChild 4000 +</IfModule> + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves +<IfModule worker.c> +StartServers 4 +MaxClients 300 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 0 +</IfModule> + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, in addition to the default. See also the <VirtualHost> +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule auth_digest_module modules/mod_auth_digest.so +LoadModule authn_file_module modules/mod_authn_file.so +LoadModule authn_alias_module modules/mod_authn_alias.so +LoadModule authn_anon_module modules/mod_authn_anon.so +LoadModule authn_dbm_module modules/mod_authn_dbm.so +LoadModule authn_default_module modules/mod_authn_default.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule authz_owner_module modules/mod_authz_owner.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_dbm_module modules/mod_authz_dbm.so +LoadModule authz_default_module modules/mod_authz_default.so +LoadModule include_module modules/mod_include.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule logio_module modules/mod_logio.so +LoadModule env_module modules/mod_env.so +LoadModule ext_filter_module modules/mod_ext_filter.so +LoadModule mime_magic_module modules/mod_mime_magic.so +LoadModule expires_module modules/mod_expires.so +LoadModule deflate_module modules/mod_deflate.so +LoadModule headers_module modules/mod_headers.so +LoadModule usertrack_module modules/mod_usertrack.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule mime_module modules/mod_mime.so +LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +LoadModule info_module modules/mod_info.so +LoadModule dav_fs_module modules/mod_dav_fs.so +LoadModule vhost_alias_module modules/mod_vhost_alias.so +LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +LoadModule actions_module modules/mod_actions.so +LoadModule speling_module modules/mod_speling.so +LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule substitute_module modules/mod_substitute.so +LoadModule rewrite_module modules/mod_rewrite.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +LoadModule proxy_connect_module modules/mod_proxy_connect.so +LoadModule cache_module modules/mod_cache.so +LoadModule suexec_module modules/mod_suexec.so +LoadModule disk_cache_module modules/mod_disk_cache.so +LoadModule cgi_module modules/mod_cgi.so +LoadModule version_module modules/mod_version.so + +# +# The following modules are not loaded by default: +# +#LoadModule asis_module modules/mod_asis.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule cgid_module modules/mod_cgid.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule filter_module modules/mod_filter.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule unique_id_module modules/mod_unique_id.so +# + +# +# Load config files from the config directory "/etc/apache2/conf.d". +# +Include /etc/apache2/conf.d/*.conf + +# +# ExtendedStatus controls whether Apache will generate "full" status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the "server-status" handler is called. The default is Off. +# +#ExtendedStatus On + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# . On SCO (ODT 3) use "User nouser" and "Group nogroup". +# . On HPUX you may not be able to use shared memory as nobody, and the +# suggested workaround is to create a user www and use that user. +# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) +# when the value of (unsigned)Group is above 60000; +# don't use Group #-1 on these systems! +# +User apache +Group apache + +### Section 2: 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# <VirtualHost> definition. These values also provide defaults for +# any <VirtualHost> containers you may define later in the file. +# +# All of these directives may appear inside <VirtualHost> containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If this is not set to valid DNS name for your host, server-generated +# redirections will not work. See also the UseCanonicalName directive. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# You will have to access it by its address anyway, and this will make +# redirections work in a sensible way. +# +#ServerName www.example.com:80 + +# +# UseCanonicalName: Determines how Apache constructs self-referencing +# URLs and the SERVER_NAME and SERVER_PORT variables. +# When set "Off", Apache will use the Hostname and Port supplied +# by the client. When set "On", Apache will use the value of the +# ServerName directive. +# +UseCanonicalName Off + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/var/www/localhost/htdocs" + +# +# Each directory to which Apache has access can be configured with respect +# to which services and features are allowed and/or disabled in that +# directory (and its subdirectories). +# +# First, we configure the "default" to be a very restrictive set of +# features. +# +<Directory /> + Options FollowSymLinks + AllowOverride None +</Directory> + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# This should be changed to whatever you set DocumentRoot to. +# +<Directory "/var/www/localhost/htdocs"> + +# +# Possible values for the Options directive are "None", "All", +# or any combination of: +# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews +# +# Note that "MultiViews" must be named *explicitly* --- "Options All" +# doesn't give it to you. +# +# The Options directive is both complicated and important. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#options +# for more information. +# + Options Indexes FollowSymLinks + +# +# AllowOverride controls what directives may be placed in .htaccess files. +# It can be "All", "None", or any combination of the keywords: +# Options FileInfo AuthConfig Limit +# + AllowOverride None + +# +# Controls who can get stuff from this server. +# + Order allow,deny + Allow from all + +</Directory> + +# +# UserDir: The name of the directory that is appended onto a user's home +# directory if a ~user request is received. +# +# The path to the end user account 'public_html' directory must be +# accessible to the webserver userid. This usually means that ~userid +# must have permissions of 711, ~userid/public_html must have permissions +# of 755, and documents contained therein must be world-readable. +# Otherwise, the client will only receive a "403 Forbidden" message. +# +# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden +# +<IfModule mod_userdir.c> + # + # UserDir is disabled by default since it can confirm the presence + # of a username on the system (depending on home directory + # permissions). + # + UserDir disabled + + # + # To enable requests to /~user/ to serve the user's public_html + # directory, remove the "UserDir disabled" line above, and uncomment + # the following line instead: + # + #UserDir public_html + +</IfModule> + +# +# Control access to UserDir directories. The following is an example +# for a site where these directories are restricted to read-only. +# +#<Directory /home/*/public_html> +# AllowOverride FileInfo AuthConfig Limit +# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec +# <Limit GET POST OPTIONS> +# Order allow,deny +# Allow from all +# </Limit> +# <LimitExcept GET POST OPTIONS> +# Order deny,allow +# Deny from all +# </LimitExcept> +#</Directory> + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Option can be used for the +# same purpose, but it is much slower. +# +DirectoryIndex index.html index.html.var + +# +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# +<Files ~ "^\.ht"> + Order allow,deny + Deny from all + Satisfy All +</Files> + +# +# TypesConfig describes where the mime.types file (or equivalent) is +# to be found. +# +TypesConfig /etc/apache2/mime.types + +# +# DefaultType is the default MIME type the server will use for a document +# if it cannot otherwise determine one, such as from filename extensions. +# If your server contains mostly text or HTML documents, "text/plain" is +# a good value. If most of your content is binary, such as applications +# or images, you may want to use "application/octet-stream" instead to +# keep browsers from trying to display binary files as though they are +# text. +# +DefaultType text/plain + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +<IfModule mod_mime_magic.c> +# MIMEMagicFile /usr/share/magic.mime + MIMEMagicFile conf/magic +</IfModule> + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# +# EnableMMAP: Control whether memory-mapping is used to deliver +# files (assuming that the underlying OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. On some systems, turning it off (regardless of +# filesystem) can improve performance; for details, please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap +# +#EnableMMAP off + +# +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +# +#EnableSendfile off + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a <VirtualHost> +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a <VirtualHost> +# container, that host's errors will be logged there and not here. +# +ErrorLog logs/error.log + +# +# LogLevel: Control the number of messages logged to the error.log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + +# +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +# +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this +# requires the mod_logio module to be loaded. +#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + +# +# The location and format of the access logfile (Common Logfile Format). +# If you do not define any access logfiles within a <VirtualHost> +# container, they will be logged here. Contrariwise, if you *do* +# define per-<VirtualHost> access logfiles, transactions will be +# logged therein and *not* in this file. +# +#CustomLog logs/access.log common + +# +# If you would like to have separate agent and referer logfiles, uncomment +# the following directives. +# +#CustomLog logs/referer.log referer +#CustomLog logs/agent.log agent + +# +# For a single logfile with access, agent, and referer information +# (Combined Logfile Format), use the following directive: +# +CustomLog logs/access.log combined + +# +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +# +ServerSignature On + +# +# Aliases: Add here as many aliases as you need (with no limit). The format is +# Alias fakename realname +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/". If the fakename is slash-terminated, then the +# realname must also be slash terminated, and if the fakename omits the +# trailing slash, the realname must also omit it. +# +# We include the /icons/ alias for FancyIndexed directory listings. If you +# do not use FancyIndexing, you may comment this out. +# +Alias /icons/ "/usr/share/apache2/icons/" + +<Directory "/usr/share/apache2/icons"> + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + Allow from all +</Directory> + +# +# WebDAV module configuration section. +# +<IfModule mod_dav_fs.c> + # Location of the WebDAV lock database. + DAVLockDB /var/lib/dav/lockdb +</IfModule> + +# +# ScriptAlias: This controls which directories contain server scripts. +# ScriptAliases are essentially the same as Aliases, except that +# documents in the realname directory are treated as applications and +# run by the server when requested rather than as documents sent to the client. +# The same rules about trailing "/" apply to ScriptAlias directives as to +# Alias. +# +ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# +<Directory "/var/www/cgi-bin"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + +# +# Redirect allows you to tell clients about documents which used to exist in +# your server's namespace, but do not anymore. This allows you to tell the +# clients where to look for the relocated document. +# Example: +# Redirect permanent /foo http://www.example.com/bar + +# +# Directives controlling the display of server-generated directory listings. +# + +# +# IndexOptions: Controls the appearance of server-generated directory +# listings. +# +IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8 + +# +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +# +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +# +DefaultIcon /icons/unknown.gif + +# +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename +# +#AddDescription "GZIP compressed document" .gz +#AddDescription "tar archive" .tar +#AddDescription "GZIP compressed tar archive" .tgz + +# +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. +# +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +# +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + +# +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# * It is generally better to not mark a page as +# * being a certain language than marking it with the wrong +# * language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +# +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +# +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW + +# +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +# +ForceLanguagePriority Prefer Fallback + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + +# +# AddType allows you to add to or override the MIME configuration +# file mime.types for specific file types. +# +#AddType application/x-tar .tgz + +# +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +# Despite the name similarity, the following Add* directives have nothing +# to do with the FancyIndexing customization directives above. +# +#AddEncoding x-compress .Z +#AddEncoding x-gzip .gz .tgz + +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +# +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz + +# +# MIME-types for downloading Certificates and CRLs +# +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl + +# +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) +# +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +# +#AddHandler cgi-script .cgi + +# +# For files that include their own HTTP headers: +# +#AddHandler send-as-is asis + +# +# For type maps (negotiated resources): +# (This is enabled by default to allow the Apache "It Worked" page +# to be distributed in multiple languages.) +# +AddHandler type-map var + +# +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +# +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml + +# +# Action lets you define media types that will execute a script whenever +# a matching file is called. This eliminates the need for repeated URL +# pathnames for oft-used CGI file processors. +# Format: Action media/type /cgi-script/location +# Format: Action handler-name /cgi-script/location +# + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# Putting this all together, we can internationalize error responses. +# +# We use Alias to redirect any /error/HTTP_<error>.html.var response to +# our collection of by-error message multi-language collections. We use +# includes to substitute the appropriate text. +# +# You can modify the messages' appearance without changing any of the +# default HTTP_<error>.html.var files by adding the line: +# +# Alias /error/include/ "/your/include/path/" +# +# which allows you to create your own set of files by starting with the +# /var/www/error/include/ files and +# copying them to /your/include/path/, even on a per-VirtualHost basis. +# + +Alias /error/ "/usr/share/apache2/error/" + +<IfModule mod_negotiation.c> +<IfModule mod_include.c> + <Directory "/usr/share/apache2/error"> + AllowOverride None + Options IncludesNoExec + AddOutputFilter Includes html + AddHandler type-map var + Order allow,deny + Allow from all + LanguagePriority en es de fr + ForceLanguagePriority Prefer Fallback + </Directory> + +# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var +# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var +# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var +# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var +# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var +# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var +# ErrorDocument 410 /error/HTTP_GONE.html.var +# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var +# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var +# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var +# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var +# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var +# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var +# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var +# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var +# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var +# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var + +</IfModule> +</IfModule> + +# +# The following directives modify normal HTTP response behavior to +# handle known problems with browser implementations. +# +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 +BrowserMatch "JDK/1\.0" force-response-1.0 + +# +# The following directive disables redirects on non-GET requests for +# a directory that does not include the trailing slash. This fixes a +# problem with Microsoft WebFolders which does not appropriately handle +# redirects for folders with DAV methods. +# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. +# +BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully +BrowserMatch "MS FrontPage" redirect-carefully +BrowserMatch "^WebDrive" redirect-carefully +BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully +BrowserMatch "^gnome-vfs/1.0" redirect-carefully +BrowserMatch "^XML Spy" redirect-carefully +BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully + +# +# Allow server status reports generated by mod_status, +# with the URL of http://servername/server-status +# Change the ".example.com" to match your domain to enable. +# +#<Location /server-status> +# SetHandler server-status +# Order deny,allow +# Deny from all +# Allow from .example.com +#</Location> + +# +# Allow remote server configuration reports, with the URL of +# http://servername/server-info (requires that mod_info.c be loaded). +# Change the ".example.com" to match your domain to enable. +# +#<Location /server-info> +# SetHandler server-info +# Order deny,allow +# Deny from all +# Allow from .example.com +#</Location> + +# +# Proxy Server directives. Uncomment the following lines to +# enable the proxy server: +# +#<IfModule mod_proxy.c> +#ProxyRequests On +# +#<Proxy *> +# Order deny,allow +# Deny from all +# Allow from .example.com +#</Proxy> + +# +# Enable/disable the handling of HTTP/1.1 "Via:" headers. +# ("Full" adds the server version; "Block" removes all outgoing Via: headers) +# Set to one of: Off | On | Full | Block +# +#ProxyVia On + +# +# To enable a cache of proxied content, uncomment the following lines. +# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details. +# +#<IfModule mod_disk_cache.c> +# CacheEnable disk / +# CacheRoot "/var/cache/mod_proxy" +#</IfModule> +# + +#</IfModule> +# End of proxy directives. + +### Section 3: Virtual Hosts +# +# VirtualHost: If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# +# Please see the documentation at +# <URL:http://httpd.apache.org/docs/2.2/vhosts/> +# for further details before you try to setup virtual hosts. +# +# You may use the command line option '-S' to verify your virtual host +# configuration. + +# +# Use name-based virtual hosting. +# +#NameVirtualHost *:80 +# +# NOTE: NameVirtualHost cannot be used without a port specifier +# (e.g. :80) if mod_ssl is being used, due to the nature of the +# SSL protocol. +# + +# +# VirtualHost example: +# Almost any Apache directive may go into a VirtualHost container. +# The first VirtualHost section is used for requests without a known +# server name. +# +#<VirtualHost *:80> +# ServerAdmin webmaster@dummy-host.example.com +# DocumentRoot /var/www/dummy-host.example.com/htdocs +# ServerName dummy-host.example.com +# ErrorLog logs/dummy-host.example.com-error.log +# CustomLog logs/dummy-host.example.com-access.log common +#</VirtualHost> diff --git a/main/apache2/ldap.conf b/main/apache2/ldap.conf new file mode 100644 index 0000000000..81fe42fa0f --- /dev/null +++ b/main/apache2/ldap.conf @@ -0,0 +1,2 @@ +LoadModule ldap_module modules/mod_ldap.so +LoadModule authnz_ldap_module modules/mod_authnz_ldap.so diff --git a/main/apache2/ssl.conf b/main/apache2/ssl.conf new file mode 100644 index 0000000000..8b156ebbc6 --- /dev/null +++ b/main/apache2/ssl.conf @@ -0,0 +1,223 @@ +# +# This is the Apache server configuration file providing SSL support. +# It contains the configuration directives to instruct the server how to +# serve pages over an https connection. For detailing information about these +# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html> +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# + +LoadModule ssl_module modules/mod_ssl.so + +# +# When we also provide SSL we have to listen to the +# the HTTPS port in addition. +# +Listen 443 + +## +## SSL Global Context +## +## All SSL configuration in this context applies both to +## the main server and all SSL-enabled virtual hosts. +## + +# Pass Phrase Dialog: +# Configure the pass phrase gathering process. +# The filtering dialog program (`builtin' is a internal +# terminal dialog) has to provide the pass phrase on stdout. +SSLPassPhraseDialog builtin + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First the mechanism +# to use and second the expiring timeout (in seconds). +#SSLSessionCache dc:UNIX:/var/cache/mod_ssl/distcache +SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) +SSLSessionCacheTimeout 300 + +# Semaphore: +# Configure the path to the mutual exclusion semaphore the +# SSL engine uses internally for inter-process synchronization. +SSLMutex default + +# Pseudo Random Number Generator (PRNG): +# Configure one or more sources to seed the PRNG of the +# SSL library. The seed data should be of good random quality. +# WARNING! On some platforms /dev/random blocks if not enough entropy +# is available. This means you then cannot use the /dev/random device +# because it would lead to very long connection times (as long as +# it requires to make more entropy available). But usually those +# platforms additionally provide a /dev/urandom device which doesn't +# block. So, if available, use this one instead. Read the mod_ssl User +# Manual for more details. +SSLRandomSeed startup file:/dev/urandom 256 +SSLRandomSeed connect builtin +#SSLRandomSeed startup file:/dev/random 512 +#SSLRandomSeed connect file:/dev/random 512 +#SSLRandomSeed connect file:/dev/urandom 512 + +# +# Use "SSLCryptoDevice" to enable any supported hardware +# accelerators. Use "openssl engine -v" to list supported +# engine names. NOTE: If you enable an accelerator and the +# server does not start, consult the error logs and ensure +# your accelerator is functioning properly. +# +SSLCryptoDevice builtin +#SSLCryptoDevice ubsec + +## +## SSL Virtual Host Context +## + +<VirtualHost _default_:443> + +# General setup for the virtual host, inherited from global configuration +#DocumentRoot "/var/www/html" +#ServerName www.example.com:443 + +# Use separate log files for the SSL virtual host; note that LogLevel +# is not inherited from httpd.conf. +ErrorLog logs/ssl_error.log +TransferLog logs/ssl_access.log +LogLevel warn + +# SSL Engine Switch: +# Enable/Disable SSL for this virtual host. +SSLEngine on + +# SSL Protocol support: +# List the enable protocol levels with which clients will be able to +# connect. Disable SSLv2 access by default: +SSLProtocol all -SSLv2 + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate. +# See the mod_ssl documentation for a complete list. +SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW + +# Server Certificate: +# Point SSLCertificateFile at a PEM encoded certificate. If +# the certificate is encrypted, then you will be prompted for a +# pass phrase. Note that a kill -HUP will prompt again. A new +# certificate can be generated using the genkey(1) command. +SSLCertificateFile /etc/ssl/apache2/server.pem + +# Server Private Key: +# If the key is not combined with the certificate, use this +# directive to point at the key file. Keep in mind that if +# you've both a RSA and a DSA private key you can configure +# both in parallel (to also allow the use of DSA ciphers, etc.) +SSLCertificateKeyFile /etc/ssl/apache2/server.key + +# Server Certificate Chain: +# Point SSLCertificateChainFile at a file containing the +# concatenation of PEM encoded CA certificates which form the +# certificate chain for the server certificate. Alternatively +# the referenced file can be the same as SSLCertificateFile +# when the CA certificates are directly appended to the server +# certificate for convinience. +#SSLCertificateChainFile /etc/ssl/apache2/server-chain.crt + +# Certificate Authority (CA): +# Set the CA certificate verification path where to find CA +# certificates for client authentication or alternatively one +# huge file containing all of them (file must be PEM encoded) +#SSLCACertificateFile /etc/ssl/apache2/ca-bundle.crt + +# Client Authentication (Type): +# Client certificate verification type and depth. Types are +# none, optional, require and optional_no_ca. Depth is a +# number which specifies how deeply to verify the certificate +# issuer chain before deciding the certificate is not valid. +#SSLVerifyClient require +#SSLVerifyDepth 10 + +# Access Control: +# With SSLRequire you can do per-directory access control based +# on arbitrary complex boolean expressions containing server +# variable checks and other lookup directives. The syntax is a +# mixture between C and Perl. See the mod_ssl documentation +# for more details. +#<Location /> +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ +# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ +#</Location> + +# SSL Engine Options: +# Set various options for the SSL engine. +# o FakeBasicAuth: +# Translate the client X.509 into a Basic Authorisation. This means that +# the standard Auth/DBMAuth methods can be used for access control. The +# user name is the `one line' version of the client's X.509 certificate. +# Note that no password is obtained from the user. Every entry in the user +# file needs this password: `xxj31ZMTZzkVA'. +# o ExportCertData: +# This exports two additional environment variables: SSL_CLIENT_CERT and +# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the +# server (always existing) and the client (only existing when client +# authentication is used). This can be used to import the certificates +# into CGI scripts. +# o StdEnvVars: +# This exports the standard SSL/TLS related `SSL_*' environment variables. +# Per default this exportation is switched off for performance reasons, +# because the extraction step is an expensive operation and is usually +# useless for serving static content. So one usually enables the +# exportation for CGI and SSI requests only. +# o StrictRequire: +# This denies access when "SSLRequireSSL" or "SSLRequire" applied even +# under a "Satisfy any" situation, i.e. when it applies access is denied +# and no other module can change it. +# o OptRenegotiate: +# This enables optimized SSL connection renegotiation handling when SSL +# directives are used in per-directory context. +#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire +<Files ~ "\.(cgi|shtml|phtml|php3?)$"> + SSLOptions +StdEnvVars +</Files> +<Directory "/var/www/cgi-bin"> + SSLOptions +StdEnvVars +</Directory> + +# SSL Protocol Adjustments: +# The safe and default but still SSL/TLS standard compliant shutdown +# approach is that mod_ssl sends the close notify alert but doesn't wait for +# the close notify alert from client. When you need a different shutdown +# approach you can use one of the following variables: +# o ssl-unclean-shutdown: +# This forces an unclean shutdown when the connection is closed, i.e. no +# SSL close notify alert is send or allowed to received. This violates +# the SSL/TLS standard but is needed for some brain-dead browsers. Use +# this when you receive I/O errors because of the standard approach where +# mod_ssl sends the close notify alert. +# o ssl-accurate-shutdown: +# This forces an accurate shutdown when the connection is closed, i.e. a +# SSL close notify alert is send and mod_ssl waits for the close notify +# alert of the client. This is 100% SSL/TLS standard compliant, but in +# practice often causes hanging connections with brain-dead browsers. Use +# this only for browsers where you know that their SSL implementation +# works correctly. +# Notice: Most problems of broken clients are also related to the HTTP +# keep-alive facility, so you usually additionally want to disable +# keep-alive for those clients, too. Use variable "nokeepalive" for this. +# Similarly, one has to force some clients to use HTTP/1.0 to workaround +# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and +# "force-response-1.0" for this. +SetEnvIf User-Agent ".*MSIE.*" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + +# Per-Server Logging: +# The home of a custom SSL log file. Use this when you want a +# compact non-error SSL logfile on a virtual host basis. +CustomLog logs/ssl_request.log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + +</VirtualHost> + diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 877d40f6cb..5d12b9771a 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.10 +pkgver=1.6.2.11 pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -119,7 +119,7 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="50412a90942ae7306fb8dcc31a05c2ce asterisk-1.6.2.10.tar.gz +md5sums="2d6757a0354cff87c9e1776ada077aae asterisk-1.6.2.11.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch diff --git a/main/cabextract/APKBUILD b/main/cabextract/APKBUILD index addf021eb6..803466d794 100644 --- a/main/cabextract/APKBUILD +++ b/main/cabextract/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=cabextract -pkgver=1.2 -pkgrel=1 +pkgver=1.3 +pkgrel=0 pkgdesc="Tool for extracting Microsoft cabinet files" url="http://www.cabextract.org.uk/" license="GPL" @@ -23,4 +23,4 @@ build () make DESTDIR="$pkgdir" install } -md5sums="dc421a690648b503265c82ade84e143e cabextract-1.2.tar.gz" +md5sums="cb9a4a38470d2a71a0275968e7eb64d3 cabextract-1.3.tar.gz" diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD index 3cc68d2f98..eccd59f79b 100644 --- a/main/curl/APKBUILD +++ b/main/curl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=curl -pkgver=7.21.0 +pkgver=7.21.1 pkgrel=0 pkgdesc="An URL retrival utility and library" url="http://curl.haxx.se" @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="e1a2a773e93a39f3c04cab92c55bf197 curl-7.21.0.tar.bz2" +md5sums="eafde5b933bce1c1dca82d1054c8d967 curl-7.21.1.tar.bz2" diff --git a/main/dovecot/2281223b9cb9.patch b/main/dovecot/2281223b9cb9.patch new file mode 100644 index 0000000000..4eb9c01f85 --- /dev/null +++ b/main/dovecot/2281223b9cb9.patch @@ -0,0 +1,21 @@ + +# HG changeset patch +# User Timo Sirainen <tss@iki.fi> +# Date 1281449944 -3600 +# Node ID 2281223b9cb99357a89971b64680530813d22a81 +# Parent 367ce71922bfc95ec1faad91cd47f1c758cd2d50 +master: Don't crash on config reload when using dict processes. + +--- a/src/master/dict-process.c Wed Aug 04 16:54:17 2010 +0100 ++++ b/src/master/dict-process.c Tue Aug 10 15:19:04 2010 +0100 +@@ -214,7 +214,8 @@ + struct dict_listener *listener = process->listener; + + dict_process_deinit(process); +- if (listener->processes == NULL && listener->fd != -1) { ++ if (listener->processes == NULL && listener->fd != -1 && ++ listener->io == NULL) { + /* last listener died, create new ones */ + listener->io = io_add(listener->fd, IO_READ, + dict_listener_input, listener); + diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index c6774c14cf..40aae396a4 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=1.2.13 -pkgrel=0 +pkgrel=1 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" @@ -18,8 +18,14 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz dovecot.logrotate dovecot.initd + 2281223b9cb9.patch " +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/2281223b9cb9.patch || return 1 +} + build() { cd "$srcdir/$pkgname-$pkgver" @@ -92,4 +98,5 @@ sqlite() { md5sums="aaee3b5fd59e01780305553248f686bc dovecot-1.2.13.tar.gz aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate -c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" +c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd +c8581417ce7946668839a9d0fcd93ee8 2281223b9cb9.patch" diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index 595d832758..2bc0b7189e 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=freetype -pkgver=2.4.1 +pkgver=2.4.2 pkgrel=0 pkgdesc="TrueType font rendering library" url="http://freetype.sourceforge.net" @@ -40,7 +40,7 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="2c4f33ee9242be7ec5e876952ae99755 freetype-2.4.1.tar.gz +md5sums="5a3920aa1a8a0f3734612e8729df54d8 freetype-2.4.2.tar.gz 376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch 3f6c5739843dcbc110ee0f243c4f6bdb 30-enable-valid.patch bd2d808a0c00dcf9f1d1c0a9a8227ad9 40-memcpy-fix.patch" diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD index 26f7d7bc23..72b8de5743 100644 --- a/main/glib/APKBUILD +++ b/main/glib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glib -pkgver=2.24.0 -pkgrel=4 +pkgver=2.24.2 +pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="http://www.gtk.org" license='GPL' @@ -38,4 +38,4 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="45a8bc697d07f859566c0b64c40382a8 glib-2.24.0.tar.bz2" +md5sums="8a6e45d7840460ed84288ebfd75782d4 glib-2.24.2.tar.bz2" diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD index d41cb8dbcd..414478d39f 100644 --- a/main/hypermail/APKBUILD +++ b/main/hypermail/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> + pkgname=hypermail -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.0 +pkgrel=0 pkgdesc="Mail Archiver" url="http://www.hypermail-project.org" license="GPL" -depends="pcre lua" +depends="lua" makedepends="pcre-dev bison gdbm-dev" install= subpackages="" source="http://www.hypermail-project.org/$pkgname-$pkgver.tar.gz mdir2mbox.lua" -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/hypermail build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -34,5 +36,5 @@ package() { install -m755 -D "$srcdir"/mdir2mbox.lua "$pkgdir"/usr/bin/mdir2mbox.lua } -md5sums="a064e36780ee41409c8c973f9c69927f hypermail-2.2.0.tar.gz +md5sums="510c46b98314f4e98796719f27865846 hypermail-2.3.0.tar.gz 079b00d4ea667a0efd6fd370b1a4d5d8 mdir2mbox.lua" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index b89b71622e..fe1f1fe478 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.6.3.1 +pkgver=6.6.3.4 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -47,4 +47,4 @@ dev() { "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ } -md5sums="0e028d5b2b5d741732644adc391dda8c ImageMagick-6.6.3-1.tar.gz" +md5sums="3a579a741be460a82344ab3b888795fb ImageMagick-6.6.3-4.tar.gz" diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index ef9488d977..c37c87dcf8 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables -pkgver=1.4.8 +pkgver=1.4.9.1 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" @@ -64,7 +64,7 @@ ip6tables() { "$subpkgdir"/etc/init.d/ip6tables } -md5sums="697ed89f37af4473a5f6349ba2700f2d iptables-1.4.8.tar.bz2 +md5sums="fbadfb0b5f2dbda49e0ad06a798898e3 iptables-1.4.9.1.tar.bz2 ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd 956ebf5ab69e5a1e1d3983541eab643b iptables.confd" diff --git a/main/libc0.9.32/0001-config-parser-fix-memory-corruption.patch b/main/libc0.9.32/0001-config-parser-fix-memory-corruption.patch new file mode 100644 index 0000000000..58acfb4234 --- /dev/null +++ b/main/libc0.9.32/0001-config-parser-fix-memory-corruption.patch @@ -0,0 +1,45 @@ +From 80bcb7a4806b27397629cf2e6bcbb7e8a0c5db5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 6 Aug 2010 11:29:38 +0300 +Subject: [PATCH] config parser: fix memory corruption +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fgets will happily write over allocated area limits. Adjusted the +buffer size according to how much is already read. + +Also increase the maximum default line length, as 80 is slightly +small. It might be better if bb_get_chunk_with_continuation would +reallocate the line buffer if it was not user given. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + libc/misc/internals/parse_config.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libc/misc/internals/parse_config.c b/libc/misc/internals/parse_config.c +index cbb6ef7..8404d80 100644 +--- a/libc/misc/internals/parse_config.c ++++ b/libc/misc/internals/parse_config.c +@@ -60,7 +60,7 @@ static off_t bb_get_chunk_with_continuation(parser_t* parsr) + char *chp; + + while (1) { +- if (fgets(parsr->line + pos, parsr->line_len, parsr->fp) == NULL) { ++ if (fgets(parsr->line + pos, parsr->line_len - pos, parsr->fp) == NULL) { + memset(parsr->line, 0, parsr->line_len); + pos = -1; + break; +@@ -179,7 +179,7 @@ int attribute_hidden FAST_FUNC config_read(parser_t *parser, char ***tokens, + again: + if (parser->data == NULL) { + if (parser->line_len == 0) +- parser->line_len = 81; ++ parser->line_len = 161; + if (parser->data_len == 0) + parser->data_len += 1 + ntokens * sizeof(char *); + parser->data = realloc(parser->data, +-- +1.7.0.4 + diff --git a/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch b/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch new file mode 100644 index 0000000000..612b03aa27 --- /dev/null +++ b/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch @@ -0,0 +1,29 @@ +From e351f233334cb5484309133789646e165f4e64db Mon Sep 17 00:00:00 2001 +From: Natanael Copa <natanael.copa@gmail.com> +Date: Wed, 11 Aug 2010 11:57:46 +0000 +Subject: [PATCH] netdb: increase line size for /etc/services + +If /etc/services has lines longer than 80 will getservbyname() fail +so we set it up to 160. + +Signed-off-by: Natanael Copa <natanael.copa@gmail.com> +--- + libc/inet/getservice.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c +index 03f5c29..8248f7a 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 (160) /* one line */ + #define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES)) + + static parser_t *servp = NULL; +-- +1.7.2.1 + diff --git a/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch b/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch new file mode 100644 index 0000000000..55edc51c9a --- /dev/null +++ b/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch @@ -0,0 +1,73 @@ +From ed8017b08bee868eb5ea11c0b57074875267a3f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 6 Aug 2010 13:26:25 +0300 +Subject: [PATCH] nptl: fix calling convention for __pthread_mutex_cond_lock +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The assembly versions of pthread_cond_wait calls +__pthread_mutex_cond_lock and __pthread_mutex_cond_lock_adjust +using internal calling convention (which differs from default +calling convention at least on x86). Thus these two functions +must be defined with internal_function or the call sequence goes +wrong. + +__pthread_mutex_cond_lock resides in +sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c, but it does +evil macro definitions and includes pthread_mutex_lock.c, so +we need to add some extra kludge to pthread_mutex_lock.c to get +the prototypes correctly. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + libpthread/nptl/pthreadP.h | 6 ++++-- + libpthread/nptl/pthread_mutex_lock.c | 7 ++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h +index 85601d4..c45bd11 100644 +--- a/libpthread/nptl/pthreadP.h ++++ b/libpthread/nptl/pthreadP.h +@@ -414,8 +414,10 @@ extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); + extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); + extern int __pthread_mutex_lock_internal (pthread_mutex_t *__mutex) + attribute_hidden; +-extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex); +-extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex); ++extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex) ++ attribute_hidden internal_function; ++extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex) ++ attribute_hidden internal_function; + extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); + extern int __pthread_mutex_unlock_internal (pthread_mutex_t *__mutex) + attribute_hidden; +diff --git a/libpthread/nptl/pthread_mutex_lock.c b/libpthread/nptl/pthread_mutex_lock.c +index 78b6671..77147db 100644 +--- a/libpthread/nptl/pthread_mutex_lock.c ++++ b/libpthread/nptl/pthread_mutex_lock.c +@@ -42,7 +42,11 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex) + + + int ++#ifdef NO_INCR ++attribute_hidden internal_function ++#else + attribute_protected ++#endif + __pthread_mutex_lock ( + pthread_mutex_t *mutex) + { +@@ -477,7 +481,8 @@ strong_alias (__pthread_mutex_lock, __pthread_mutex_lock_internal) + + + #ifdef NO_INCR +-void attribute_protected ++void ++attribute_hidden internal_function + __pthread_mutex_cond_lock_adjust ( + pthread_mutex_t *mutex) + { +-- +1.7.0.4 + diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index bb3643117d..d546990325 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _abiver=0.9.32 pkgname=libc$_abiver -_gitver=1006300816 +_gitver=1008060645 pkgver=${_abiver}_alpha0_git$_gitver -pkgrel=2 +pkgrel=1 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -18,10 +18,10 @@ _snapfile="$pkgname-$pkgver.tar.bz2" source="http://build.alpinelinux.org:8010/distfiles/$_snapfile compat-stack-guard.patch uclibc-libm-pic.patch - uclibc-lutimes.patch uclibc-resolv-tls.patch - uclibc-gcc-workaround.patch - no-posix-spawn.patch + 0001-config-parser-fix-memory-corruption.patch + 0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch + 0001-netdb-increase-line-size-for-etc-services.patch uclibcconfig.x86 uclibcconfig.i486 " @@ -49,10 +49,13 @@ prepare() { local i cd "$_builddir" # patches goes here - for i in ../*.patch ../*.diff; do - [ -r "$i" ] || continue - msg "Applying $i..." - patch -p1 < $i || return 1 + for i in $source; do + case $i in + *.patch|*.diff) + msg "Applying $i..." + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac done # set abi version and remove unsupported warnings c flag sed -i -e "s/^ABI_VERSION.*/ABI_VERSION := $_abiver/" \ @@ -98,12 +101,12 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -md5sums="b7af86c013378888fbd345c47ad21c3a libc0.9.32-0.9.32_alpha0_git1006300816.tar.bz2 +md5sums="2b3935c370307b806320e78883f9b07c libc0.9.32-0.9.32_alpha0_git1008060645.tar.bz2 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch 2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch -4d0b8170e6580b47bf5775e65a6f081e uclibc-lutimes.patch d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch -a88b7f394c86dc7aa606c9e338e35515 uclibc-gcc-workaround.patch -cb3bfda1619a04218282cd02e3cdb4da no-posix-spawn.patch +d351ca4e5c33f4a7a60d4f1d754db5c4 0001-config-parser-fix-memory-corruption.patch +653b046611f98c990f1b52a28968ece3 0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch +39ac96d750ad058030f917912bfea466 0001-netdb-increase-line-size-for-etc-services.patch e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" diff --git a/main/libc0.9.32/no-posix-spawn.patch b/main/libc0.9.32/no-posix-spawn.patch deleted file mode 100644 index c87e564916..0000000000 --- a/main/libc0.9.32/no-posix-spawn.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 177538eb191c297ac146c843ff68d80ecfe9a87b -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri Jul 30 07:51:45 2010 +0000 - - nptl: do not define _POSIX_SPAWN since its not implemented - - Building things like vlc checks if _POSIX_SPAWN is defined. Since - posix_spawn is not implemented we dont define it. - -diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -index 2550355..6fbdbb7 100644 ---- a/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -@@ -143,8 +143,10 @@ - /* We support spinlocks. */ - #define _POSIX_SPIN_LOCKS 200809L - -+#if 0 - /* The `spawn' function family is supported. */ - #define _POSIX_SPAWN 200809L -+#endif - - /* We have POSIX timers. */ - #define _POSIX_TIMERS 200809L diff --git a/main/libc0.9.32/uclibc-gcc-workaround.patch b/main/libc0.9.32/uclibc-gcc-workaround.patch deleted file mode 100644 index f698ecb79e..0000000000 --- a/main/libc0.9.32/uclibc-gcc-workaround.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -To: uclibc@uclibc.org -Subject: [PATCH] more workarounds for GCC PR32219 -Date: Wed, 30 Jun 2010 14:46:37 +0300 -Message-Id: <1277898397-10643-1-git-send-email-timo.teras@iki.fi> -X-Mailer: git-send-email 1.7.0.4 -MIME-Version: 1.0 -X-BeenThere: uclibc@uclibc.org -X-Mailman-Version: 2.1.12 -Precedence: list -List-Id: "Discussion and development of uClibc \(the embedded C library\)" - <uclibc.uclibc.org> -List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=unsubscribe> -List-Archive: <http://lists.busybox.net/pipermail/uclibc> -List-Post: <mailto:uclibc@uclibc.org> -List-Help: <mailto:uclibc-request@uclibc.org?subject=help> -List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=subscribe> -Content-Type: text/plain; charset="utf-8" -Sender: uclibc-bounces@uclibc.org -Errors-To: uclibc-bounces@uclibc.org - -Commit 2e53dd645d5348f207cec7f8595969dc566c5a55 workarounds GCC -bug when accessing _locale_init and _stdio_init. We need the same -fix for __errno_location and __h_errno_location otherwise we crash -calling null with static and non-threaded builds. - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - libc/misc/internals/__uClibc_main.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index 44d1620..e8c470b 100644 ---- a/libc/misc/internals/__uClibc_main.c -+++ b/libc/misc/internals/__uClibc_main.c -@@ -447,11 +447,11 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc, - * have resulted in errno being set nonzero, so set it to 0 before - * we call main. - */ -- if (likely(__errno_location!=NULL)) -+ if (likely(not_null_ptr(__errno_location))) - *(__errno_location()) = 0; - - /* Set h_errno to 0 as well */ -- if (likely(__h_errno_location!=NULL)) -+ if (likely(not_null_ptr(__h_errno_location))) - *(__h_errno_location()) = 0; - - #if defined HAVE_CLEANUP_JMP_BUF && defined __UCLIBC_HAS_THREADS_NATIVE__ --- -1.7.0.4 - -_______________________________________________ -uClibc mailing list -uClibc@uclibc.org -http://lists.busybox.net/mailman/listinfo/uclibc diff --git a/main/libc0.9.32/uclibc-lutimes.patch b/main/libc0.9.32/uclibc-lutimes.patch deleted file mode 100644 index c9ec2aa475..0000000000 --- a/main/libc0.9.32/uclibc-lutimes.patch +++ /dev/null @@ -1,105 +0,0 @@ -From: Vladimir Zapolskiy <vzapolskiy@gmail.com> -To: uclibc@uclibc.org -Subject: [PATCH v2] lutimes: add lutimes support -Date: Wed, 2 Jun 2010 10:27:16 +0400 -Message-Id: <1275460036-3289-1-git-send-email-vzapolskiy@gmail.com> -X-Mailer: git-send-email 1.7.0.3 -In-Reply-To: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> -References: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> -Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com> -X-BeenThere: uclibc@uclibc.org -X-Mailman-Version: 2.1.12 -Precedence: list -List-Id: "Discussion and development of uClibc \(the embedded C library\)" - <uclibc.uclibc.org> -List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=unsubscribe> -List-Archive: <http://lists.busybox.net/pipermail/uclibc> -List-Post: <mailto:uclibc@uclibc.org> -List-Help: <mailto:uclibc-request@uclibc.org?subject=help> -List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: uclibc-bounces@uclibc.org -Errors-To: uclibc-bounces@uclibc.org - -This patch adds lutimes library call support. - -Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> ---- - include/sys/time.h | 4 ++- - libc/sysdeps/linux/common/lutimes.c | 38 +++++++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletions(-) - create mode 100644 libc/sysdeps/linux/common/lutimes.c - -diff --git a/include/sys/time.h b/include/sys/time.h -index 33f5873..952e95a 100644 ---- a/include/sys/time.h -+++ b/include/sys/time.h -@@ -144,14 +144,16 @@ extern int utimes (__const char *__file, __const struct timeval __tvp[2]) - __THROW __nonnull ((1)); - libc_hidden_proto(utimes) - --#if 0 /*def __USE_BSD*/ -+#ifdef __USE_BSD - /* Same as `utimes', but does not follow symbolic links. */ - extern int lutimes (__const char *__file, __const struct timeval __tvp[2]) - __THROW __nonnull ((1)); - -+#if 0 - /* Same as `utimes', but takes an open file descriptor instead of a name. */ - extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; - #endif -+#endif - - #ifdef __USE_GNU - /* Change the access time of FILE relative to FD to TVP[0] and the -diff --git a/libc/sysdeps/linux/common/lutimes.c b/libc/sysdeps/linux/common/lutimes.c -new file mode 100644 -index 0000000..0b4a8ea ---- /dev/null -+++ b/libc/sysdeps/linux/common/lutimes.c -@@ -0,0 +1,38 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * lutimes() implementation for uClibc -+ * -+ * Copyright (C) 2010 Vladimir Zapolskiy <vzapolskiy@gmail.com> -+ * -+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+ */ -+ -+#include <sys/syscall.h> -+#include <time.h> -+ -+#ifdef __NR_lutimes -+_syscall2(int, lutimes, const char *, file, const struct timeval *, tvp) -+#else -+#include <sys/time.h> -+#include <fcntl.h> -+ -+int lutimes(const char *file, const struct timeval tvp[2]) -+{ -+ struct timespec ts[2]; -+ -+ if (tvp != NULL) -+ { -+ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 -+ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) -+ { -+ __set_errno(EINVAL); -+ return -1; -+ } -+ -+ TIMEVAL_TO_TIMESPEC(&tvp[0], &ts[0]); -+ TIMEVAL_TO_TIMESPEC(&tvp[1], &ts[1]); -+ } -+ -+ return utimensat(AT_FDCWD, file, tvp ? ts : NULL, AT_SYMLINK_NOFOLLOW); -+} -+#endif --- -1.7.0.3 - diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD index 0222feeb46..3163cd8174 100644 --- a/main/libgpg-error/APKBUILD +++ b/main/libgpg-error/APKBUILD @@ -1,21 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgpg-error -pkgver=1.7 -pkgrel=3 +pkgver=1.9 +pkgrel=0 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" license="LGPL" depends="" subpackages="$pkgname-dev $pkgname-lisp" source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 - nocxx.patch " build () { cd "$srcdir"/$pkgname-$pkgver - msg "Punting useless check for cpp..." - patch configure < ../nocxx.patch || return 1 - ./configure --prefix=/usr \ --disable-nls @@ -32,5 +28,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -md5sums="62c0d09d1e76c5b6da8fff92314c4665 libgpg-error-1.7.tar.bz2 -28513788ba4d556ccd538867dc6205ab nocxx.patch" +md5sums="521b98aa9395e7eaf0ef2236233a0796 libgpg-error-1.9.tar.bz2" diff --git a/main/libgpg-error/nocxx.patch b/main/libgpg-error/nocxx.patch deleted file mode 100644 index beb1ab9006..0000000000 --- a/main/libgpg-error/nocxx.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure 2004-12-07 21:34:23.205172545 +0000 -+++ b/configure 2004-12-07 21:37:17.726654782 +0000 -@@ -5148,10 +5148,8 @@ - : - else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+See \`config.log' for more details." >&5;} -+ { echo "C++ sucks, ignoring ..." >&5; }; } - fi - - ac_ext=cc diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index d3fca9fad6..d486ff5793 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.32.16 +pkgver=2.6.32.18 _kernver=2.6.32 -pkgrel=4 +pkgrel=0 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.16-201007162107.patch + grsecurity-2.2.0-2.6.32.18-201008112233.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 @@ -148,8 +148,8 @@ firmware() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 -feb09c4053225d0d13272af504075636 grsecurity-2.2.0-2.6.32.16-201007162107.patch +dc2f0fab4d67f96e593708ba9158052b patch-2.6.32.18.bz2 +9a9c5721223e5ebe089dddc14a29935d grsecurity-2.2.0-2.6.32.18-201008112233.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 @@ -173,4 +173,4 @@ ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch -758c074dc6979167f3113cbf101922ee kernelconfig.x86" +ca9c63def600e77ca3cb7e822c239083 kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007162107.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.18-201008112233.patch index e74253e175..7310c00b7b 100644 --- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007162107.patch +++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.18-201008112233.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/arch/alpha/include/asm/elf.h ---- linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/alpha/include/asm/elf.h linux-2.6.32.18/arch/alpha/include/asm/elf.h +--- linux-2.6.32.18/arch/alpha/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/alpha/include/asm/elf.h 2010-08-11 18:57:28.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.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/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.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/alpha/include/asm/pgtable.h linux-2.6.32.18/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.18/arch/alpha/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/alpha/include/asm/pgtable.h 2010-08-11 18:57:28.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.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/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.16/arch/alpha/kernel/module.c linux-2.6.32.16/arch/alpha/kernel/module.c ---- linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/alpha/kernel/module.c linux-2.6.32.18/arch/alpha/kernel/module.c +--- linux-2.6.32.18/arch/alpha/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/alpha/kernel/module.c 2010-08-11 18:57:28.000000000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.16/arch/alpha/kernel/module.c linux-2.6.32.16/arch/alpha got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/alpha/kernel/osf_sys.c linux-2.6.32.18/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.18/arch/alpha/kernel/osf_sys.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/alpha/kernel/osf_sys.c 2010-08-11 18:57:28.000000000 -0400 @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/arch/alph if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.16/arch/alpha/mm/fault.c linux-2.6.32.16/arch/alpha/mm/fault.c ---- linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/alpha/mm/fault.c linux-2.6.32.18/arch/alpha/mm/fault.c +--- linux-2.6.32.18/arch/alpha/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/alpha/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.16/arch/alpha/mm/fault.c linux-2.6.32.16/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.16/arch/arm/include/asm/elf.h linux-2.6.32.16/arch/arm/include/asm/elf.h ---- linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/include/asm/elf.h linux-2.6.32.18/arch/arm/include/asm/elf.h +--- linux-2.6.32.18/arch/arm/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.16/arch/arm/include/asm/elf.h linux-2.6.32.16/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.16/arch/arm/include/asm/kmap_types.h linux-2.6.32.16/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/include/asm/kmap_types.h linux-2.6.32.18/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.18/arch/arm/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.16/arch/arm/include/asm/kmap_types.h linux-2.6.32.16/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/include/asm/uaccess.h linux-2.6.32.18/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.18/arch/arm/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) @@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/arch/a if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/arch/arm/kernel/kgdb.c ---- linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/kernel/kgdb.c linux-2.6.32.18/arch/arm/kernel/kgdb.c +--- linux-2.6.32.18/arch/arm/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/arch/arm/kerne #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/arch/arm/mach-at91/pm.c ---- linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-at91/pm.c linux-2.6.32.18/arch/arm/mach-at91/pm.c +--- linux-2.6.32.18/arch/arm/mach-at91/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-at91/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/arch/arm/mach .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-omap1/pm.c linux-2.6.32.18/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.18/arch/arm/mach-omap1/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-omap1/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/arch/arm/mac .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c 2010-08-11 18:57:28.000000000 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/arch/arm .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c 2010-08-11 18:57:28.000000000 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/arch/arm .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/arch/arm/m .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-pxa/pm.c linux-2.6.32.18/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.18/arch/arm/mach-pxa/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-pxa/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/arch/arm/mach- .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.16/arch/a .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mach-sa1100/pm.c linux-2.6.32.18/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.18/arch/arm/mach-sa1100/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mach-sa1100/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/arch/arm/ma .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.16/arch/arm/mm/fault.c linux-2.6.32.16/arch/arm/mm/fault.c ---- linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mm/fault.c linux-2.6.32.18/arch/arm/mm/fault.c +--- linux-2.6.32.18/arch/arm/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mm/fault.c linux-2.6.32.16/arch/arm/mm/fault /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.16/arch/arm/mm/mmap.c linux-2.6.32.16/arch/arm/mm/mmap.c ---- linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/mm/mmap.c linux-2.6.32.18/arch/arm/mm/mmap.c +--- linux-2.6.32.18/arch/arm/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/mm/mmap.c 2010-08-11 18:57:28.000000000 -0400 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.16/arch/arm/mm/mmap.c linux-2.6.32.16/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.32.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/arm/plat-s3c/pm.c linux-2.6.32.18/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.18/arch/arm/plat-s3c/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/arm/plat-s3c/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/arch/arm/plat- .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/arch/avr32/include/asm/elf.h ---- linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/avr32/include/asm/elf.h linux-2.6.32.18/arch/avr32/include/asm/elf.h +--- linux-2.6.32.18/arch/avr32/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/avr32/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/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.16/arch/avr32/include/asm/kmap_types.h linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h linux-2.6.32.16/a }; #undef D -diff -urNp linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/arch/avr3 .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.16/arch/avr32/mm/fault.c linux-2.6.32.16/arch/avr32/mm/fault.c ---- linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/avr32/mm/fault.c linux-2.6.32.18/arch/avr32/mm/fault.c +--- linux-2.6.32.18/arch/avr32/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/avr32/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.16/arch/avr32/mm/fault.c linux-2.6.32.16/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.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/blackfin/kernel/kgdb.c linux-2.6.32.18/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.18/arch/blackfin/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/blackfin/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler */ } @@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/arch/blac .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/blackfin/mach-common/pm.c linux-2.6.32.18/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.18/arch/blackfin/mach-common/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/blackfin/mach-common/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/arch/b .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -diff -urNp linux-2.6.32.16/arch/frv/include/asm/kmap_types.h linux-2.6.32.16/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/frv/include/asm/kmap_types.h linux-2.6.32.18/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.18/arch/frv/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/frv/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.16/arch/frv/include/asm/kmap_types.h linux-2.6.32.16/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c 2010-08-11 18:57:28.000000000 -0400 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.16/arch { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c 2010-08-11 18:57:28.000000000 -0400 @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.16/arch/ .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c 2010-08-11 18:57:28.000000000 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/arch/ia /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/ia32/ia32priv.h linux-2.6.32.18/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.18/arch/ia64/ia32/ia32priv.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/ia32/ia32priv.h 2010-08-11 18:57:28.000000000 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/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.16/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h 2010-08-11 18:57:28.000000000 -0400 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.16/a return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/arch/ia64/include/asm/elf.h ---- linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/include/asm/elf.h linux-2.6.32.18/arch/ia64/include/asm/elf.h +--- linux-2.6.32.18/arch/ia64/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/arch/ia64 #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/include/asm/machvec.h linux-2.6.32.18/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.18/arch/ia64/include/asm/machvec.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/include/asm/machvec.h 2010-08-11 18:57:28.000000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -780,9 +780,18 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/arch/ /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/include/asm/pgtable.h linux-2.6.32.18/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.18/arch/ia64/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/include/asm/pgtable.h 2010-08-11 19:04:55.000000000 -0400 +@@ -12,7 +12,7 @@ + * David Mosberger-Tang <davidm@hpl.hp.com> + */ + +- ++#include <linux/const.h> + #include <asm/mman.h> + #include <asm/page.h> + #include <asm/processor.h> @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -801,9 +810,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/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.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/include/asm/uaccess.h linux-2.6.32.18/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.18/arch/ia64/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -822,9 +831,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c 2010-08-11 18:57:28.000000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -843,9 +852,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/i { return dma_ops; } -diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/kernel/module.c ---- linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/module.c linux-2.6.32.18/arch/ia64/kernel/module.c +--- linux-2.6.32.18/arch/ia64/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/module.c 2010-08-11 18:57:28.000000000 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -934,9 +943,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/k mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-09 14:50:44.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/pci-dma.c linux-2.6.32.18/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.18/arch/ia64/kernel/pci-dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/pci-dma.c 2010-08-11 18:57:28.000000000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -988,9 +997,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/ /* * The order of these functions is important for -diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c 2010-08-11 18:57:28.000000000 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -1000,9 +1009,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/i .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c 2010-08-11 18:57:28.000000000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1029,9 +1038,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64 goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64/kernel/topology.c ---- linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/topology.c linux-2.6.32.18/arch/ia64/kernel/topology.c +--- linux-2.6.32.18/arch/ia64/kernel/topology.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/topology.c 2010-08-11 18:57:28.000000000 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -1041,9 +1050,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64 .show = cache_show }; -diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S 2010-08-11 18:57:28.000000000 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1053,9 +1062,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/i . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fault.c ---- linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/mm/fault.c linux-2.6.32.18/arch/ia64/mm/fault.c +--- linux-2.6.32.18/arch/ia64/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1105,9 +1114,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fau survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init.c ---- linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/mm/init.c linux-2.6.32.18/arch/ia64/mm/init.c +--- linux-2.6.32.18/arch/ia64/mm/init.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/mm/init.c 2010-08-11 18:57:28.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; @@ -1128,9 +1137,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c 2010-08-11 18:57:28.000000000 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1140,9 +1149,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.16/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.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/lib/usercopy.c ---- linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/m32r/lib/usercopy.c linux-2.6.32.18/arch/m32r/lib/usercopy.c +--- linux-2.6.32.18/arch/m32r/lib/usercopy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/m32r/lib/usercopy.c 2010-08-11 18:57:28.000000000 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1163,9 +1172,9 @@ diff -urNp linux-2.6.32.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/li prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1175,9 +1184,9 @@ diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips/include/asm/elf.h ---- linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/include/asm/elf.h linux-2.6.32.18/arch/mips/include/asm/elf.h +--- linux-2.6.32.18/arch/mips/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1190,9 +1199,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mips/include/asm/page.h ---- linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/include/asm/page.h linux-2.6.32.18/arch/mips/include/asm/page.h +--- linux-2.6.32.18/arch/mips/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/include/asm/page.h 2010-08-11 18:57:28.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; @@ -1202,9 +1211,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mip #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/mips/include/asm/system.h ---- linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/include/asm/system.h linux-2.6.32.18/arch/mips/include/asm/system.h +--- linux-2.6.32.18/arch/mips/include/asm/system.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/include/asm/system.h 2010-08-11 18:57:28.000000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1213,9 +1222,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/m +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c 2010-08-11 18:57:28.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) @@ -1230,9 +1239,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c 2010-08-11 18:57:28.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) @@ -1247,9 +1256,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch #include <asm/processor.h> /* -diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/kernel/kgdb.c ---- linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/kernel/kgdb.c linux-2.6.32.18/arch/mips/kernel/kgdb.c +--- linux-2.6.32.18/arch/mips/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1258,9 +1267,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/ker struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/kernel/process.c ---- linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/kernel/process.c linux-2.6.32.18/arch/mips/kernel/process.c +--- linux-2.6.32.18/arch/mips/kernel/process.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/kernel/process.c 2010-08-11 18:57:28.000000000 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1277,9 +1286,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/kernel/syscall.c ---- linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/kernel/syscall.c linux-2.6.32.18/arch/mips/kernel/syscall.c +--- linux-2.6.32.18/arch/mips/kernel/syscall.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/kernel/syscall.c 2010-08-11 18:57:28.000000000 -0400 @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1301,9 +1310,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/ if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/arch/mips/mm/fault.c ---- linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/mips/mm/fault.c linux-2.6.32.18/arch/mips/mm/fault.c +--- linux-2.6.32.18/arch/mips/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/mips/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1328,9 +1337,9 @@ diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/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.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/arch/parisc/include/asm/elf.h ---- linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/include/asm/elf.h linux-2.6.32.18/arch/parisc/include/asm/elf.h +--- linux-2.6.32.18/arch/parisc/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1345,9 +1354,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/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.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/include/asm/pgtable.h linux-2.6.32.18/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.18/arch/parisc/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/include/asm/pgtable.h 2010-08-11 18:57:28.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 @@ -1366,9 +1375,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/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.16/arch/parisc/kernel/module.c linux-2.6.32.16/arch/parisc/kernel/module.c ---- linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/kernel/module.c linux-2.6.32.18/arch/parisc/kernel/module.c +--- linux-2.6.32.18/arch/parisc/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/kernel/module.c 2010-08-11 18:57:28.000000000 -0400 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1469,9 +1478,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/module.c linux-2.6.32.16/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.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c 2010-08-11 18:57:28.000000000 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1481,9 +1490,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/ if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/parisc/kernel/traps.c ---- linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/kernel/traps.c linux-2.6.32.18/arch/parisc/kernel/traps.c +--- linux-2.6.32.18/arch/parisc/kernel/traps.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/kernel/traps.c 2010-08-11 18:57:28.000000000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1495,9 +1504,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/paris fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm/fault.c ---- linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/parisc/mm/fault.c linux-2.6.32.18/arch/parisc/mm/fault.c +--- linux-2.6.32.18/arch/parisc/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/parisc/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1667,9 +1676,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/arch/powerpc/include/asm/device.h ---- linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/device.h linux-2.6.32.18/arch/powerpc/include/asm/device.h +--- linux-2.6.32.18/arch/powerpc/include/asm/device.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/device.h 2010-08-11 18:57:28.000000000 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1679,9 +1688,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/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.16/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h 2010-08-11 18:57:28.000000000 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -1748,9 +1757,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/elf.h linux-2.6.32.18/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.18/arch/powerpc/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/elf.h 2010-08-11 18:57:28.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. */ @@ -1783,9 +1792,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/p #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/iommu.h linux-2.6.32.18/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.18/arch/powerpc/include/asm/iommu.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/iommu.h 2010-08-11 18:57:28.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); @@ -1796,9 +1805,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1807,9 +1816,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.16 KM_TYPE_NR }; -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page_64.h linux-2.6.32.16/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/page_64.h linux-2.6.32.18/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.18/arch/powerpc/include/asm/page_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/page_64.h 2010-08-11 18:57:28.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. @@ -1831,9 +1840,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page_64.h linux-2.6.32.16/ar #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/powerpc/include/asm/page.h ---- linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/page.h linux-2.6.32.18/arch/powerpc/include/asm/page.h +--- linux-2.6.32.18/arch/powerpc/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/page.h 2010-08-11 18:57:28.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. @@ -1856,9 +1865,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/pci.h linux-2.6.32.18/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.18/arch/powerpc/include/asm/pci.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/pci.h 2010-08-11 18:57:28.000000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1870,9 +1879,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h 2010-08-11 18:57:28.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -1881,9 +1890,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.16 #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.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/reg.h linux-2.6.32.18/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.18/arch/powerpc/include/asm/reg.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/reg.h 2010-08-11 18:57:28.000000000 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -1892,9 +1901,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/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.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h 2010-08-11 18:57:28.000000000 -0400 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -1904,9 +1913,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/ar static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2084,9 +2093,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/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.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c 2010-08-11 18:57:28.000000000 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2096,9 +2105,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/ .show = cache_index_show, }; -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/arch/powerpc/kernel/dma.c ---- linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma.c linux-2.6.32.18/arch/powerpc/kernel/dma.c +--- linux-2.6.32.18/arch/powerpc/kernel/dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/dma.c 2010-08-11 18:57:28.000000000 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2108,9 +2117,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/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.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c 2010-08-11 18:57:28.000000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2120,9 +2129,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/ { struct iommu_table *tbl = get_iommu_table_base(dev); -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c 2010-08-11 18:57:28.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. @@ -2132,9 +2141,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/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.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S 2010-08-11 18:57:28.000000000 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2153,9 +2162,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S 2010-08-11 18:57:28.000000000 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2168,9 +2177,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c 2010-08-11 18:57:28.000000000 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2180,9 +2189,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/po .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/kgdb.c linux-2.6.32.18/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.18/arch/powerpc/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2201,9 +2210,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/power .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/module_32.c linux-2.6.32.18/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.18/arch/powerpc/kernel/module_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/module_32.c 2010-08-11 18:57:28.000000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2233,9 +2242,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/arch/powerpc/kernel/module.c ---- linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/module.c linux-2.6.32.18/arch/powerpc/kernel/module.c +--- linux-2.6.32.18/arch/powerpc/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/module.c 2010-08-11 18:57:28.000000000 -0400 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2275,9 +2284,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/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.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/pci-common.c linux-2.6.32.18/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.18/arch/powerpc/kernel/pci-common.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/pci-common.c 2010-08-11 18:57:28.000000000 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2296,9 +2305,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/powerpc/kernel/process.c ---- linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/process.c linux-2.6.32.18/arch/powerpc/kernel/process.c +--- linux-2.6.32.18/arch/powerpc/kernel/process.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/process.c 2010-08-11 18:57:28.000000000 -0400 @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; @@ -2351,9 +2360,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/po - - return ret; -} -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/signal_32.c linux-2.6.32.18/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.18/arch/powerpc/kernel/signal_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/signal_32.c 2010-08-11 18:57:28.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; @@ -2363,9 +2372,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/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.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/signal_64.c linux-2.6.32.18/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.18/arch/powerpc/kernel/signal_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/signal_64.c 2010-08-11 18:57:28.000000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2375,9 +2384,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/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.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c 2010-08-11 18:57:28.000000000 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2391,9 +2400,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/ } return error; } -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/vdso.c linux-2.6.32.18/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.18/arch/powerpc/kernel/vdso.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/vdso.c 2010-08-11 18:57:28.000000000 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2420,9 +2429,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/power if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerpc/kernel/vio.c ---- linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/kernel/vio.c linux-2.6.32.18/arch/powerpc/kernel/vio.c +--- linux-2.6.32.18/arch/powerpc/kernel/vio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/kernel/vio.c 2010-08-11 18:57:28.000000000 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2445,9 +2454,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerp viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c 2010-08-11 18:57:28.000000000 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2479,9 +2488,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/p -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/mm/fault.c ---- linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/mm/fault.c linux-2.6.32.18/arch/powerpc/mm/fault.c +--- linux-2.6.32.18/arch/powerpc/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/mm/fault.c 2010-08-11 18:57:28.000000000 -0400 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -2586,9 +2595,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/mm/mmap_64.c linux-2.6.32.18/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.18/arch/powerpc/mm/mmap_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/mm/mmap_64.c 2010-08-11 18:57:28.000000000 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2612,9 +2621,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerp mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/arch/powerpc/mm/slice.c ---- linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/mm/slice.c linux-2.6.32.18/arch/powerpc/mm/slice.c +--- linux-2.6.32.18/arch/powerpc/mm/slice.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/mm/slice.c 2010-08-11 18:57:28.000000000 -0400 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2627,9 +2636,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/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.16/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-11 18:57:28.000000000 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2639,9 +2648,9 @@ diff -urNp linux-2.6.32.16/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.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-11 18:57:29.000000000 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2651,9 +2660,9 @@ diff -urNp linux-2.6.32.16/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.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c 2010-08-11 18:57:29.000000000 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2663,9 +2672,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16 .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c 2010-08-11 18:57:29.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); @@ -2675,9 +2684,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/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.16/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c 2010-08-11 18:57:29.000000000 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2696,9 +2705,9 @@ diff -urNp linux-2.6.32.16/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.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-09 14:50:34.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig 2010-08-11 18:57:29.000000000 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -2708,9 +2717,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/arch/s390/include/asm/elf.h ---- linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/include/asm/elf.h linux-2.6.32.18/arch/s390/include/asm/elf.h +--- linux-2.6.32.18/arch/s390/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/include/asm/elf.h 2010-08-11 18:57:29.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) @@ -2725,9 +2734,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/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.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s390/include/asm/setup.h ---- linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/include/asm/setup.h linux-2.6.32.18/arch/s390/include/asm/setup.h +--- linux-2.6.32.18/arch/s390/include/asm/setup.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/include/asm/setup.h 2010-08-11 18:57:29.000000000 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -2744,9 +2753,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/include/asm/uaccess.h linux-2.6.32.18/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.18/arch/s390/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/include/asm/uaccess.h 2010-08-11 18:57:29.000000000 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2779,9 +2788,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig ---- linux-2.6.32.16/arch/s390/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/Kconfig 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/Kconfig linux-2.6.32.18/arch/s390/Kconfig +--- linux-2.6.32.18/arch/s390/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/Kconfig 2010-08-11 18:57:29.000000000 -0400 @@ -194,28 +194,26 @@ config AUDIT_ARCH config S390_SWITCH_AMODE @@ -2819,9 +2828,9 @@ diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig comment "Code generation options" -diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/kernel/module.c ---- linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/kernel/module.c linux-2.6.32.18/arch/s390/kernel/module.c +--- linux-2.6.32.18/arch/s390/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/kernel/module.c 2010-08-11 18:57:29.000000000 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2893,9 +2902,9 @@ diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/k rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/kernel/setup.c ---- linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/kernel/setup.c linux-2.6.32.18/arch/s390/kernel/setup.c +--- linux-2.6.32.18/arch/s390/kernel/setup.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/kernel/setup.c 2010-08-11 18:57:29.000000000 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -2949,9 +2958,9 @@ diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/arch/s390/mm/mmap.c ---- linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/s390/mm/mmap.c linux-2.6.32.18/arch/s390/mm/mmap.c +--- linux-2.6.32.18/arch/s390/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/s390/mm/mmap.c 2010-08-11 18:57:29.000000000 -0400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2998,9 +3007,9 @@ diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/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.16/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c 2010-08-11 18:57:29.000000000 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -3010,9 +3019,9 @@ diff -urNp linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.16/arch/s .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c 2010-08-11 18:57:29.000000000 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -3022,9 +3031,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.16/arch/sh/k .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-11 18:57:29.000000000 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -3034,9 +3043,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.16/arch .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/kgdb.c ---- linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sh/kernel/kgdb.c linux-2.6.32.18/arch/sh/kernel/kgdb.c +--- linux-2.6.32.18/arch/sh/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sh/kernel/kgdb.c 2010-08-11 18:57:29.000000000 -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -3046,9 +3055,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -14,18 +14,39 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3190,9 +3199,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h linux-2.6.32.16/ar } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h 2010-08-11 18:57:29.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) @@ -3224,9 +3233,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.16/ 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.16/arch/sparc/include/asm/elf_32.h linux-2.6.32.16/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/elf_32.h linux-2.6.32.18/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.18/arch/sparc/include/asm/elf_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/elf_32.h 2010-08-11 18:57:29.000000000 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3241,9 +3250,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_32.h linux-2.6.32.16/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.16/arch/sparc/include/asm/elf_64.h linux-2.6.32.16/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/elf_64.h linux-2.6.32.18/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.18/arch/sparc/include/asm/elf_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/elf_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3257,9 +3266,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_64.h linux-2.6.32.16/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.16/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h 2010-08-11 18:57:29.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3291,9 +3300,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.16/a extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h 2010-08-11 18:57:29.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3308,9 +3317,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arc #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3362,9 +3371,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.16/ " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h 2010-08-11 19:04:36.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) @@ -3416,9 +3425,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.16/a return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h 2010-08-11 19:04:36.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3461,21 +3470,26 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.16/a if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess.h linux-2.6.32.16/arch/sparc/include/asm/uaccess.h ---- linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 -@@ -1,5 +1,8 @@ +diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess.h linux-2.6.32.18/arch/sparc/include/asm/uaccess.h +--- linux-2.6.32.18/arch/sparc/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/include/asm/uaccess.h 2010-08-11 19:02:29.000000000 -0400 +@@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H + ++#ifdef __KERNEL__ ++#ifndef __ASSEMBLY__ ++#include <linux/types.h> +extern void check_object_size(const void *ptr, unsigned long n, bool to); ++#endif ++#endif + #if defined(__sparc__) && defined(__arch64__) #include <asm/uaccess_64.h> #else -diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/kernel/iommu.c ---- linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/iommu.c linux-2.6.32.18/arch/sparc/kernel/iommu.c +--- linux-2.6.32.18/arch/sparc/kernel/iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/iommu.c 2010-08-11 18:57:29.000000000 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3494,9 +3508,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/ EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc/kernel/ioport.c ---- linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/ioport.c linux-2.6.32.18/arch/sparc/kernel/ioport.c +--- linux-2.6.32.18/arch/sparc/kernel/ioport.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/ioport.c 2010-08-11 18:57:29.000000000 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3524,9 +3538,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3536,9 +3550,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3548,9 +3562,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc/kernel/Makefile ---- linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/Makefile linux-2.6.32.18/arch/sparc/kernel/Makefile +--- linux-2.6.32.18/arch/sparc/kernel/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/Makefile 2010-08-11 18:57:29.000000000 -0400 @@ -3,7 +3,7 @@ # @@ -3560,9 +3574,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c 2010-08-11 18:57:29.000000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3572,9 +3586,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/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.16/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3584,9 +3598,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.16/arch if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c 2010-08-11 18:57:29.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. @@ -3665,9 +3679,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.16/arch mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/kernel/traps_64.c linux-2.6.32.18/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.18/arch/sparc/kernel/traps_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/kernel/traps_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3699,9 +3713,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/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.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/lib/atomic_64.S linux-2.6.32.18/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.18/arch/sparc/lib/atomic_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/lib/atomic_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3915,9 +3929,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib/ksyms.c ---- linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/lib/ksyms.c linux-2.6.32.18/arch/sparc/lib/ksyms.c +--- linux-2.6.32.18/arch/sparc/lib/ksyms.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/lib/ksyms.c 2010-08-11 18:57:29.000000000 -0400 @@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3934,9 +3948,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ -diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/lib/rwsem_64.S linux-2.6.32.18/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.18/arch/sparc/lib/rwsem_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/lib/rwsem_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -4035,9 +4049,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefile ---- linux-2.6.32.16/arch/sparc/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/Makefile linux-2.6.32.18/arch/sparc/Makefile +--- linux-2.6.32.18/arch/sparc/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/Makefile 2010-08-11 18:57:29.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 @@ -4047,9 +4061,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefi VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/arch/sparc/mm/fault_32.c ---- linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/mm/fault_32.c linux-2.6.32.18/arch/sparc/mm/fault_32.c +--- linux-2.6.32.18/arch/sparc/mm/fault_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/mm/fault_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4353,9 +4367,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/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.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/arch/sparc/mm/fault_64.c ---- linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/mm/fault_64.c linux-2.6.32.18/arch/sparc/mm/fault_64.c +--- linux-2.6.32.18/arch/sparc/mm/fault_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/mm/fault_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -4853,9 +4867,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/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.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm/init_32.c ---- linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/mm/init_32.c linux-2.6.32.18/arch/sparc/mm/init_32.c +--- linux-2.6.32.18/arch/sparc/mm/init_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/mm/init_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4890,9 +4904,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/Makefile ---- linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/mm/Makefile linux-2.6.32.18/arch/sparc/mm/Makefile +--- linux-2.6.32.18/arch/sparc/mm/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/mm/Makefile 2010-08-11 18:57:29.000000000 -0400 @@ -2,7 +2,7 @@ # @@ -4902,9 +4916,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/arch/sparc/mm/srmmu.c ---- linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/sparc/mm/srmmu.c linux-2.6.32.18/arch/sparc/mm/srmmu.c +--- linux-2.6.32.18/arch/sparc/mm/srmmu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/sparc/mm/srmmu.c 2010-08-11 18:57:29.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)); @@ -4919,9 +4933,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/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.16/arch/um/include/asm/kmap_types.h linux-2.6.32.16/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/um/include/asm/kmap_types.h linux-2.6.32.18/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.18/arch/um/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/um/include/asm/kmap_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4930,9 +4944,9 @@ diff -urNp linux-2.6.32.16/arch/um/include/asm/kmap_types.h linux-2.6.32.16/arch KM_TYPE_NR }; -diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/include/asm/page.h ---- linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/um/include/asm/page.h linux-2.6.32.18/arch/um/include/asm/page.h +--- linux-2.6.32.18/arch/um/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/um/include/asm/page.h 2010-08-11 18:57:29.000000000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4943,9 +4957,9 @@ diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/in #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/um/sys-i386/syscalls.c linux-2.6.32.18/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.18/arch/um/sys-i386/syscalls.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/um/sys-i386/syscalls.c 2010-08-11 18:57:29.000000000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4968,9 +4982,9 @@ diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/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.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/bitops.h ---- linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/bitops.h linux-2.6.32.18/arch/x86/boot/bitops.h +--- linux-2.6.32.18/arch/x86/boot/bitops.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/bitops.h 2010-08-11 18:57:29.000000000 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -4989,9 +5003,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/ } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/boot.h ---- linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/boot.h linux-2.6.32.18/arch/x86/boot/boot.h +--- linux-2.6.32.18/arch/x86/boot/boot.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/boot.h 2010-08-11 18:57:29.000000000 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5010,9 +5024,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/bo : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_32.S linux-2.6.32.16/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/head_32.S linux-2.6.32.18/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.18/arch/x86/boot/compressed/head_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/compressed/head_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5041,9 +5055,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_32.S linux-2.6.32.16/ar addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_64.S linux-2.6.32.16/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/head_64.S linux-2.6.32.18/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.18/arch/x86/boot/compressed/head_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/compressed/head_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5062,9 +5076,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_64.S linux-2.6.32.16/ar #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/misc.c linux-2.6.32.18/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.18/arch/x86/boot/compressed/misc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/compressed/misc.c 2010-08-11 18:57:29.000000000 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5083,9 +5097,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/ error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c 2010-08-11 18:57:29.000000000 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -5095,9 +5109,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/ar offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-09 14:50:44.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/relocs.c linux-2.6.32.18/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.18/arch/x86/boot/compressed/relocs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/compressed/relocs.c 2010-08-11 18:57:29.000000000 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -5298,9 +5312,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boot/cpucheck.c ---- linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/cpucheck.c linux-2.6.32.18/arch/x86/boot/cpucheck.c +--- linux-2.6.32.18/arch/x86/boot/cpucheck.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/cpucheck.c 2010-08-11 18:57:29.000000000 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5396,9 +5410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boo err = check_flags(); } -diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/arch/x86/boot/header.S ---- linux-2.6.32.16/arch/x86/boot/header.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/header.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/header.S linux-2.6.32.18/arch/x86/boot/header.S +--- linux-2.6.32.18/arch/x86/boot/header.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/header.S 2010-08-11 18:57:29.000000000 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5408,9 +5422,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/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.16/arch/x86/boot/memory.c linux-2.6.32.16/arch/x86/boot/memory.c ---- linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/memory.c linux-2.6.32.18/arch/x86/boot/memory.c +--- linux-2.6.32.18/arch/x86/boot/memory.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/memory.c 2010-08-11 18:57:29.000000000 -0400 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -5420,9 +5434,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/memory.c linux-2.6.32.16/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.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/video.c ---- linux-2.6.32.16/arch/x86/boot/video.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/video.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/video.c linux-2.6.32.18/arch/x86/boot/video.c +--- linux-2.6.32.18/arch/x86/boot/video.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/video.c 2010-08-11 18:57:29.000000000 -0400 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -5432,9 +5446,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/v int key; unsigned int v; -diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/boot/video-vesa.c ---- linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/boot/video-vesa.c linux-2.6.32.18/arch/x86/boot/video-vesa.c +--- linux-2.6.32.18/arch/x86/boot/video-vesa.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/boot/video-vesa.c 2010-08-11 18:57:29.000000000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5443,9 +5457,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/b } /* -diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia32/ia32entry.S ---- linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/ia32/ia32entry.S linux-2.6.32.18/arch/x86/ia32/ia32entry.S +--- linux-2.6.32.18/arch/x86/ia32/ia32entry.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/ia32/ia32entry.S 2010-08-11 18:57:29.000000000 -0400 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -5540,9 +5554,9 @@ diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/ia32/ia32_signal.c linux-2.6.32.18/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.18/arch/x86/ia32/ia32_signal.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/ia32/ia32_signal.c 2010-08-11 18:57:29.000000000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5561,9 +5575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/ }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/arch/x86/include/asm/alternative.h ---- linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/alternative.h linux-2.6.32.18/arch/x86/include/asm/alternative.h +--- linux-2.6.32.18/arch/x86/include/asm/alternative.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/alternative.h 2010-08-11 18:57:29.000000000 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5573,9 +5587,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/ar "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/include/asm/apm.h ---- linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/apm.h linux-2.6.32.18/arch/x86/include/asm/apm.h +--- linux-2.6.32.18/arch/x86/include/asm/apm.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/apm.h 2010-08-11 18:57:29.000000000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5594,9 +5608,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/i "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_32.h linux-2.6.32.16/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/atomic_32.h linux-2.6.32.18/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.18/arch/x86/include/asm/atomic_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/atomic_32.h 2010-08-11 18:57:29.000000000 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5939,9 +5953,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_32.h linux-2.6.32.16/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.16/arch/x86/include/asm/atomic_64.h linux-2.6.32.16/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/atomic_64.h linux-2.6.32.18/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.18/arch/x86/include/asm/atomic_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/atomic_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -6545,9 +6559,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_64.h linux-2.6.32.16/arch } /** -diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/arch/x86/include/asm/boot.h ---- linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/boot.h linux-2.6.32.18/arch/x86/include/asm/boot.h +--- linux-2.6.32.18/arch/x86/include/asm/boot.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/boot.h 2010-08-11 18:57:29.000000000 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6565,9 +6579,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/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.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arch/x86/include/asm/cacheflush.h ---- linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/cacheflush.h linux-2.6.32.18/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.18/arch/x86/include/asm/cacheflush.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/cacheflush.h 2010-08-11 18:57:29.000000000 -0400 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -6586,9 +6600,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arc ClearPageUncached(pg); ClearPageWC(pg); break; -diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86/include/asm/cache.h ---- linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/cache.h linux-2.6.32.18/arch/x86/include/asm/cache.h +--- linux-2.6.32.18/arch/x86/include/asm/cache.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/cache.h 2010-08-11 18:57:29.000000000 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6597,9 +6611,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/checksum_32.h linux-2.6.32.16/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/checksum_32.h linux-2.6.32.18/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.18/arch/x86/include/asm/checksum_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/checksum_32.h 2010-08-11 18:57:29.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6633,9 +6647,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/checksum_32.h linux-2.6.32.16/ar len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/include/asm/desc.h ---- linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/desc.h linux-2.6.32.18/arch/x86/include/asm/desc.h +--- linux-2.6.32.18/arch/x86/include/asm/desc.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/desc.h 2010-08-11 18:57:29.000000000 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -6805,9 +6819,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x86/include/asm/device.h ---- linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/device.h linux-2.6.32.18/arch/x86/include/asm/device.h +--- linux-2.6.32.18/arch/x86/include/asm/device.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/device.h 2010-08-11 18:57:29.000000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6817,9 +6831,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x8 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h 2010-08-11 18:57:29.000000000 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6859,9 +6873,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h linux-2.6.32.16/ar WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/include/asm/e820.h ---- linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/e820.h linux-2.6.32.18/arch/x86/include/asm/e820.h +--- linux-2.6.32.18/arch/x86/include/asm/e820.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/e820.h 2010-08-11 18:57:29.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) @@ -6871,9 +6885,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/ #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/include/asm/elf.h ---- linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/elf.h linux-2.6.32.18/arch/x86/include/asm/elf.h +--- linux-2.6.32.18/arch/x86/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/elf.h 2010-08-11 18:57:29.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. */ @@ -6927,9 +6941,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86/include/asm/futex.h ---- linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/futex.h linux-2.6.32.18/arch/x86/include/asm/futex.h +--- linux-2.6.32.18/arch/x86/include/asm/futex.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/futex.h 2010-08-11 18:57:29.000000000 -0400 @@ -11,17 +11,54 @@ #include <asm/processor.h> #include <asm/system.h> @@ -7066,9 +7080,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86 : "memory" ); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/include/asm/i387.h ---- linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/i387.h linux-2.6.32.18/arch/x86/include/asm/i387.h +--- linux-2.6.32.18/arch/x86/include/asm/i387.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/i387.h 2010-08-11 18:57:29.000000000 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7109,9 +7123,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/ /* * These must be called with preempt disabled -diff -urNp linux-2.6.32.16/arch/x86/include/asm/io_64.h linux-2.6.32.16/arch/x86/include/asm/io_64.h ---- linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/io_64.h linux-2.6.32.18/arch/x86/include/asm/io_64.h +--- linux-2.6.32.18/arch/x86/include/asm/io_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/io_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -7130,9 +7144,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/io_64.h linux-2.6.32.16/arch/x86 #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86/include/asm/iommu.h ---- linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/iommu.h linux-2.6.32.18/arch/x86/include/asm/iommu.h +--- linux-2.6.32.18/arch/x86/include/asm/iommu.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/iommu.h 2010-08-11 18:57:29.000000000 -0400 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -7142,9 +7156,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/irqflags.h linux-2.6.32.18/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.18/arch/x86/include/asm/irqflags.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/irqflags.h 2010-08-11 18:57:29.000000000 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -7157,9 +7171,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.32.16/arch/x86/include/asm/kvm_host.h linux-2.6.32.16/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/kvm_host.h linux-2.6.32.18/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.18/arch/x86/include/asm/kvm_host.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/kvm_host.h 2010-08-11 18:57:29.000000000 -0400 @@ -533,7 +533,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -7169,9 +7183,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/kvm_host.h linux-2.6.32.16/arch/ int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86/include/asm/local.h ---- linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/local.h linux-2.6.32.18/arch/x86/include/asm/local.h +--- linux-2.6.32.18/arch/x86/include/asm/local.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/local.h 2010-08-11 18:57:29.000000000 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7396,9 +7410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h ---- linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h +--- linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h 2010-08-11 18:57:29.000000000 -0400 @@ -81,8 +81,8 @@ static inline unsigned char current_lock #else #define lock_cmos_prefix(reg) do {} while (0) @@ -7410,9 +7424,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/ar #define do_i_have_lock_cmos() 0 #define current_lock_cmos_reg() 0 #endif -diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch/x86/include/asm/microcode.h ---- linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/microcode.h linux-2.6.32.18/arch/x86/include/asm/microcode.h +--- linux-2.6.32.18/arch/x86/include/asm/microcode.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/microcode.h 2010-08-11 18:57:29.000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -7453,9 +7467,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch { return NULL; } -diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/include/asm/mman.h ---- linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/mman.h linux-2.6.32.18/arch/x86/include/asm/mman.h +--- linux-2.6.32.18/arch/x86/include/asm/mman.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/mman.h 2010-08-11 18:57:29.000000000 -0400 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -7471,9 +7485,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu_context.h linux-2.6.32.16/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/mmu_context.h linux-2.6.32.18/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.18/arch/x86/include/asm/mmu_context.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/mmu_context.h 2010-08-11 18:57:29.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) @@ -7598,9 +7612,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu_context.h linux-2.6.32.16/ar } #define activate_mm(prev, next) \ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/include/asm/mmu.h ---- linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/mmu.h linux-2.6.32.18/arch/x86/include/asm/mmu.h +--- linux-2.6.32.18/arch/x86/include/asm/mmu.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/mmu.h 2010-08-11 18:57:29.000000000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -7627,9 +7641,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/i } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x86/include/asm/module.h ---- linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/module.h linux-2.6.32.18/arch/x86/include/asm/module.h +--- linux-2.6.32.18/arch/x86/include/asm/module.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/module.h 2010-08-11 18:57:29.000000000 -0400 @@ -59,13 +59,31 @@ #error unknown processor family #endif @@ -7663,9 +7677,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x8 #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_32_types.h linux-2.6.32.16/arch/x86/include/asm/page_32_types.h ---- linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/page_32_types.h linux-2.6.32.18/arch/x86/include/asm/page_32_types.h +--- linux-2.6.32.18/arch/x86/include/asm/page_32_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/page_32_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -7677,9 +7691,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_32_types.h linux-2.6.32.16/ #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_64_types.h linux-2.6.32.16/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/page_64_types.h linux-2.6.32.18/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.18/arch/x86/include/asm/page_64_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/page_64_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -7690,9 +7704,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_64_types.h linux-2.6.32.16/ /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/paravirt.h linux-2.6.32.18/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.18/arch/x86/include/asm/paravirt.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/paravirt.h 2010-08-11 18:57:29.000000000 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -7746,9 +7760,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/ #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h 2010-08-11 18:57:29.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, @@ -7762,9 +7776,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h linux-2.6.32.16 }; struct raw_spinlock; -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pci_x86.h linux-2.6.32.16/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pci_x86.h linux-2.6.32.18/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.18/arch/x86/include/asm/pci_x86.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pci_x86.h 2010-08-11 18:57:29.000000000 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -7787,9 +7801,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pci_x86.h linux-2.6.32.16/arch/x extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgalloc.h linux-2.6.32.18/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.18/arch/x86/include/asm/pgalloc.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgalloc.h 2010-08-11 18:57:29.000000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7804,9 +7818,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h 2010-08-11 18:57:29.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) @@ -7817,9 +7831,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.16 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h 2010-08-11 18:57:29.000000000 -0400 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -7861,9 +7875,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h linux-2.6.32.16/arc /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -7893,9 +7907,9 @@ diff -urNp linux-2.6.32.16/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.16/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h 2010-08-11 18:57:29.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) @@ -7913,9 +7927,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.16 } /* -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -7952,9 +7966,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h linux-2.6.32.16/arc } static inline void native_pgd_clear(pgd_t *pgd) -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -7963,9 +7977,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. +#define MODULES_EXEC_END MODULES_END #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable.h linux-2.6.32.18/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable.h 2010-08-11 18:57:29.000000000 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -8135,9 +8149,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h 2010-08-11 18:57:29.000000000 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -8258,9 +8272,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h linux-2.6.32.16/ #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/arch/x86/include/asm/processor.h ---- linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/processor.h linux-2.6.32.18/arch/x86/include/asm/processor.h +--- linux-2.6.32.18/arch/x86/include/asm/processor.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/processor.h 2010-08-11 18:57:29.000000000 -0400 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -8345,9 +8359,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/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.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/ptrace.h linux-2.6.32.18/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.18/arch/x86/include/asm/ptrace.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/ptrace.h 2010-08-11 18:57:29.000000000 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -8384,9 +8398,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x8 #endif } -diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/arch/x86/include/asm/reboot.h ---- linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/reboot.h linux-2.6.32.18/arch/x86/include/asm/reboot.h +--- linux-2.6.32.18/arch/x86/include/asm/reboot.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/reboot.h 2010-08-11 18:57:29.000000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -8396,9 +8410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/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.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/rwsem.h linux-2.6.32.18/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.18/arch/x86/include/asm/rwsem.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/rwsem.h 2010-08-11 18:57:29.000000000 -0400 @@ -118,10 +118,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -8634,9 +8648,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86 : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/arch/x86/include/asm/segment.h ---- linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/segment.h linux-2.6.32.18/arch/x86/include/asm/segment.h +--- linux-2.6.32.18/arch/x86/include/asm/segment.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/segment.h 2010-08-11 18:57:29.000000000 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -8705,9 +8719,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/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.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/spinlock.h linux-2.6.32.18/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.18/arch/x86/include/asm/spinlock.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/spinlock.h 2010-08-11 18:57:29.000000000 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -8811,9 +8825,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/arch/x86/include/asm/system.h ---- linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/system.h linux-2.6.32.18/arch/x86/include/asm/system.h +--- linux-2.6.32.18/arch/x86/include/asm/system.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/system.h 2010-08-11 18:57:29.000000000 -0400 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -8832,9 +8846,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/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.16/arch/x86/include/asm/uaccess_32.h linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h 2010-08-11 18:57:29.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) @@ -8964,9 +8978,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h linux-2.6.32.16/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.16/arch/x86/include/asm/uaccess_64.h linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h 2010-08-11 18:57:29.000000000 -0400 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #include <linux/lockdep.h> @@ -9158,9 +9172,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h linux-2.6.32.16/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.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-11 21:16:08.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess.h linux-2.6.32.18/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.18/arch/x86/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/uaccess.h 2010-08-11 18:57:29.000000000 -0400 @@ -8,12 +8,15 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -9398,9 +9412,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/vgtod.h linux-2.6.32.18/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.18/arch/x86/include/asm/vgtod.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/vgtod.h 2010-08-11 18:57:29.000000000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -9409,9 +9423,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/include/asm/vmi.h ---- linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/vmi.h linux-2.6.32.18/arch/x86/include/asm/vmi.h +--- linux-2.6.32.18/arch/x86/include/asm/vmi.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/vmi.h 2010-08-11 18:57:29.000000000 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -9420,9 +9434,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/i } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/vsyscall.h linux-2.6.32.18/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.18/arch/x86/include/asm/vsyscall.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/vsyscall.h 2010-08-11 18:57:29.000000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -9453,9 +9467,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/ #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86/include/asm/xsave.h ---- linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/include/asm/xsave.h linux-2.6.32.18/arch/x86/include/asm/xsave.h +--- linux-2.6.32.18/arch/x86/include/asm/xsave.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/include/asm/xsave.h 2010-08-11 18:57:29.000000000 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -9481,9 +9495,27 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig ---- linux-2.6.32.16/arch/x86/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/Kconfig 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/Kconfig linux-2.6.32.18/arch/x86/Kconfig +--- linux-2.6.32.18/arch/x86/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/Kconfig 2010-08-11 22:31:27.000000000 -0400 +@@ -992,7 +992,7 @@ choice + + config NOHIGHMEM + bool "off" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Linux can use up to 64 Gigabytes of physical memory on x86 systems. + However, the address space of 32-bit x86 processors is only 4 +@@ -1029,7 +1029,7 @@ config NOHIGHMEM + + config HIGHMEM4G + bool "4GB" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Select this if you have a 32-bit processor and between 1 and 4 + gigabytes of physical RAM. @@ -1083,7 +1083,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT @@ -9530,9 +9562,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig.cpu ---- linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/Kconfig.cpu linux-2.6.32.18/arch/x86/Kconfig.cpu +--- linux-2.6.32.18/arch/x86/Kconfig.cpu 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/Kconfig.cpu 2010-08-11 18:57:29.000000000 -0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -9560,9 +9592,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/arch/x86/Kconfig.debug ---- linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/Kconfig.debug linux-2.6.32.18/arch/x86/Kconfig.debug +--- linux-2.6.32.18/arch/x86/Kconfig.debug 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/Kconfig.debug 2010-08-11 18:57:29.000000000 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -9572,9 +9604,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/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.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/kernel/acpi/boot.c ---- linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/boot.c linux-2.6.32.18/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32.18/arch/x86/kernel/acpi/boot.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/acpi/boot.c 2010-08-11 18:57:29.000000000 -0400 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -9584,9 +9616,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/ }; /* -diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-11 18:57:29.000000000 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -9596,9 +9628,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1 wrmsr 1: -diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c 2010-08-11 18:57:29.000000000 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -9643,9 +9675,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86 } -diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S 2010-08-11 18:57:29.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 @@ -9662,9 +9694,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.16/arch bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x86/kernel/alternative.c ---- linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/alternative.c linux-2.6.32.18/arch/x86/kernel/alternative.c +--- linux-2.6.32.18/arch/x86/kernel/alternative.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/alternative.c 2010-08-11 18:57:29.000000000 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -9746,9 +9778,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x8 + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/amd_iommu.c linux-2.6.32.18/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.18/arch/x86/kernel/amd_iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/amd_iommu.c 2010-08-11 18:57:29.000000000 -0400 @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -9758,9 +9790,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/ .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c 2010-08-11 18:57:29.000000000 -0400 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -9797,9 +9829,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c linux-2.6.32.16/arch/x { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/kernel/apm_32.c ---- linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/apm_32.c linux-2.6.32.18/arch/x86/kernel/apm_32.c +--- linux-2.6.32.18/arch/x86/kernel/apm_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/apm_32.c 2010-08-11 18:57:29.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. @@ -9901,9 +9933,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/ker proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c 2010-08-11 18:57:29.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); @@ -9916,9 +9948,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.16/arch #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c 2010-08-11 18:57:29.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); @@ -9946,9 +9978,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.16/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.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/common.c linux-2.6.32.18/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/common.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/common.c 2010-08-11 18:57:29.000000000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -10057,9 +10089,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86 struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-11 18:57:29.000000000 -0400 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -10069,9 +10101,9 @@ diff -urNp linux-2.6.32.16/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.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-11 18:57:29.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 }, @@ -10081,9 +10113,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/intel.c linux-2.6.32.18/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/intel.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/intel.c 2010-08-11 18:57:29.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. @@ -10093,9 +10125,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/ load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-11 18:57:29.000000000 -0400 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -10105,9 +10137,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.16 .show = show, .store = store, }; -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/Makefile linux-2.6.32.18/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.18/arch/x86/kernel/cpu/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/Makefile 2010-08-11 18:57:29.000000000 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -10119,9 +10151,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/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.16/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-11 18:57:29.000000000 -0400 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -10131,9 +10163,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.16/ .show = show, .store = store, }; -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-11 18:57:29.000000000 -0400 @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -10186,9 +10218,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.16/arch }; /* -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-11 18:57:29.000000000 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -10198,9 +10230,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.16/arch/x .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-11 18:57:29.000000000 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -10210,9 +10242,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.16/ar .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-11 18:57:29.000000000 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -10222,9 +10254,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.16/arch .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-11 18:57:29.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 */ @@ -10243,9 +10275,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.16/ar .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c 2010-08-11 18:57:29.000000000 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -10264,9 +10296,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.16/arch/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-11 18:57:29.000000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -10317,9 +10349,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.16/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.16/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-11 18:57:29.000000000 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -10353,9 +10385,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1 static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c 2010-08-11 18:57:29.000000000 -0400 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs break; @@ -10365,9 +10397,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.16/arch } } -diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kernel/crash.c ---- linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/crash.c linux-2.6.32.18/arch/x86/kernel/crash.c +--- linux-2.6.32.18/arch/x86/kernel/crash.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/crash.c 2010-08-11 18:57:29.000000000 -0400 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -10377,9 +10409,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/doublefault_32.c linux-2.6.32.18/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.18/arch/x86/kernel/doublefault_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/doublefault_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -10411,9 +10443,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c 2010-08-11 18:57:29.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.. @@ -10458,9 +10490,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/dumpstack.c linux-2.6.32.18/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.18/arch/x86/kernel/dumpstack.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/dumpstack.c 2010-08-11 18:57:29.000000000 -0400 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -10488,9 +10520,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/ report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kernel/e820.c ---- linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/e820.c linux-2.6.32.18/arch/x86/kernel/e820.c +--- linux-2.6.32.18/arch/x86/kernel/e820.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/e820.c 2010-08-11 18:57:29.000000000 -0400 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -10500,9 +10532,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kerne }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/kernel/efi_32.c ---- linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/efi_32.c linux-2.6.32.18/arch/x86/kernel/efi_32.c +--- linux-2.6.32.18/arch/x86/kernel/efi_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/efi_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -38,70 +38,38 @@ */ @@ -10583,9 +10615,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/ker /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -6,6 +6,7 @@ */ @@ -10684,9 +10716,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S linux-2.6.32.16/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/arch/x86/kernel/entry_32.S ---- linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/entry_32.S linux-2.6.32.18/arch/x86/kernel/entry_32.S +--- linux-2.6.32.18/arch/x86/kernel/entry_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/entry_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -191,7 +191,67 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -10997,9 +11029,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/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.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/kernel/entry_64.S ---- linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/entry_64.S linux-2.6.32.18/arch/x86/kernel/entry_64.S +--- linux-2.6.32.18/arch/x86/kernel/entry_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/entry_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -11457,9 +11489,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/k RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/kernel/ftrace.c ---- linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/ftrace.c linux-2.6.32.18/arch/x86/kernel/ftrace.c +--- linux-2.6.32.18/arch/x86/kernel/ftrace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/ftrace.c 2010-08-11 18:57:29.000000000 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -11525,9 +11557,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/ker if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/kernel/head32.c ---- linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/head32.c linux-2.6.32.18/arch/x86/kernel/head32.c +--- linux-2.6.32.18/arch/x86/kernel/head32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/head32.c 2010-08-11 18:57:29.000000000 -0400 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -11545,9 +11577,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/ker #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/arch/x86/kernel/head_32.S ---- linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/head_32.S linux-2.6.32.18/arch/x86/kernel/head_32.S +--- linux-2.6.32.18/arch/x86/kernel/head_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/head_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -11994,9 +12026,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/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.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/kernel/head_64.S ---- linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/head_64.S linux-2.6.32.18/arch/x86/kernel/head_64.S +--- linux-2.6.32.18/arch/x86/kernel/head_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/head_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -12267,9 +12299,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/ke __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -12291,9 +12323,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.16/arch/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/arch/x86/kernel/init_task.c ---- linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/init_task.c linux-2.6.32.18/arch/x86/kernel/init_task.c +--- linux-2.6.32.18/arch/x86/kernel/init_task.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/init_task.c 2010-08-11 18:57:29.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. @@ -12302,9 +12334,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/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.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/kernel/ioport.c ---- linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/ioport.c linux-2.6.32.18/arch/x86/kernel/ioport.c +--- linux-2.6.32.18/arch/x86/kernel/ioport.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/ioport.c 2010-08-11 18:57:29.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -12348,9 +12380,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/ker if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/kernel/irq_32.c ---- linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/irq_32.c linux-2.6.32.18/arch/x86/kernel/irq_32.c +--- linux-2.6.32.18/arch/x86/kernel/irq_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/irq_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -12369,9 +12401,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/ker call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kernel/kgdb.c ---- linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/kgdb.c linux-2.6.32.18/arch/x86/kernel/kgdb.c +--- linux-2.6.32.18/arch/x86/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/kgdb.c 2010-08-11 18:57:29.000000000 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -12381,9 +12413,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/kernel/kprobes.c ---- linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/kprobes.c linux-2.6.32.18/arch/x86/kernel/kprobes.c +--- linux-2.6.32.18/arch/x86/kernel/kprobes.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/kprobes.c 2010-08-11 18:57:29.000000000 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -12476,9 +12508,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/ke return ret; switch (val) { -diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel/ldt.c ---- linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/ldt.c linux-2.6.32.18/arch/x86/kernel/ldt.c +--- linux-2.6.32.18/arch/x86/kernel/ldt.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/ldt.c 2010-08-11 18:57:29.000000000 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -12543,9 +12575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -12573,9 +12605,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.16/ar relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_amd.c linux-2.6.32.18/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.18/arch/x86/kernel/microcode_amd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/microcode_amd.c 2010-08-11 18:57:29.000000000 -0400 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -12594,9 +12626,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_core.c linux-2.6.32.18/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.18/arch/x86/kernel/microcode_core.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/microcode_core.c 2010-08-11 18:57:29.000000000 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -12606,9 +12638,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch /* * Synchronization. -diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_intel.c linux-2.6.32.18/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.18/arch/x86/kernel/microcode_intel.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/microcode_intel.c 2010-08-11 18:57:29.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) @@ -12643,9 +12675,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arc { return µcode_intel_ops; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/kernel/module.c ---- linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/module.c linux-2.6.32.18/arch/x86/kernel/module.c +--- linux-2.6.32.18/arch/x86/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/module.c 2010-08-11 18:57:29.000000000 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -12786,9 +12818,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/ker #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/kernel/paravirt.c ---- linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/paravirt.c linux-2.6.32.18/arch/x86/kernel/paravirt.c +--- linux-2.6.32.18/arch/x86/kernel/paravirt.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/paravirt.c 2010-08-11 18:57:29.000000000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -12892,9 +12924,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/k }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c 2010-08-11 18:57:29.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -12904,10 +12936,10 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/ #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-09 14:50:35.000000000 -0400 -@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct +diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c 2010-08-11 18:57:29.000000000 -0400 +@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -12916,9 +12948,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.16/arch .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-dma.c linux-2.6.32.18/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.18/arch/x86/kernel/pci-dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/pci-dma.c 2010-08-11 18:57:29.000000000 -0400 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -12937,9 +12969,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/ke #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -12949,9 +12981,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c linux-2.6.32.16/arch/x8 .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-nommu.c linux-2.6.32.18/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.18/arch/x86/kernel/pci-nommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/pci-nommu.c 2010-08-11 18:57:29.000000000 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -12961,9 +12993,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/ .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c 2010-08-11 18:57:29.000000000 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -12973,9 +13005,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/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.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86/kernel/process_32.c ---- linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/process_32.c linux-2.6.32.18/arch/x86/kernel/process_32.c +--- linux-2.6.32.18/arch/x86/kernel/process_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/process_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -13070,9 +13102,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86 + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86/kernel/process_64.c ---- linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/process_64.c linux-2.6.32.18/arch/x86/kernel/process_64.c +--- linux-2.6.32.18/arch/x86/kernel/process_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/process_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -13115,9 +13147,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86 return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/kernel/process.c ---- linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/process.c linux-2.6.32.18/arch/x86/kernel/process.c +--- linux-2.6.32.18/arch/x86/kernel/process.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/process.c 2010-08-11 18:57:29.000000000 -0400 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -13155,9 +13187,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/ke - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/kernel/ptrace.c ---- linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/ptrace.c linux-2.6.32.18/arch/x86/kernel/ptrace.c +--- linux-2.6.32.18/arch/x86/kernel/ptrace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/ptrace.c 2010-08-11 18:57:29.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) { @@ -13226,9 +13258,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/ker /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/kernel/reboot.c ---- linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/reboot.c linux-2.6.32.18/arch/x86/kernel/reboot.c +--- linux-2.6.32.18/arch/x86/kernel/reboot.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/reboot.c 2010-08-11 18:57:29.000000000 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -13305,9 +13337,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/ker /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/arch/x86/kernel/setup.c ---- linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/setup.c linux-2.6.32.18/arch/x86/kernel/setup.c +--- linux-2.6.32.18/arch/x86/kernel/setup.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/setup.c 2010-08-11 18:57:29.000000000 -0400 @@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -13328,9 +13360,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/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.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/setup_percpu.c linux-2.6.32.18/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.18/arch/x86/kernel/setup_percpu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/setup_percpu.c 2010-08-11 18:57:29.000000000 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -13393,9 +13425,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/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.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/kernel/signal.c ---- linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/signal.c linux-2.6.32.18/arch/x86/kernel/signal.c +--- linux-2.6.32.18/arch/x86/kernel/signal.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/signal.c 2010-08-11 18:57:29.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. @@ -13467,9 +13499,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/ker return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/arch/x86/kernel/smpboot.c ---- linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/smpboot.c linux-2.6.32.18/arch/x86/kernel/smpboot.c +--- linux-2.6.32.18/arch/x86/kernel/smpboot.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/smpboot.c 2010-08-11 18:57:29.000000000 -0400 @@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; @@ -13495,9 +13527,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/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.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kernel/step.c ---- linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/step.c linux-2.6.32.18/arch/x86/kernel/step.c +--- linux-2.6.32.18/arch/x86/kernel/step.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/step.c 2010-08-11 18:57:29.000000000 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -13530,17 +13562,17 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kerne /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S 2010-08-11 18:57:29.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.16/arch/x86/kernel/sys_i386_32.c linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -13787,9 +13819,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c linux-2.6.32.16/arch/x8 } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -13871,9 +13903,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c linux-2.6.32.16/arch/x86 mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kernel/time.c ---- linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/time.c linux-2.6.32.18/arch/x86/kernel/time.c +--- linux-2.6.32.18/arch/x86/kernel/time.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/time.c 2010-08-11 18:57:29.000000000 -0400 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -13912,9 +13944,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kerne } return pc; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel/tls.c ---- linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/tls.c linux-2.6.32.18/arch/x86/kernel/tls.c +--- linux-2.6.32.18/arch/x86/kernel/tls.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/tls.c 2010-08-11 18:57:29.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; @@ -13927,9 +13959,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/trampoline_32.S linux-2.6.32.18/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.18/arch/x86/kernel/trampoline_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/trampoline_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -13952,9 +13984,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/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.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kernel/traps.c ---- linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/traps.c linux-2.6.32.18/arch/x86/kernel/traps.c +--- linux-2.6.32.18/arch/x86/kernel/traps.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/traps.c 2010-08-11 18:57:29.000000000 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -14104,9 +14136,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kern handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel/tsc.c ---- linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/tsc.c linux-2.6.32.18/arch/x86/kernel/tsc.c +--- linux-2.6.32.18/arch/x86/kernel/tsc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/tsc.c 2010-08-11 18:57:29.000000000 -0400 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -14116,9 +14148,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/vm86_32.c linux-2.6.32.18/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.18/arch/x86/kernel/vm86_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/vm86_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -14183,9 +14215,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/ke if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/vmi_32.c linux-2.6.32.18/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.18/arch/x86/kernel/vmi_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/vmi_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -14345,9 +14377,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/ker return; local_irq_save(flags); -diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-10 08:19:32.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S 2010-08-11 18:57:29.000000000 -0400 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -14640,9 +14672,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x8 "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -14676,9 +14708,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x8 }; #endif -diff -urNp linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -14688,9 +14720,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.16/arch EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kernel/xsave.c ---- linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kernel/xsave.c linux-2.6.32.18/arch/x86/kernel/xsave.c +--- linux-2.6.32.18/arch/x86/kernel/xsave.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kernel/xsave.c 2010-08-11 18:57:29.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; @@ -14718,9 +14750,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kern buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/emulate.c ---- linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kvm/emulate.c linux-2.6.32.18/arch/x86/kvm/emulate.c +--- linux-2.6.32.18/arch/x86/kvm/emulate.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kvm/emulate.c 2010-08-11 18:57:29.000000000 -0400 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #define Src2ImmByte (2<<29) @@ -14757,9 +14789,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/e switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/arch/x86/kvm/lapic.c ---- linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kvm/lapic.c linux-2.6.32.18/arch/x86/kvm/lapic.c +--- linux-2.6.32.18/arch/x86/kvm/lapic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kvm/lapic.c 2010-08-11 18:57:29.000000000 -0400 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -14769,10 +14801,10 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/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.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c ---- linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-09 14:50:35.000000000 -0400 -@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k +diff -urNp linux-2.6.32.18/arch/x86/kvm/svm.c linux-2.6.32.18/arch/x86/kvm/svm.c +--- linux-2.6.32.18/arch/x86/kvm/svm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kvm/svm.c 2010-08-11 18:57:29.000000000 -0400 +@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { int cpu = raw_smp_processor_id(); @@ -14786,7 +14818,7 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void) +@@ -2940,7 +2943,7 @@ static bool svm_gb_page_enable(void) return true; } @@ -14795,9 +14827,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/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.16/arch/x86/kvm/vmx.c linux-2.6.32.16/arch/x86/kvm/vmx.c ---- linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kvm/vmx.c linux-2.6.32.18/arch/x86/kvm/vmx.c +--- linux-2.6.32.18/arch/x86/kvm/vmx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kvm/vmx.c 2010-08-11 18:57:29.000000000 -0400 @@ -569,7 +569,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -14879,9 +14911,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/vmx.c linux-2.6.32.16/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.16/arch/x86/kvm/x86.c linux-2.6.32.16/arch/x86/kvm/x86.c ---- linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/kvm/x86.c linux-2.6.32.18/arch/x86/kvm/x86.c +--- linux-2.6.32.18/arch/x86/kvm/x86.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/kvm/x86.c 2010-08-11 18:57:29.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); @@ -14983,9 +15015,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/x86.c linux-2.6.32.16/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.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/lib/checksum_32.S ---- linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/checksum_32.S linux-2.6.32.18/arch/x86/lib/checksum_32.S +--- linux-2.6.32.18/arch/x86/lib/checksum_32.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/checksum_32.S 2010-08-11 18:57:29.000000000 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -15231,9 +15263,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/l #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.32.16/arch/x86/lib/clear_page_64.S linux-2.6.32.16/arch/x86/lib/clear_page_64.S ---- linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/clear_page_64.S linux-2.6.32.18/arch/x86/lib/clear_page_64.S +--- linux-2.6.32.18/arch/x86/lib/clear_page_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/clear_page_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -15243,9 +15275,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/clear_page_64.S linux-2.6.32.16/arch/x86 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.16/arch/x86/lib/copy_page_64.S linux-2.6.32.16/arch/x86/lib/copy_page_64.S ---- linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/copy_page_64.S linux-2.6.32.18/arch/x86/lib/copy_page_64.S +--- linux-2.6.32.18/arch/x86/lib/copy_page_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/copy_page_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -15255,9 +15287,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_page_64.S linux-2.6.32.16/arch/x86/ 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_64.S linux-2.6.32.16/arch/x86/lib/copy_user_64.S ---- linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/copy_user_64.S linux-2.6.32.18/arch/x86/lib/copy_user_64.S +--- linux-2.6.32.18/arch/x86/lib/copy_user_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/copy_user_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15332,9 +15364,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_64.S linux-2.6.32.16/arch/x86/ movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -14,6 +14,7 @@ #include <asm/current.h> #include <asm/asm-offsets.h> @@ -15359,9 +15391,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.16/a cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -15380,9 +15412,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.16/arch/ return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/getuser.S ---- linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/getuser.S linux-2.6.32.18/arch/x86/lib/getuser.S +--- linux-2.6.32.18/arch/x86/lib/getuser.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/getuser.S 2010-08-11 18:57:29.000000000 -0400 @@ -33,14 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15519,9 +15551,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/g xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/memcpy_64.S linux-2.6.32.18/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.18/arch/x86/lib/memcpy_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/memcpy_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -15531,9 +15563,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib/memset_64.S ---- linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/memset_64.S linux-2.6.32.18/arch/x86/lib/memset_64.S +--- linux-2.6.32.18/arch/x86/lib/memset_64.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/memset_64.S 2010-08-11 18:57:29.000000000 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -15543,9 +15575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mmx_32.c ---- linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/mmx_32.c linux-2.6.32.18/arch/x86/lib/mmx_32.c +--- linux-2.6.32.18/arch/x86/lib/mmx_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/mmx_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -15861,9 +15893,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mm from += 64; to += 64; -diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/putuser.S ---- linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/putuser.S linux-2.6.32.18/arch/x86/lib/putuser.S +--- linux-2.6.32.18/arch/x86/lib/putuser.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/putuser.S 2010-08-11 18:57:29.000000000 -0400 @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -16044,9 +16076,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/p movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/usercopy_32.c linux-2.6.32.18/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.18/arch/x86/lib/usercopy_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/usercopy_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -17015,9 +17047,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/l +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/lib/usercopy_64.c ---- linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/lib/usercopy_64.c linux-2.6.32.18/arch/x86/lib/usercopy_64.c +--- linux-2.6.32.18/arch/x86/lib/usercopy_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/lib/usercopy_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -17054,9 +17086,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/l } EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile ---- linux-2.6.32.16/arch/x86/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/Makefile linux-2.6.32.18/arch/x86/Makefile +--- linux-2.6.32.18/arch/x86/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/Makefile 2010-08-11 18:57:29.000000000 -0400 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -17070,9 +17102,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/arch/x86/mm/extable.c ---- linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/extable.c linux-2.6.32.18/arch/x86/mm/extable.c +--- linux-2.6.32.18/arch/x86/mm/extable.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/extable.c 2010-08-11 18:57:29.000000000 -0400 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -17146,9 +17178,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/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.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault.c ---- linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/fault.c linux-2.6.32.18/arch/x86/mm/fault.c +--- linux-2.6.32.18/arch/x86/mm/fault.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/fault.c 2010-08-11 18:57:29.000000000 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -17816,9 +17848,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c ---- linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/gup.c linux-2.6.32.18/arch/x86/mm/gup.c +--- linux-2.6.32.18/arch/x86/mm/gup.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/gup.c 2010-08-11 18:57:29.000000000 -0400 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -17828,9 +17860,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/highmem_32.c ---- linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/highmem_32.c linux-2.6.32.18/arch/x86/mm/highmem_32.c +--- linux-2.6.32.18/arch/x86/mm/highmem_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/highmem_32.c 2010-08-11 18:57:29.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); @@ -17842,9 +17874,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/ return (void *)vaddr; } -diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/hugetlbpage.c linux-2.6.32.18/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.18/arch/x86/mm/hugetlbpage.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/hugetlbpage.c 2010-08-11 18:57:29.000000000 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -17979,9 +18011,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/arch/x86/mm/init_32.c ---- linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/init_32.c linux-2.6.32.18/arch/x86/mm/init_32.c +--- linux-2.6.32.18/arch/x86/mm/init_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/init_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -18285,9 +18317,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/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.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/init_64.c ---- linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/init_64.c linux-2.6.32.18/arch/x86/mm/init_64.c +--- linux-2.6.32.18/arch/x86/mm/init_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/init_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -18348,9 +18380,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/ini return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/arch/x86/mm/init.c ---- linux-2.6.32.16/arch/x86/mm/init.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/init.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/init.c linux-2.6.32.18/arch/x86/mm/init.c +--- linux-2.6.32.18/arch/x86/mm/init.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/init.c 2010-08-11 18:57:29.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. @@ -18468,9 +18500,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/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.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/iomap_32.c ---- linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/iomap_32.c linux-2.6.32.18/arch/x86/mm/iomap_32.c +--- linux-2.6.32.18/arch/x86/mm/iomap_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/iomap_32.c 2010-08-11 18:57:29.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(); @@ -18483,9 +18515,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/io arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ioremap.c ---- linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/ioremap.c linux-2.6.32.18/arch/x86/mm/ioremap.c +--- linux-2.6.32.18/arch/x86/mm/ioremap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/ioremap.c 2010-08-11 18:57:29.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. @@ -18532,9 +18564,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ior /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-11 18:57:29.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. @@ -18547,9 +18579,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arc return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/arch/x86/mm/mmap.c ---- linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/mmap.c linux-2.6.32.18/arch/x86/mm/mmap.c +--- linux-2.6.32.18/arch/x86/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/mmap.c 2010-08-11 18:57:29.000000000 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -18631,9 +18663,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/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.16/arch/x86/mm/numa_32.c linux-2.6.32.16/arch/x86/mm/numa_32.c ---- linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/numa_32.c linux-2.6.32.18/arch/x86/mm/numa_32.c +--- linux-2.6.32.18/arch/x86/mm/numa_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/numa_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -18642,9 +18674,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/numa_32.c linux-2.6.32.16/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.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pageattr.c ---- linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/pageattr.c linux-2.6.32.18/arch/x86/mm/pageattr.c +--- linux-2.6.32.18/arch/x86/mm/pageattr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/pageattr.c 2010-08-11 18:57:29.000000000 -0400 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. */ @@ -18721,9 +18753,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pa } static int -diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/pageattr-test.c linux-2.6.32.18/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.18/arch/x86/mm/pageattr-test.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/pageattr-test.c 2010-08-11 18:57:29.000000000 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -18733,9 +18765,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/ } struct split_state { -diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c ---- linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/pat.c linux-2.6.32.18/arch/x86/mm/pat.c +--- linux-2.6.32.18/arch/x86/mm/pat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/pat.c 2010-08-11 18:57:29.000000000 -0400 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -18783,9 +18815,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/pgtable_32.c linux-2.6.32.18/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.18/arch/x86/mm/pgtable_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/pgtable_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -18800,9 +18832,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/ /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgtable.c ---- linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/pgtable.c linux-2.6.32.18/arch/x86/mm/pgtable.c +--- linux-2.6.32.18/arch/x86/mm/pgtable.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/pgtable.c 2010-08-11 18:57:29.000000000 -0400 @@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -19056,9 +19088,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgt pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/setup_nx.c ---- linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/setup_nx.c linux-2.6.32.18/arch/x86/mm/setup_nx.c +--- linux-2.6.32.18/arch/x86/mm/setup_nx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/setup_nx.c 2010-08-11 18:57:29.000000000 -0400 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -19124,9 +19156,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/se __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c ---- linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/mm/tlb.c linux-2.6.32.18/arch/x86/mm/tlb.c +--- linux-2.6.32.18/arch/x86/mm/tlb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/mm/tlb.c 2010-08-11 18:57:29.000000000 -0400 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -19148,9 +19180,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/oprofile/backtrace.c linux-2.6.32.18/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.18/arch/x86/oprofile/backtrace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/oprofile/backtrace.c 2010-08-11 18:57:29.000000000 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -19169,9 +19201,9 @@ diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/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.16/arch/x86/oprofile/op_model_p4.c linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c 2010-08-11 18:57:29.000000000 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -19181,9 +19213,9 @@ diff -urNp linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c linux-2.6.32.16/arch/ { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/common.c ---- linux-2.6.32.16/arch/x86/pci/common.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/common.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/common.c linux-2.6.32.18/arch/x86/pci/common.c +--- linux-2.6.32.18/arch/x86/pci/common.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/common.c 2010-08-11 18:57:29.000000000 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -19204,9 +19236,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/co }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/direct.c ---- linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/direct.c linux-2.6.32.18/arch/x86/pci/direct.c +--- linux-2.6.32.18/arch/x86/pci/direct.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/direct.c 2010-08-11 18:57:29.000000000 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -19234,9 +19266,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/di { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fixup.c ---- linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/fixup.c linux-2.6.32.18/arch/x86/pci/fixup.c +--- linux-2.6.32.18/arch/x86/pci/fixup.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/fixup.c 2010-08-11 18:57:29.000000000 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -19255,9 +19287,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fix }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c ---- linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/irq.c linux-2.6.32.18/arch/x86/pci/irq.c +--- linux-2.6.32.18/arch/x86/pci/irq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/irq.c 2010-08-11 18:57:29.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) }, @@ -19276,9 +19308,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/mmconfig_32.c linux-2.6.32.18/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.18/arch/x86/pci/mmconfig_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/mmconfig_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19288,9 +19320,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/mmconfig_64.c linux-2.6.32.18/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.18/arch/x86/pci/mmconfig_64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/mmconfig_64.c 2010-08-11 18:57:29.000000000 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19300,9 +19332,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/numaq_32.c ---- linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/numaq_32.c linux-2.6.32.18/arch/x86/pci/numaq_32.c +--- linux-2.6.32.18/arch/x86/pci/numaq_32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/numaq_32.c 2010-08-11 18:57:29.000000000 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -19312,9 +19344,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/ .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc.c ---- linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/olpc.c linux-2.6.32.18/arch/x86/pci/olpc.c +--- linux-2.6.32.18/arch/x86/pci/olpc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/olpc.c 2010-08-11 18:57:29.000000000 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -19324,9 +19356,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pcbios.c ---- linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/pci/pcbios.c linux-2.6.32.18/arch/x86/pci/pcbios.c +--- linux-2.6.32.18/arch/x86/pci/pcbios.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/pci/pcbios.c 2010-08-11 18:57:29.000000000 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -19649,10 +19681,10 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pc return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/cpu.c ---- linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-09 14:50:35.000000000 -0400 -@@ -126,7 +126,7 @@ static void do_fpu_end(void) +diff -urNp linux-2.6.32.18/arch/x86/power/cpu.c linux-2.6.32.18/arch/x86/power/cpu.c +--- linux-2.6.32.18/arch/x86/power/cpu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/power/cpu.c 2010-08-11 18:57:29.000000000 -0400 +@@ -128,7 +128,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { int cpu = smp_processor_id(); @@ -19661,7 +19693,7 @@ diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/c set_tss_desc(cpu, t); /* * This just modifies memory; should not be -@@ -136,7 +136,9 @@ static void fix_processor_context(void) +@@ -138,7 +138,9 @@ static void fix_processor_context(void) */ #ifdef CONFIG_X86_64 @@ -19671,9 +19703,9 @@ diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/Makefile ---- linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/Makefile linux-2.6.32.18/arch/x86/vdso/Makefile +--- linux-2.6.32.18/arch/x86/vdso/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/Makefile 2010-08-11 18:57:29.000000000 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -19683,9 +19715,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/ GCOV_PROFILE := n # -diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c 2010-08-11 18:57:29.000000000 -0400 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -19784,9 +19816,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c 2010-08-11 18:57:29.000000000 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -19887,9 +19919,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/vdso.lds.S linux-2.6.32.18/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.18/arch/x86/vdso/vdso.lds.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/vdso.lds.S 2010-08-11 18:57:29.000000000 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -19900,9 +19932,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vds +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso/vextern.h ---- linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/vextern.h linux-2.6.32.18/arch/x86/vdso/vextern.h +--- linux-2.6.32.18/arch/x86/vdso/vextern.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/vextern.h 2010-08-11 18:57:29.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. */ @@ -19910,9 +19942,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma.c ---- linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/vdso/vma.c linux-2.6.32.18/arch/x86/vdso/vma.c +--- linux-2.6.32.18/arch/x86/vdso/vma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/vdso/vma.c 2010-08-11 18:57:29.000000000 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -19959,9 +19991,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen/enlighten.c ---- linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/xen/enlighten.c linux-2.6.32.18/arch/x86/xen/enlighten.c +--- linux-2.6.32.18/arch/x86/xen/enlighten.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/xen/enlighten.c 2010-08-11 18:57:29.000000000 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -20017,9 +20049,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/arch/x86/xen/mmu.c ---- linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/xen/mmu.c linux-2.6.32.18/arch/x86/xen/mmu.c +--- linux-2.6.32.18/arch/x86/xen/mmu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/xen/mmu.c 2010-08-11 18:57:29.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); @@ -20040,9 +20072,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/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.16/arch/x86/xen/smp.c linux-2.6.32.16/arch/x86/xen/smp.c ---- linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/xen/smp.c linux-2.6.32.18/arch/x86/xen/smp.c +--- linux-2.6.32.18/arch/x86/xen/smp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/xen/smp.c 2010-08-11 18:57:29.000000000 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -20066,9 +20098,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/smp.c linux-2.6.32.16/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.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/xen-head.S ---- linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/xen/xen-head.S linux-2.6.32.18/arch/x86/xen/xen-head.S +--- linux-2.6.32.18/arch/x86/xen/xen-head.S 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/xen/xen-head.S 2010-08-11 18:57:29.000000000 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -20087,9 +20119,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/ #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/xen-ops.h ---- linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/arch/x86/xen/xen-ops.h linux-2.6.32.18/arch/x86/xen/xen-ops.h +--- linux-2.6.32.18/arch/x86/xen/xen-ops.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/arch/x86/xen/xen-ops.h 2010-08-11 18:57:29.000000000 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -20099,9 +20131,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/x struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integrity.c ---- linux-2.6.32.16/block/blk-integrity.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/blk-integrity.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/blk-integrity.c linux-2.6.32.18/block/blk-integrity.c +--- linux-2.6.32.18/block/blk-integrity.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/blk-integrity.c 2010-08-11 18:57:29.000000000 -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -20111,9 +20143,9 @@ diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integ .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/block/blk-iopoll.c ---- linux-2.6.32.16/block/blk-iopoll.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/blk-iopoll.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/blk-iopoll.c linux-2.6.32.18/block/blk-iopoll.c +--- linux-2.6.32.18/block/blk-iopoll.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/blk-iopoll.c 2010-08-11 18:57:29.000000000 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -20123,9 +20155,9 @@ diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/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.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c ---- linux-2.6.32.16/block/blk-map.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/blk-map.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/blk-map.c linux-2.6.32.18/block/blk-map.c +--- linux-2.6.32.18/block/blk-map.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/blk-map.c 2010-08-11 18:57:29.000000000 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -20144,9 +20176,9 @@ diff -urNp linux-2.6.32.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq.c ---- linux-2.6.32.16/block/blk-softirq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/blk-softirq.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/blk-softirq.c linux-2.6.32.18/block/blk-softirq.c +--- linux-2.6.32.18/block/blk-softirq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/blk-softirq.c 2010-08-11 18:57:29.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. @@ -20156,9 +20188,9 @@ diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c ---- linux-2.6.32.16/block/blk-sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/blk-sysfs.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/blk-sysfs.c linux-2.6.32.18/block/blk-sysfs.c +--- linux-2.6.32.18/block/blk-sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/blk-sysfs.c 2010-08-11 18:57:29.000000000 -0400 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -20168,9 +20200,9 @@ diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c ---- linux-2.6.32.16/block/elevator.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/block/elevator.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/block/elevator.c linux-2.6.32.18/block/elevator.c +--- linux-2.6.32.18/block/elevator.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/block/elevator.c 2010-08-11 18:57:29.000000000 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -20180,9 +20212,9 @@ diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c ---- linux-2.6.32.16/crypto/lrw.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/crypto/lrw.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/crypto/lrw.c linux-2.6.32.18/crypto/lrw.c +--- linux-2.6.32.18/crypto/lrw.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/crypto/lrw.c 2010-08-11 18:57:29.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; @@ -20192,9 +20224,9 @@ diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/dontdiff ---- linux-2.6.32.16/Documentation/dontdiff 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/Documentation/dontdiff 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/Documentation/dontdiff linux-2.6.32.18/Documentation/dontdiff +--- linux-2.6.32.18/Documentation/dontdiff 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/Documentation/dontdiff 2010-08-11 18:57:29.000000000 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -20312,9 +20344,9 @@ diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/Documentation/kernel-parameters.txt ---- linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/Documentation/kernel-parameters.txt linux-2.6.32.18/Documentation/kernel-parameters.txt +--- linux-2.6.32.18/Documentation/kernel-parameters.txt 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/Documentation/kernel-parameters.txt 2010-08-11 18:57:29.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. @@ -20328,9 +20360,9 @@ diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/D pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/drivers/acpi/acpi_pad.c ---- linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/acpi_pad.c linux-2.6.32.18/drivers/acpi/acpi_pad.c +--- linux-2.6.32.18/drivers/acpi/acpi_pad.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/acpi_pad.c 2010-08-11 18:57:29.000000000 -0400 @@ -30,7 +30,7 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> @@ -20340,9 +20372,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/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.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/battery.c ---- linux-2.6.32.16/drivers/acpi/battery.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/battery.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/battery.c linux-2.6.32.18/drivers/acpi/battery.c +--- linux-2.6.32.18/drivers/acpi/battery.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/battery.c 2010-08-11 18:57:29.000000000 -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -20352,9 +20384,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi/blacklist.c ---- linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/blacklist.c linux-2.6.32.18/drivers/acpi/blacklist.c +--- linux-2.6.32.18/drivers/acpi/blacklist.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/blacklist.c 2010-08-11 18:57:29.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}, @@ -20364,9 +20396,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock.c ---- linux-2.6.32.16/drivers/acpi/dock.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/dock.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/dock.c linux-2.6.32.18/drivers/acpi/dock.c +--- linux-2.6.32.18/drivers/acpi/dock.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/dock.c 2010-08-11 18:57:29.000000000 -0400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -20385,9 +20417,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c ---- linux-2.6.32.16/drivers/acpi/osl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/osl.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/osl.c linux-2.6.32.18/drivers/acpi/osl.c +--- linux-2.6.32.18/drivers/acpi/osl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/osl.c 2010-08-11 18:57:29.000000000 -0400 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -20406,9 +20438,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/acpi/power_meter.c ---- linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/power_meter.c linux-2.6.32.18/drivers/acpi/power_meter.c +--- linux-2.6.32.18/drivers/acpi/power_meter.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/power_meter.c 2010-08-11 18:57:29.000000000 -0400 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; @@ -20418,9 +20450,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/ac mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc.c ---- linux-2.6.32.16/drivers/acpi/proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/proc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/proc.c linux-2.6.32.18/drivers/acpi/proc.c +--- linux-2.6.32.18/drivers/acpi/proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/proc.c 2010-08-11 18:57:29.000000000 -0400 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -20456,9 +20488,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1; found_dev = dev; -diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers/acpi/processor_core.c ---- linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/processor_core.c linux-2.6.32.18/drivers/acpi/processor_core.c +--- linux-2.6.32.18/drivers/acpi/processor_core.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/processor_core.c 2010-08-11 18:57:29.000000000 -0400 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -20468,9 +20500,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers/acpi/processor_idle.c ---- linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/processor_idle.c linux-2.6.32.18/drivers/acpi/processor_idle.c +--- linux-2.6.32.18/drivers/acpi/processor_idle.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/processor_idle.c 2010-08-11 18:57:29.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")}, @@ -20480,9 +20512,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers }; -diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbshc.c ---- linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/sbshc.c linux-2.6.32.18/drivers/acpi/sbshc.c +--- linux-2.6.32.18/drivers/acpi/sbshc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/sbshc.c 2010-08-11 18:57:29.000000000 -0400 @@ -17,7 +17,7 @@ #define PREFIX "ACPI: " @@ -20492,10 +20524,10 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbs #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" struct acpi_smb_hc { -diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sleep.c ---- linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 -@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp +diff -urNp linux-2.6.32.18/drivers/acpi/sleep.c linux-2.6.32.18/drivers/acpi/sleep.c +--- linux-2.6.32.18/drivers/acpi/sleep.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/sleep.c 2010-08-11 18:57:29.000000000 -0400 +@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp } } @@ -20504,7 +20536,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin, .prepare_late = acpi_pm_prepare, -@@ -330,7 +330,7 @@ static int acpi_suspend_begin_old(suspen +@@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspen * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -20513,7 +20545,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_disable_gpes, -@@ -613,7 +613,7 @@ static void acpi_pm_enable_gpes(void) +@@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void) acpi_enable_all_runtime_gpes(); } @@ -20522,7 +20554,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle .begin = acpi_hibernation_begin, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot, -@@ -666,7 +666,7 @@ static int acpi_hibernation_pre_snapshot +@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -20531,9 +20563,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/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.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/video.c ---- linux-2.6.32.16/drivers/acpi/video.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/acpi/video.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/acpi/video.c linux-2.6.32.18/drivers/acpi/video.c +--- linux-2.6.32.18/drivers/acpi/video.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/acpi/video.c 2010-08-11 18:57:29.000000000 -0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -20543,9 +20575,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/vid .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c ---- linux-2.6.32.16/drivers/ata/ahci.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/ahci.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/ahci.c linux-2.6.32.18/drivers/ata/ahci.c +--- linux-2.6.32.18/drivers/ata/ahci.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/ahci.c 2010-08-11 18:57:29.000000000 -0400 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -20585,9 +20617,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c }; -diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata/ata_generic.c ---- linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/ata_generic.c linux-2.6.32.18/drivers/ata/ata_generic.c +--- linux-2.6.32.18/drivers/ata/ata_generic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/ata_generic.c 2010-08-11 18:57:29.000000000 -0400 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -20597,9 +20629,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/ata_piix.c ---- linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/ata_piix.c linux-2.6.32.18/drivers/ata/ata_piix.c +--- linux-2.6.32.18/drivers/ata/ata_piix.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/ata_piix.c 2010-08-11 18:57:29.000000000 -0400 @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (CPT) */ @@ -20663,9 +20695,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/at }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata/libata-acpi.c ---- linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/libata-acpi.c linux-2.6.32.18/drivers/ata/libata-acpi.c +--- linux-2.6.32.18/drivers/ata/libata-acpi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/libata-acpi.c 2010-08-11 18:57:29.000000000 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -20681,9 +20713,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/drivers/ata/libata-core.c ---- linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/libata-core.c linux-2.6.32.18/drivers/ata/libata-core.c +--- linux-2.6.32.18/drivers/ata/libata-core.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/libata-core.c 2010-08-11 18:57:29.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 }, @@ -20757,9 +20789,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/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.16/drivers/ata/libata-eh.c linux-2.6.32.16/drivers/ata/libata-eh.c ---- linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/libata-eh.c linux-2.6.32.18/drivers/ata/libata-eh.c +--- linux-2.6.32.18/drivers/ata/libata-eh.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/libata-eh.c 2010-08-11 18:57:29.000000000 -0400 @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) @@ -20769,9 +20801,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-eh.c linux-2.6.32.16/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.16/drivers/ata/libata-pmp.c linux-2.6.32.16/drivers/ata/libata-pmp.c ---- linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/libata-pmp.c linux-2.6.32.18/drivers/ata/libata-pmp.c +--- linux-2.6.32.18/drivers/ata/libata-pmp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/libata-pmp.c 2010-08-11 18:57:29.000000000 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -20781,9 +20813,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-pmp.c linux-2.6.32.16/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.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/pata_acpi.c ---- linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_acpi.c linux-2.6.32.18/drivers/ata/pata_acpi.c +--- linux-2.6.32.18/drivers/ata/pata_acpi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_acpi.c 2010-08-11 18:57:29.000000000 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20793,9 +20825,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/drivers/ata/pata_ali.c ---- linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_ali.c linux-2.6.32.18/drivers/ata/pata_ali.c +--- linux-2.6.32.18/drivers/ata/pata_ali.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_ali.c 2010-08-11 18:57:29.000000000 -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -20841,9 +20873,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/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.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pata_amd.c ---- linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_amd.c linux-2.6.32.18/drivers/ata/pata_amd.c +--- linux-2.6.32.18/drivers/ata/pata_amd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_amd.c 2010-08-11 18:57:29.000000000 -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -20893,9 +20925,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pa .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/pata_artop.c ---- linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_artop.c linux-2.6.32.18/drivers/ata/pata_artop.c +--- linux-2.6.32.18/drivers/ata/pata_artop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_artop.c 2010-08-11 18:57:29.000000000 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20914,9 +20946,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/drivers/ata/pata_at32.c ---- linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_at32.c linux-2.6.32.18/drivers/ata/pata_at32.c +--- linux-2.6.32.18/drivers/ata/pata_at32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_at32.c 2010-08-11 18:57:29.000000000 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -20926,9 +20958,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/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.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/pata_at91.c ---- linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_at91.c linux-2.6.32.18/drivers/ata/pata_at91.c +--- linux-2.6.32.18/drivers/ata/pata_at91.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_at91.c 2010-08-11 18:57:29.000000000 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -20938,9 +20970,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata/pata_atiixp.c ---- linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_atiixp.c linux-2.6.32.18/drivers/ata/pata_atiixp.c +--- linux-2.6.32.18/drivers/ata/pata_atiixp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_atiixp.c 2010-08-11 18:57:29.000000000 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20950,9 +20982,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/ata/pata_atp867x.c ---- linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_atp867x.c linux-2.6.32.18/drivers/ata/pata_atp867x.c +--- linux-2.6.32.18/drivers/ata/pata_atp867x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_atp867x.c 2010-08-11 18:57:29.000000000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -20962,9 +20994,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/pata_bf54x.c ---- linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_bf54x.c linux-2.6.32.18/drivers/ata/pata_bf54x.c +--- linux-2.6.32.18/drivers/ata/pata_bf54x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_bf54x.c 2010-08-11 18:57:29.000000000 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -20974,9 +21006,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/ .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/drivers/ata/pata_cmd640.c ---- linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cmd640.c linux-2.6.32.18/drivers/ata/pata_cmd640.c +--- linux-2.6.32.18/drivers/ata/pata_cmd640.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cmd640.c 2010-08-11 18:57:29.000000000 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20986,9 +21018,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/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.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cmd64x.c linux-2.6.32.18/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.18/drivers/ata/pata_cmd64x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cmd64x.c 2010-08-11 18:57:29.000000000 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -21011,9 +21043,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/drivers/ata/pata_cs5520.c ---- linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5520.c linux-2.6.32.18/drivers/ata/pata_cs5520.c +--- linux-2.6.32.18/drivers/ata/pata_cs5520.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cs5520.c 2010-08-11 18:57:29.000000000 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21023,9 +21055,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/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.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata/pata_cs5530.c ---- linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5530.c linux-2.6.32.18/drivers/ata/pata_cs5530.c +--- linux-2.6.32.18/drivers/ata/pata_cs5530.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cs5530.c 2010-08-11 18:57:29.000000000 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21035,9 +21067,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata/pata_cs5535.c ---- linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5535.c linux-2.6.32.18/drivers/ata/pata_cs5535.c +--- linux-2.6.32.18/drivers/ata/pata_cs5535.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cs5535.c 2010-08-11 18:57:29.000000000 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21047,9 +21079,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata/pata_cs5536.c ---- linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5536.c linux-2.6.32.18/drivers/ata/pata_cs5536.c +--- linux-2.6.32.18/drivers/ata/pata_cs5536.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cs5536.c 2010-08-11 18:57:29.000000000 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21059,9 +21091,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/ata/pata_cypress.c ---- linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_cypress.c linux-2.6.32.18/drivers/ata/pata_cypress.c +--- linux-2.6.32.18/drivers/ata/pata_cypress.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_cypress.c 2010-08-11 18:57:29.000000000 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21071,9 +21103,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/pata_efar.c ---- linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_efar.c linux-2.6.32.18/drivers/ata/pata_efar.c +--- linux-2.6.32.18/drivers/ata/pata_efar.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_efar.c 2010-08-11 18:57:29.000000000 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21083,9 +21115,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata/pata_hpt366.c ---- linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt366.c linux-2.6.32.18/drivers/ata/pata_hpt366.c +--- linux-2.6.32.18/drivers/ata/pata_hpt366.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_hpt366.c 2010-08-11 18:57:29.000000000 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -21095,9 +21127,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt37x.c linux-2.6.32.18/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.18/drivers/ata/pata_hpt37x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_hpt37x.c 2010-08-11 18:57:29.000000000 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -21134,9 +21166,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c 2010-08-11 18:57:29.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -21146,9 +21178,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt3x3.c linux-2.6.32.18/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.18/drivers/ata/pata_hpt3x3.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_hpt3x3.c 2010-08-11 18:57:29.000000000 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21158,9 +21190,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/drivers/ata/pata_icside.c ---- linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_icside.c linux-2.6.32.18/drivers/ata/pata_icside.c +--- linux-2.6.32.18/drivers/ata/pata_icside.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_icside.c 2010-08-11 18:57:29.000000000 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -21170,9 +21202,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/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.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/drivers/ata/pata_isapnp.c ---- linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_isapnp.c linux-2.6.32.18/drivers/ata/pata_isapnp.c +--- linux-2.6.32.18/drivers/ata/pata_isapnp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_isapnp.c 2010-08-11 18:57:29.000000000 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -21188,9 +21220,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/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.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata/pata_it8213.c ---- linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_it8213.c linux-2.6.32.18/drivers/ata/pata_it8213.c +--- linux-2.6.32.18/drivers/ata/pata_it8213.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_it8213.c 2010-08-11 18:57:29.000000000 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -21200,9 +21232,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata/pata_it821x.c ---- linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_it821x.c linux-2.6.32.18/drivers/ata/pata_it821x.c +--- linux-2.6.32.18/drivers/ata/pata_it821x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_it821x.c 2010-08-11 18:57:29.000000000 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21230,9 +21262,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c 2010-08-11 18:57:29.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -21242,9 +21274,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/ .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/ata/pata_jmicron.c ---- linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_jmicron.c linux-2.6.32.18/drivers/ata/pata_jmicron.c +--- linux-2.6.32.18/drivers/ata/pata_jmicron.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_jmicron.c 2010-08-11 18:57:29.000000000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -21254,9 +21286,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/drivers/ata/pata_legacy.c ---- linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_legacy.c linux-2.6.32.18/drivers/ata/pata_legacy.c +--- linux-2.6.32.18/drivers/ata/pata_legacy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_legacy.c 2010-08-11 18:57:29.000000000 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -21368,9 +21400,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/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.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/ata/pata_marvell.c ---- linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_marvell.c linux-2.6.32.18/drivers/ata/pata_marvell.c +--- linux-2.6.32.18/drivers/ata/pata_marvell.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_marvell.c 2010-08-11 18:57:29.000000000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21380,9 +21412,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_mpc52xx.c linux-2.6.32.18/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.18/drivers/ata/pata_mpc52xx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_mpc52xx.c 2010-08-11 18:57:29.000000000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -21392,9 +21424,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/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.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/pata_mpiix.c ---- linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_mpiix.c linux-2.6.32.18/drivers/ata/pata_mpiix.c +--- linux-2.6.32.18/drivers/ata/pata_mpiix.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_mpiix.c 2010-08-11 18:57:29.000000000 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -21404,9 +21436,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/ata/pata_netcell.c ---- linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_netcell.c linux-2.6.32.18/drivers/ata/pata_netcell.c +--- linux-2.6.32.18/drivers/ata/pata_netcell.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_netcell.c 2010-08-11 18:57:29.000000000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21416,9 +21448,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/ata/pata_ninja32.c ---- linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_ninja32.c linux-2.6.32.18/drivers/ata/pata_ninja32.c +--- linux-2.6.32.18/drivers/ata/pata_ninja32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_ninja32.c 2010-08-11 18:57:29.000000000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21428,9 +21460,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/ata/pata_ns87410.c ---- linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_ns87410.c linux-2.6.32.18/drivers/ata/pata_ns87410.c +--- linux-2.6.32.18/drivers/ata/pata_ns87410.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_ns87410.c 2010-08-11 18:57:29.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -21440,9 +21472,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/at .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/ata/pata_ns87415.c ---- linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_ns87415.c linux-2.6.32.18/drivers/ata/pata_ns87415.c +--- linux-2.6.32.18/drivers/ata/pata_ns87415.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_ns87415.c 2010-08-11 18:57:29.000000000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -21461,9 +21493,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/at .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_octeon_cf.c linux-2.6.32.18/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.18/drivers/ata/pata_octeon_cf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_octeon_cf.c 2010-08-11 18:57:29.000000000 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -21472,9 +21504,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/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.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_oldpiix.c linux-2.6.32.18/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.18/drivers/ata/pata_oldpiix.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_oldpiix.c 2010-08-11 18:57:29.000000000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -21484,9 +21516,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/pata_opti.c ---- linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_opti.c linux-2.6.32.18/drivers/ata/pata_opti.c +--- linux-2.6.32.18/drivers/ata/pata_opti.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_opti.c 2010-08-11 18:57:29.000000000 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21496,9 +21528,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/ata/pata_optidma.c ---- linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_optidma.c linux-2.6.32.18/drivers/ata/pata_optidma.c +--- linux-2.6.32.18/drivers/ata/pata_optidma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_optidma.c 2010-08-11 18:57:29.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -21517,9 +21549,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/at .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/drivers/ata/pata_palmld.c ---- linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_palmld.c linux-2.6.32.18/drivers/ata/pata_palmld.c +--- linux-2.6.32.18/drivers/ata/pata_palmld.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_palmld.c 2010-08-11 18:57:29.000000000 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -21529,9 +21561,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/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.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_pcmcia.c linux-2.6.32.18/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.18/drivers/ata/pata_pcmcia.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_pcmcia.c 2010-08-11 18:57:29.000000000 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -21558,9 +21590,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_pdc2027x.c linux-2.6.32.18/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.18/drivers/ata/pata_pdc2027x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_pdc2027x.c 2010-08-11 18:57:29.000000000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21578,9 +21610,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/a .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c 2010-08-11 18:57:29.000000000 -0400 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -21599,9 +21631,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drive .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/drivers/ata/pata_platform.c ---- linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_platform.c linux-2.6.32.18/drivers/ata/pata_platform.c +--- linux-2.6.32.18/drivers/ata/pata_platform.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_platform.c 2010-08-11 18:57:29.000000000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -21611,9 +21643,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/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.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pata_qdi.c ---- linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_qdi.c linux-2.6.32.18/drivers/ata/pata_qdi.c +--- linux-2.6.32.18/drivers/ata/pata_qdi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_qdi.c 2010-08-11 18:57:29.000000000 -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -21632,9 +21664,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pa .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/ata/pata_radisys.c ---- linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_radisys.c linux-2.6.32.18/drivers/ata/pata_radisys.c +--- linux-2.6.32.18/drivers/ata/pata_radisys.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_radisys.c 2010-08-11 18:57:29.000000000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -21644,9 +21676,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_rb532_cf.c linux-2.6.32.18/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.18/drivers/ata/pata_rb532_cf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_rb532_cf.c 2010-08-11 18:57:29.000000000 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -21656,9 +21688,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/drivers/ata/pata_rdc.c ---- linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_rdc.c linux-2.6.32.18/drivers/ata/pata_rdc.c +--- linux-2.6.32.18/drivers/ata/pata_rdc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_rdc.c 2010-08-11 18:57:29.000000000 -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -21668,9 +21700,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/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.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata/pata_rz1000.c ---- linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_rz1000.c linux-2.6.32.18/drivers/ata/pata_rz1000.c +--- linux-2.6.32.18/drivers/ata/pata_rz1000.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_rz1000.c 2010-08-11 18:57:29.000000000 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -21680,9 +21712,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/drivers/ata/pata_sc1200.c ---- linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_sc1200.c linux-2.6.32.18/drivers/ata/pata_sc1200.c +--- linux-2.6.32.18/drivers/ata/pata_sc1200.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_sc1200.c 2010-08-11 18:57:29.000000000 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21692,9 +21724,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/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.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pata_scc.c ---- linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_scc.c linux-2.6.32.18/drivers/ata/pata_scc.c +--- linux-2.6.32.18/drivers/ata/pata_scc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_scc.c 2010-08-11 18:57:29.000000000 -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21704,9 +21736,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pata_sch.c ---- linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_sch.c linux-2.6.32.18/drivers/ata/pata_sch.c +--- linux-2.6.32.18/drivers/ata/pata_sch.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_sch.c 2010-08-11 18:57:29.000000000 -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21716,9 +21748,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/drivers/ata/pata_serverworks.c ---- linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_serverworks.c linux-2.6.32.18/drivers/ata/pata_serverworks.c +--- linux-2.6.32.18/drivers/ata/pata_serverworks.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_serverworks.c 2010-08-11 18:57:29.000000000 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -21737,9 +21769,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/driver .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata/pata_sil680.c ---- linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_sil680.c linux-2.6.32.18/drivers/ata/pata_sil680.c +--- linux-2.6.32.18/drivers/ata/pata_sil680.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_sil680.c 2010-08-11 18:57:29.000000000 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21749,9 +21781,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/drivers/ata/pata_sis.c ---- linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_sis.c linux-2.6.32.18/drivers/ata/pata_sis.c +--- linux-2.6.32.18/drivers/ata/pata_sis.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_sis.c 2010-08-11 18:57:29.000000000 -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21807,9 +21839,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/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.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_sl82c105.c linux-2.6.32.18/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.18/drivers/ata/pata_sl82c105.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_sl82c105.c 2010-08-11 18:57:29.000000000 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21819,9 +21851,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/a .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/ata/pata_triflex.c ---- linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_triflex.c linux-2.6.32.18/drivers/ata/pata_triflex.c +--- linux-2.6.32.18/drivers/ata/pata_triflex.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_triflex.c 2010-08-11 18:57:29.000000000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -21831,9 +21863,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pata_via.c ---- linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_via.c linux-2.6.32.18/drivers/ata/pata_via.c +--- linux-2.6.32.18/drivers/ata/pata_via.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_via.c 2010-08-11 18:57:29.000000000 -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21852,9 +21884,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pa .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/ata/pata_winbond.c ---- linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pata_winbond.c linux-2.6.32.18/drivers/ata/pata_winbond.c +--- linux-2.6.32.18/drivers/ata/pata_winbond.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pata_winbond.c 2010-08-11 18:57:29.000000000 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -21864,9 +21896,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pdc_adma.c ---- linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/pdc_adma.c linux-2.6.32.18/drivers/ata/pdc_adma.c +--- linux-2.6.32.18/drivers/ata/pdc_adma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/pdc_adma.c 2010-08-11 18:57:29.000000000 -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -21876,9 +21908,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pd .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sata_fsl.c ---- linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_fsl.c linux-2.6.32.18/drivers/ata/sata_fsl.c +--- linux-2.6.32.18/drivers/ata/sata_fsl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_fsl.c 2010-08-11 18:57:29.000000000 -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21888,9 +21920,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/ata/sata_inic162x.c ---- linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_inic162x.c linux-2.6.32.18/drivers/ata/sata_inic162x.c +--- linux-2.6.32.18/drivers/ata/sata_inic162x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_inic162x.c 2010-08-11 18:57:29.000000000 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -21900,9 +21932,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/a .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sata_mv.c ---- linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_mv.c linux-2.6.32.18/drivers/ata/sata_mv.c +--- linux-2.6.32.18/drivers/ata/sata_mv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_mv.c 2010-08-11 18:57:29.000000000 -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -21930,9 +21962,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sat .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sata_nv.c ---- linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_nv.c linux-2.6.32.18/drivers/ata/sata_nv.c +--- linux-2.6.32.18/drivers/ata/sata_nv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_nv.c 2010-08-11 18:57:29.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. @@ -21975,9 +22007,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sat .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/ata/sata_promise.c ---- linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_promise.c linux-2.6.32.18/drivers/ata/sata_promise.c +--- linux-2.6.32.18/drivers/ata/sata_promise.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_promise.c 2010-08-11 18:57:29.000000000 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -22004,9 +22036,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/at .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/sata_qstor.c ---- linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_qstor.c linux-2.6.32.18/drivers/ata/sata_qstor.c +--- linux-2.6.32.18/drivers/ata/sata_qstor.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_qstor.c 2010-08-11 18:57:29.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -22016,9 +22048,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/ .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/sata_sil24.c ---- linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_sil24.c linux-2.6.32.18/drivers/ata/sata_sil24.c +--- linux-2.6.32.18/drivers/ata/sata_sil24.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_sil24.c 2010-08-11 18:57:29.000000000 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -22028,9 +22060,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/ .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sata_sil.c ---- linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_sil.c linux-2.6.32.18/drivers/ata/sata_sil.c +--- linux-2.6.32.18/drivers/ata/sata_sil.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_sil.c 2010-08-11 18:57:29.000000000 -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -22040,9 +22072,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sa .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sata_sis.c ---- linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_sis.c linux-2.6.32.18/drivers/ata/sata_sis.c +--- linux-2.6.32.18/drivers/ata/sata_sis.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_sis.c 2010-08-11 18:57:29.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22052,9 +22084,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/drivers/ata/sata_svw.c ---- linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_svw.c linux-2.6.32.18/drivers/ata/sata_svw.c +--- linux-2.6.32.18/drivers/ata/sata_svw.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_svw.c 2010-08-11 18:57:29.000000000 -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -22064,9 +22096,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/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.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sata_sx4.c ---- linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_sx4.c linux-2.6.32.18/drivers/ata/sata_sx4.c +--- linux-2.6.32.18/drivers/ata/sata_sx4.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_sx4.c 2010-08-11 18:57:29.000000000 -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -22076,9 +22108,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sata_uli.c ---- linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_uli.c linux-2.6.32.18/drivers/ata/sata_uli.c +--- linux-2.6.32.18/drivers/ata/sata_uli.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_uli.c 2010-08-11 18:57:29.000000000 -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22088,9 +22120,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sata_via.c ---- linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_via.c linux-2.6.32.18/drivers/ata/sata_via.c +--- linux-2.6.32.18/drivers/ata/sata_via.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_via.c 2010-08-11 18:57:29.000000000 -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22128,9 +22160,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sa .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/drivers/ata/sata_vsc.c ---- linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ata/sata_vsc.c linux-2.6.32.18/drivers/ata/sata_vsc.c +--- linux-2.6.32.18/drivers/ata/sata_vsc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ata/sata_vsc.c 2010-08-11 18:57:29.000000000 -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -22140,9 +22172,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/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.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adummy.c ---- linux-2.6.32.16/drivers/atm/adummy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/adummy.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/adummy.c linux-2.6.32.18/drivers/atm/adummy.c +--- linux-2.6.32.18/drivers/atm/adummy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/adummy.c 2010-08-11 18:57:29.000000000 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -22152,9 +22184,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adum return 0; } -diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/ambassador.c ---- linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/ambassador.c linux-2.6.32.18/drivers/atm/ambassador.c +--- linux-2.6.32.18/drivers/atm/ambassador.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/ambassador.c 2010-08-11 18:57:29.000000000 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -22191,9 +22223,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/ return -ENOMEM; // ? } -diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmtcp.c ---- linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/atmtcp.c linux-2.6.32.18/drivers/atm/atmtcp.c +--- linux-2.6.32.18/drivers/atm/atmtcp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/atmtcp.c 2010-08-11 18:57:29.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); @@ -22243,9 +22275,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmt done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c ---- linux-2.6.32.16/drivers/atm/eni.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/eni.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/eni.c linux-2.6.32.18/drivers/atm/eni.c +--- linux-2.6.32.18/drivers/atm/eni.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/eni.c 2010-08-11 18:57:29.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); @@ -22291,9 +22323,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/drivers/atm/firestream.c ---- linux-2.6.32.16/drivers/atm/firestream.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/firestream.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/firestream.c linux-2.6.32.18/drivers/atm/firestream.c +--- linux-2.6.32.18/drivers/atm/firestream.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/firestream.c 2010-08-11 18:57:29.000000000 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -22327,9 +22359,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/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.16/drivers/atm/fore200e.c linux-2.6.32.16/drivers/atm/fore200e.c ---- linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/fore200e.c linux-2.6.32.18/drivers/atm/fore200e.c +--- linux-2.6.32.18/drivers/atm/fore200e.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/fore200e.c 2010-08-11 18:57:29.000000000 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -22386,9 +22418,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/fore200e.c linux-2.6.32.16/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.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c ---- linux-2.6.32.16/drivers/atm/he.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/he.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/he.c linux-2.6.32.18/drivers/atm/he.c +--- linux-2.6.32.18/drivers/atm/he.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/he.c 2010-08-11 18:57:29.000000000 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -22470,9 +22502,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/horizon.c ---- linux-2.6.32.16/drivers/atm/horizon.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/horizon.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/horizon.c linux-2.6.32.18/drivers/atm/horizon.c +--- linux-2.6.32.18/drivers/atm/horizon.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/horizon.c 2010-08-11 18:57:29.000000000 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -22491,9 +22523,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/hor // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/idt77252.c ---- linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/idt77252.c linux-2.6.32.18/drivers/atm/idt77252.c +--- linux-2.6.32.18/drivers/atm/idt77252.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/idt77252.c 2010-08-11 18:57:29.000000000 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -22648,9 +22680,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/id return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/drivers/atm/iphase.c ---- linux-2.6.32.16/drivers/atm/iphase.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/iphase.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/iphase.c linux-2.6.32.18/drivers/atm/iphase.c +--- linux-2.6.32.18/drivers/atm/iphase.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/iphase.c 2010-08-11 18:57:29.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)) @@ -22747,9 +22779,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/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.16/drivers/atm/lanai.c linux-2.6.32.16/drivers/atm/lanai.c ---- linux-2.6.32.16/drivers/atm/lanai.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/lanai.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/lanai.c linux-2.6.32.18/drivers/atm/lanai.c +--- linux-2.6.32.18/drivers/atm/lanai.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/lanai.c 2010-08-11 18:57:29.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); @@ -22804,9 +22836,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/lanai.c linux-2.6.32.16/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.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nicstar.c ---- linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/nicstar.c linux-2.6.32.18/drivers/atm/nicstar.c +--- linux-2.6.32.18/drivers/atm/nicstar.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/nicstar.c 2010-08-11 18:57:29.000000000 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -23009,9 +23041,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nic } } -diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/solos-pci.c ---- linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/solos-pci.c linux-2.6.32.18/drivers/atm/solos-pci.c +--- linux-2.6.32.18/drivers/atm/solos-pci.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/solos-pci.c 2010-08-11 18:57:29.000000000 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -23030,9 +23062,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/s solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c ---- linux-2.6.32.16/drivers/atm/suni.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/suni.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/suni.c linux-2.6.32.18/drivers/atm/suni.c +--- linux-2.6.32.18/drivers/atm/suni.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/suni.c 2010-08-11 18:57:29.000000000 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -23044,9 +23076,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uPD98402.c ---- linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/uPD98402.c linux-2.6.32.18/drivers/atm/uPD98402.c +--- linux-2.6.32.18/drivers/atm/uPD98402.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/uPD98402.c 2010-08-11 18:57:29.000000000 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -23091,9 +23123,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uP return 0; } -diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c ---- linux-2.6.32.16/drivers/atm/zatm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/atm/zatm.c 2010-07-09 14:50:35.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/atm/zatm.c linux-2.6.32.18/drivers/atm/zatm.c +--- linux-2.6.32.18/drivers/atm/zatm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/atm/zatm.c 2010-08-11 18:57:29.000000000 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -23121,9 +23153,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c ---- linux-2.6.32.16/drivers/base/bus.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/base/bus.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/base/bus.c linux-2.6.32.18/drivers/base/bus.c +--- linux-2.6.32.18/drivers/base/bus.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/base/bus.c 2010-08-11 18:57:29.000000000 -0400 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -23151,9 +23183,9 @@ diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/class.c ---- linux-2.6.32.16/drivers/base/class.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/base/class.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/base/class.c linux-2.6.32.18/drivers/base/class.c +--- linux-2.6.32.18/drivers/base/class.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/base/class.c 2010-08-11 18:57:29.000000000 -0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -23163,9 +23195,9 @@ diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/cla .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core.c ---- linux-2.6.32.16/drivers/base/core.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/base/core.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/base/core.c linux-2.6.32.18/drivers/base/core.c +--- linux-2.6.32.18/drivers/base/core.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/base/core.c 2010-08-11 18:57:29.000000000 -0400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -23184,9 +23216,9 @@ diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/memory.c ---- linux-2.6.32.16/drivers/base/memory.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/base/memory.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/base/memory.c linux-2.6.32.18/drivers/base/memory.c +--- linux-2.6.32.18/drivers/base/memory.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/base/memory.c 2010-08-11 18:57:29.000000000 -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -23196,9 +23228,9 @@ diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/me .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c ---- linux-2.6.32.16/drivers/base/sys.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/base/sys.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/base/sys.c linux-2.6.32.18/drivers/base/sys.c +--- linux-2.6.32.18/drivers/base/sys.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/base/sys.c 2010-08-11 18:57:29.000000000 -0400 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -23217,9 +23249,9 @@ diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block/pktcdvd.c ---- linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/block/pktcdvd.c linux-2.6.32.18/drivers/block/pktcdvd.c +--- linux-2.6.32.18/drivers/block/pktcdvd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/block/pktcdvd.c 2010-08-11 18:57:29.000000000 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -23229,9 +23261,9 @@ diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/char/agp/frontend.c ---- linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/agp/frontend.c linux-2.6.32.18/drivers/char/agp/frontend.c +--- linux-2.6.32.18/drivers/char/agp/frontend.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/agp/frontend.c 2010-08-11 18:57:29.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; @@ -23241,9 +23273,9 @@ diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/c return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/char/agp/intel-agp.c ---- linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/agp/intel-agp.c linux-2.6.32.18/drivers/char/agp/intel-agp.c +--- linux-2.6.32.18/drivers/char/agp/intel-agp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/agp/intel-agp.c 2010-08-11 18:57:29.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), @@ -23253,9 +23285,9 @@ diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/ }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet.c ---- linux-2.6.32.16/drivers/char/hpet.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hpet.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hpet.c linux-2.6.32.18/drivers/char/hpet.c +--- linux-2.6.32.18/drivers/char/hpet.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hpet.c 2010-08-11 18:57:29.000000000 -0400 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -23283,9 +23315,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet static int __init hpet_init(void) { -diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/hvc_beat.c ---- linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_beat.c linux-2.6.32.18/drivers/char/hvc_beat.c +--- linux-2.6.32.18/drivers/char/hvc_beat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_beat.c 2010-08-11 18:57:29.000000000 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -23295,9 +23327,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/ .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/char/hvc_console.c ---- linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_console.c linux-2.6.32.18/drivers/char/hvc_console.c +--- linux-2.6.32.18/drivers/char/hvc_console.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_console.c 2010-08-11 18:57:29.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. @@ -23325,9 +23357,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/ch { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/drivers/char/hvc_console.h ---- linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_console.h linux-2.6.32.18/drivers/char/hvc_console.h +--- linux-2.6.32.18/drivers/char/hvc_console.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_console.h 2010-08-11 18:57:29.000000000 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -23351,9 +23383,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/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.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/char/hvc_iseries.c ---- linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_iseries.c linux-2.6.32.18/drivers/char/hvc_iseries.c +--- linux-2.6.32.18/drivers/char/hvc_iseries.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_iseries.c 2010-08-11 18:57:29.000000000 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -23363,9 +23395,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/ch .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/drivers/char/hvc_iucv.c ---- linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_iucv.c linux-2.6.32.18/drivers/char/hvc_iucv.c +--- linux-2.6.32.18/drivers/char/hvc_iucv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_iucv.c 2010-08-11 18:57:29.000000000 -0400 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -23375,9 +23407,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/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.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/hvc_rtas.c ---- linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_rtas.c linux-2.6.32.18/drivers/char/hvc_rtas.c +--- linux-2.6.32.18/drivers/char/hvc_rtas.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_rtas.c 2010-08-11 18:57:29.000000000 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -23387,9 +23419,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/ .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs.c ---- linux-2.6.32.16/drivers/char/hvcs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvcs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvcs.c linux-2.6.32.18/drivers/char/hvcs.c +--- linux-2.6.32.18/drivers/char/hvcs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvcs.c 2010-08-11 18:57:29.000000000 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -23484,9 +23516,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/hvc_udbg.c ---- linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_udbg.c linux-2.6.32.18/drivers/char/hvc_udbg.c +--- linux-2.6.32.18/drivers/char/hvc_udbg.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_udbg.c 2010-08-11 18:57:29.000000000 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -23496,9 +23528,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/ .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/hvc_vio.c ---- linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_vio.c linux-2.6.32.18/drivers/char/hvc_vio.c +--- linux-2.6.32.18/drivers/char/hvc_vio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_vio.c 2010-08-11 18:57:29.000000000 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -23508,9 +23540,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/h .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/hvc_xen.c ---- linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/hvc_xen.c linux-2.6.32.18/drivers/char/hvc_xen.c +--- linux-2.6.32.18/drivers/char/hvc_xen.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/hvc_xen.c 2010-08-11 18:57:29.000000000 -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -23520,9 +23552,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/h .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c 2010-08-11 18:57:29.000000000 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -23553,9 +23585,9 @@ diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/d intf->proc_dir = NULL; -diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c 2010-08-11 18:57:29.000000000 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -23586,9 +23618,9 @@ diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.16/driv new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/keyboard.c ---- linux-2.6.32.16/drivers/char/keyboard.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/keyboard.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/keyboard.c linux-2.6.32.18/drivers/char/keyboard.c +--- linux-2.6.32.18/drivers/char/keyboard.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/keyboard.c 2010-08-11 18:57:29.000000000 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -23615,9 +23647,9 @@ diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/ }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c ---- linux-2.6.32.16/drivers/char/mem.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/mem.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/mem.c linux-2.6.32.18/drivers/char/mem.c +--- linux-2.6.32.18/drivers/char/mem.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/mem.c 2010-08-11 18:57:29.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -23708,9 +23740,9 @@ diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvram.c ---- linux-2.6.32.16/drivers/char/nvram.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/nvram.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/nvram.c linux-2.6.32.18/drivers/char/nvram.c +--- linux-2.6.32.18/drivers/char/nvram.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/nvram.c 2010-08-11 18:57:29.000000000 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -23723,9 +23755,9 @@ diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvr }; static int __init nvram_init(void) -diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c 2010-08-11 18:57:29.000000000 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -23840,9 +23872,9 @@ diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/drivers/char/pty.c ---- linux-2.6.32.16/drivers/char/pty.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/pty.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/pty.c linux-2.6.32.18/drivers/char/pty.c +--- linux-2.6.32.18/drivers/char/pty.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/pty.c 2010-08-11 18:57:29.000000000 -0400 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -23873,9 +23905,9 @@ diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/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.16/drivers/char/random.c linux-2.6.32.16/drivers/char/random.c ---- linux-2.6.32.16/drivers/char/random.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/random.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/random.c linux-2.6.32.18/drivers/char/random.c +--- linux-2.6.32.18/drivers/char/random.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/random.c 2010-08-11 18:57:29.000000000 -0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -23917,9 +23949,9 @@ diff -urNp linux-2.6.32.16/drivers/char/random.c linux-2.6.32.16/drivers/char/ra static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/sonypi.c ---- linux-2.6.32.16/drivers/char/sonypi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/sonypi.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/sonypi.c linux-2.6.32.18/drivers/char/sonypi.c +--- linux-2.6.32.18/drivers/char/sonypi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/sonypi.c 2010-08-11 18:57:29.000000000 -0400 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -23950,9 +23982,9 @@ diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/so mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/tpm/tpm_bios.c linux-2.6.32.18/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.18/drivers/char/tpm/tpm_bios.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/tpm/tpm_bios.c 2010-08-11 18:57:29.000000000 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -23993,9 +24025,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/c memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/drivers/char/tty_io.c ---- linux-2.6.32.16/drivers/char/tty_io.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/tty_io.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/tty_io.c linux-2.6.32.18/drivers/char/tty_io.c +--- linux-2.6.32.18/drivers/char/tty_io.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/tty_io.c 2010-08-11 18:57:29.000000000 -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -24134,9 +24166,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/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.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char/tty_ldisc.c ---- linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/tty_ldisc.c linux-2.6.32.18/drivers/char/tty_ldisc.c +--- linux-2.6.32.18/drivers/char/tty_ldisc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/tty_ldisc.c 2010-08-11 18:57:29.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; @@ -24182,9 +24214,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers/char/virtio_console.c ---- linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/virtio_console.c linux-2.6.32.18/drivers/char/virtio_console.c +--- linux-2.6.32.18/drivers/char/virtio_console.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/virtio_console.c 2010-08-11 18:57:29.000000000 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -24193,9 +24225,9 @@ diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers static struct hv_ops virtio_cons; /* The hvc device */ -diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/vt_ioctl.c ---- linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-11 12:11:58.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/char/vt_ioctl.c linux-2.6.32.18/drivers/char/vt_ioctl.c +--- linux-2.6.32.18/drivers/char/vt_ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/char/vt_ioctl.c 2010-08-11 18:57:29.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; @@ -24239,9 +24271,9 @@ diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/ if (!perm) { ret = -EPERM; goto reterr; -diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/cpufreq/cpufreq.c linux-2.6.32.18/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.18/drivers/cpufreq/cpufreq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/cpufreq/cpufreq.c 2010-08-11 18:57:29.000000000 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -24251,9 +24283,9 @@ diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpu .show = show, .store = store, }; -diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuidle/sysfs.c ---- linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/cpuidle/sysfs.c linux-2.6.32.18/drivers/cpuidle/sysfs.c +--- linux-2.6.32.18/drivers/cpuidle/sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/cpuidle/sysfs.c 2010-08-11 18:57:29.000000000 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -24281,9 +24313,9 @@ diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuid { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/ioat/dma.c ---- linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/dma/ioat/dma.c linux-2.6.32.18/drivers/dma/ioat/dma.c +--- linux-2.6.32.18/drivers/dma/ioat/dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/dma/ioat/dma.c 2010-08-11 18:57:29.000000000 -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -24293,9 +24325,9 @@ diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/io .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/drivers/dma/ioat/dma.h ---- linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/dma/ioat/dma.h linux-2.6.32.18/drivers/dma/ioat/dma.h +--- linux-2.6.32.18/drivers/dma/ioat/dma.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/dma/ioat/dma.h 2010-08-11 18:57:29.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); @@ -24305,9 +24337,9 @@ diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/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.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac/edac_core.h ---- linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/edac/edac_core.h linux-2.6.32.18/drivers/edac/edac_core.h +--- linux-2.6.32.18/drivers/edac/edac_core.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/edac/edac_core.h 2010-08-11 18:57:29.000000000 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -24325,9 +24357,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/edac/edac_device_sysfs.c linux-2.6.32.18/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.18/drivers/edac/edac_device_sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/edac/edac_device_sysfs.c 2010-08-11 18:57:29.000000000 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -24355,9 +24387,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/driv .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c 2010-08-11 18:57:29.000000000 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -24376,9 +24408,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/ .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c 2010-08-11 18:57:29.000000000 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -24397,9 +24429,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/firewire/core-cdev.c ---- linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firewire/core-cdev.c linux-2.6.32.18/drivers/firewire/core-cdev.c +--- linux-2.6.32.18/drivers/firewire/core-cdev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firewire/core-cdev.c 2010-08-11 18:57:29.000000000 -0400 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; @@ -24410,9 +24442,9 @@ diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/ return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/firmware/dmi_scan.c ---- linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firmware/dmi_scan.c linux-2.6.32.18/drivers/firmware/dmi_scan.c +--- linux-2.6.32.18/drivers/firmware/dmi_scan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firmware/dmi_scan.c 2010-08-11 18:57:30.000000000 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -24425,9 +24457,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/f p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmware/edd.c ---- linux-2.6.32.16/drivers/firmware/edd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firmware/edd.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firmware/edd.c linux-2.6.32.18/drivers/firmware/edd.c +--- linux-2.6.32.18/drivers/firmware/edd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firmware/edd.c 2010-08-11 18:57:30.000000000 -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -24437,9 +24469,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmwa .show = edd_attr_show, }; -diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/firmware/efivars.c ---- linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firmware/efivars.c linux-2.6.32.18/drivers/firmware/efivars.c +--- linux-2.6.32.18/drivers/firmware/efivars.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firmware/efivars.c 2010-08-11 18:57:30.000000000 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -24449,9 +24481,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/fi .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firmware/iscsi_ibft.c linux-2.6.32.18/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.18/drivers/firmware/iscsi_ibft.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firmware/iscsi_ibft.c 2010-08-11 18:57:30.000000000 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -24461,9 +24493,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/firmware/memmap.c ---- linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/firmware/memmap.c linux-2.6.32.18/drivers/firmware/memmap.c +--- linux-2.6.32.18/drivers/firmware/memmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/firmware/memmap.c 2010-08-11 18:57:30.000000000 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -24473,9 +24505,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/fir .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_drv.c linux-2.6.32.18/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.18/drivers/gpu/drm/drm_drv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/drm_drv.c 2010-08-11 18:57:30.000000000 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -24485,9 +24517,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/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.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_fops.c linux-2.6.32.18/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.18/drivers/gpu/drm/drm_fops.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/drm_fops.c 2010-08-11 18:57:30.000000000 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -24539,9 +24571,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/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.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c 2010-08-11 18:57:30.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); @@ -24551,9 +24583,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/g stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_lock.c linux-2.6.32.18/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.18/drivers/gpu/drm/drm_lock.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/drm_lock.c 2010-08-11 18:57:30.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; @@ -24572,9 +24604,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/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.16/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c 2010-08-11 18:57:30.000000000 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -24597,9 +24629,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.16/drive sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-11 18:57:30.000000000 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -24609,9 +24641,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.16/dri .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-11 18:57:30.000000000 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -24621,9 +24653,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.16/dri .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h 2010-08-11 18:57:30.000000000 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -24656,9 +24688,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gp +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-11 18:57:30.000000000 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -24668,9 +24700,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.16/drive .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-11 18:57:30.000000000 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -24680,9 +24712,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.16/dri .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-11 18:57:30.000000000 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -24692,10 +24724,10 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.16/dri .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-09 14:50:36.000000000 -0400 -@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) +diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c 2010-08-11 18:57:30.000000000 -0400 +@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -24704,9 +24736,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.16/drive .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c 2010-08-11 18:57:30.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -24724,10 +24756,10 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/d if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-09 14:50:36.000000000 -0400 -@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o +diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-11 18:57:30.000000000 -0400 +@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o } } @@ -24743,7 +24775,7 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 bool radeon_get_atom_connector_info_from_supported_devices_table(struct drm_device -@@ -526,7 +526,6 @@ bool radeon_get_atom_connector_info_from +@@ -535,7 +535,6 @@ bool radeon_get_atom_connector_info_from uint8_t dac; union atom_supported_devices *supported_devices; int i, j; @@ -24751,9 +24783,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c 2010-08-11 18:57:30.000000000 -0400 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { @@ -24763,9 +24795,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c 2010-08-11 18:57:30.000000000 -0400 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -24775,9 +24807,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.16 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-11 18:57:30.000000000 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -24829,9 +24861,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.16/d } -diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-11 18:57:30.000000000 -0400 @@ -39,7 +39,7 @@ #include <linux/module.h> @@ -24850,9 +24882,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.16/drivers/ .show = &ttm_bo_global_show }; -diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-11 18:57:30.000000000 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -24873,9 +24905,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.16/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.16/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c 2010-08-11 18:57:30.000000000 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -24933,9 +24965,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.16/driv ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-11 18:57:30.000000000 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -24945,9 +24977,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.16/driv .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/hid/usbhid/hiddev.c ---- linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hid/usbhid/hiddev.c linux-2.6.32.18/drivers/hid/usbhid/hiddev.c +--- linux-2.6.32.18/drivers/hid/usbhid/hiddev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hid/usbhid/hiddev.c 2010-08-11 18:57:30.000000000 -0400 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); @@ -24957,9 +24989,9 @@ diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/h return -EINVAL; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/k8temp.c ---- linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hwmon/k8temp.c linux-2.6.32.18/drivers/hwmon/k8temp.c +--- linux-2.6.32.18/drivers/hwmon/k8temp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hwmon/k8temp.c 2010-08-11 18:57:30.000000000 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -24969,9 +25001,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon/sis5595.c ---- linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hwmon/sis5595.c linux-2.6.32.18/drivers/hwmon/sis5595.c +--- linux-2.6.32.18/drivers/hwmon/sis5595.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hwmon/sis5595.c 2010-08-11 18:57:30.000000000 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -24981,9 +25013,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon/via686a.c ---- linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hwmon/via686a.c linux-2.6.32.18/drivers/hwmon/via686a.c +--- linux-2.6.32.18/drivers/hwmon/via686a.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hwmon/via686a.c 2010-08-11 18:57:30.000000000 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -24993,9 +25025,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/vt8231.c ---- linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hwmon/vt8231.c linux-2.6.32.18/drivers/hwmon/vt8231.c +--- linux-2.6.32.18/drivers/hwmon/vt8231.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hwmon/vt8231.c 2010-08-11 18:57:30.000000000 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -25005,9 +25037,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon/w83791d.c ---- linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/hwmon/w83791d.c linux-2.6.32.18/drivers/hwmon/w83791d.c +--- linux-2.6.32.18/drivers/hwmon/w83791d.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/hwmon/w83791d.c 2010-08-11 18:57:30.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); @@ -25019,9 +25051,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c 2010-08-11 18:57:30.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) }, @@ -25031,9 +25063,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c 2010-08-11 18:57:30.000000000 -0400 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -25052,9 +25084,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/driver }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c 2010-08-11 18:57:30.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) }, @@ -25064,9 +25096,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drive }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c 2010-08-11 18:57:30.000000000 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -25076,9 +25108,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drive }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide-cd.c ---- linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ide/ide-cd.c linux-2.6.32.18/drivers/ide/ide-cd.c +--- linux-2.6.32.18/drivers/ide/ide-cd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ide/ide-cd.c 2010-08-11 18:57:30.000000000 -0400 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -25088,9 +25120,9 @@ diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide- drive->dma = 0; } } -diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/ieee1394/dv1394.c ---- linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/dv1394.c linux-2.6.32.18/drivers/ieee1394/dv1394.c +--- linux-2.6.32.18/drivers/ieee1394/dv1394.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/dv1394.c 2010-08-11 18:57:30.000000000 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -25109,9 +25141,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/iee }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ieee1394/eth1394.c ---- linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/eth1394.c linux-2.6.32.18/drivers/ieee1394/eth1394.c +--- linux-2.6.32.18/drivers/ieee1394/eth1394.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/eth1394.c 2010-08-11 18:57:30.000000000 -0400 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -25121,9 +25153,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee1394/hosts.c ---- linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/hosts.c linux-2.6.32.18/drivers/ieee1394/hosts.c +--- linux-2.6.32.18/drivers/ieee1394/hosts.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/hosts.c 2010-08-11 18:57:30.000000000 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -25132,9 +25164,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/ohci1394.c linux-2.6.32.18/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.18/drivers/ieee1394/ohci1394.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/ohci1394.c 2010-08-11 18:57:30.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) @@ -25156,9 +25188,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/i }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ieee1394/raw1394.c ---- linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/raw1394.c linux-2.6.32.18/drivers/ieee1394/raw1394.c +--- linux-2.6.32.18/drivers/ieee1394/raw1394.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/raw1394.c 2010-08-11 18:57:30.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, @@ -25168,9 +25200,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1394/sbp2.c ---- linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/sbp2.c linux-2.6.32.18/drivers/ieee1394/sbp2.c +--- linux-2.6.32.18/drivers/ieee1394/sbp2.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/sbp2.c 2010-08-11 18:57:30.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, @@ -25189,9 +25221,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1 { int ret; -diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/ieee1394/video1394.c ---- linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/ieee1394/video1394.c linux-2.6.32.18/drivers/ieee1394/video1394.c +--- linux-2.6.32.18/drivers/ieee1394/video1394.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/ieee1394/video1394.c 2010-08-11 18:57:30.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 @@ -25201,9 +25233,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/ }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/infiniband/core/cm.c ---- linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/infiniband/core/cm.c linux-2.6.32.18/drivers/infiniband/core/cm.c +--- linux-2.6.32.18/drivers/infiniband/core/cm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/infiniband/core/cm.c 2010-08-11 18:57:30.000000000 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -25347,9 +25379,9 @@ diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/ .show = cm_show_counter }; -diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/infiniband/core/sysfs.c linux-2.6.32.18/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.18/drivers/infiniband/core/sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/infiniband/core/sysfs.c 2010-08-11 18:57:30.000000000 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -25359,9 +25391,9 @@ diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drive .show = port_attr_show }; -diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/keyboard/atkbd.c linux-2.6.32.18/drivers/input/keyboard/atkbd.c +--- linux-2.6.32.18/drivers/input/keyboard/atkbd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/keyboard/atkbd.c 2010-08-11 18:57:30.000000000 -0400 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25371,9 +25403,9 @@ diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/driver }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/drivers/input/mouse/lifebook.c ---- linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/mouse/lifebook.c linux-2.6.32.18/drivers/input/mouse/lifebook.c +--- linux-2.6.32.18/drivers/input/mouse/lifebook.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/mouse/lifebook.c 2010-08-11 18:57:30.000000000 -0400 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -25383,9 +25415,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/driver }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/mouse/psmouse-base.c linux-2.6.32.18/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32.18/drivers/input/mouse/psmouse-base.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/mouse/psmouse-base.c 2010-08-11 18:57:30.000000000 -0400 @@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25395,9 +25427,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/dr }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drivers/input/mouse/synaptics.c ---- linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/mouse/synaptics.c linux-2.6.32.18/drivers/input/mouse/synaptics.c +--- linux-2.6.32.18/drivers/input/mouse/synaptics.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/mouse/synaptics.c 2010-08-11 18:57:30.000000000 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -25426,9 +25458,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drive }; #endif -diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/input/mousedev.c ---- linux-2.6.32.16/drivers/input/mousedev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/mousedev.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/mousedev.c linux-2.6.32.18/drivers/input/mousedev.c +--- linux-2.6.32.18/drivers/input/mousedev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/mousedev.c 2010-08-11 18:57:30.000000000 -0400 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -25438,10 +25470,10 @@ diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/inpu }; static int psaux_registered; #endif -diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-09 14:50:36.000000000 -0400 -@@ -172,7 +172,7 @@ static const struct dmi_system_id __init +diff -urNp linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h 2010-08-11 18:57:30.000000000 -0400 +@@ -179,7 +179,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, }, @@ -25450,7 +25482,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; /* -@@ -402,7 +402,7 @@ static const struct dmi_system_id __init +@@ -409,7 +409,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), }, }, @@ -25459,7 +25491,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { -@@ -476,7 +476,7 @@ static const struct dmi_system_id __init +@@ -483,7 +483,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), }, }, @@ -25468,7 +25500,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; #ifdef CONFIG_PNP -@@ -495,7 +495,7 @@ static const struct dmi_system_id __init +@@ -502,7 +502,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), }, }, @@ -25477,7 +25509,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { -@@ -519,7 +519,7 @@ static const struct dmi_system_id __init +@@ -526,7 +526,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ }, }, @@ -25486,7 +25518,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; #endif -@@ -593,7 +593,7 @@ static const struct dmi_system_id __init +@@ -600,7 +600,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), }, }, @@ -25495,9 +25527,9 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16 }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drivers/input/serio/serio_raw.c ---- linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/input/serio/serio_raw.c linux-2.6.32.18/drivers/input/serio/serio_raw.c +--- linux-2.6.32.18/drivers/input/serio/serio_raw.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/input/serio/serio_raw.c 2010-08-11 18:57:30.000000000 -0400 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25507,9 +25539,9 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drive }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers/isdn/gigaset/common.c ---- linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/common.c linux-2.6.32.18/drivers/isdn/gigaset/common.c +--- linux-2.6.32.18/drivers/isdn/gigaset/common.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/isdn/gigaset/common.c 2010-08-11 18:57:30.000000000 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -25519,9 +25551,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h 2010-08-11 18:57:30.000000000 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -25531,9 +25563,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/driver struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/interface.c linux-2.6.32.18/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.18/drivers/isdn/gigaset/interface.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/isdn/gigaset/interface.c 2010-08-11 18:57:30.000000000 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -25621,9 +25653,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/driv dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c 2010-08-11 18:57:30.000000000 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -25642,9 +25674,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/driver return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/icn/icn.c ---- linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/isdn/icn/icn.c linux-2.6.32.18/drivers/isdn/icn/icn.c +--- linux-2.6.32.18/drivers/isdn/icn/icn.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/isdn/icn/icn.c 2010-08-11 18:57:30.000000000 -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -25654,9 +25686,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/i return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/core.c ---- linux-2.6.32.16/drivers/lguest/core.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/lguest/core.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/lguest/core.c linux-2.6.32.18/drivers/lguest/core.c +--- linux-2.6.32.18/drivers/lguest/core.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/lguest/core.c 2010-08-11 18:57:30.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. @@ -25675,9 +25707,9 @@ diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/ if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c 2010-08-11 18:57:30.000000000 -0400 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -25696,9 +25728,9 @@ diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16 .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/macintosh/via-pmu.c ---- linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/macintosh/via-pmu.c linux-2.6.32.18/drivers/macintosh/via-pmu.c +--- linux-2.6.32.18/drivers/macintosh/via-pmu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/macintosh/via-pmu.c 2010-08-11 18:57:30.000000000 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -25708,9 +25740,9 @@ diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/m .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap.c ---- linux-2.6.32.16/drivers/md/bitmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/md/bitmap.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/md/bitmap.c linux-2.6.32.18/drivers/md/bitmap.c +--- linux-2.6.32.18/drivers/md/bitmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/md/bitmap.c 2010-08-11 18:57:30.000000000 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -25720,9 +25752,9 @@ diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap # endif #endif -diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-sysfs.c ---- linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/md/dm-sysfs.c linux-2.6.32.18/drivers/md/dm-sysfs.c +--- linux-2.6.32.18/drivers/md/dm-sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/md/dm-sysfs.c 2010-08-11 18:57:30.000000000 -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -25732,9 +25764,9 @@ diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-s .show = dm_attr_show, }; -diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/drivers/md/dm-table.c ---- linux-2.6.32.16/drivers/md/dm-table.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/md/dm-table.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/md/dm-table.c linux-2.6.32.18/drivers/md/dm-table.c +--- linux-2.6.32.18/drivers/md/dm-table.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/md/dm-table.c 2010-08-11 18:57:30.000000000 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -25744,9 +25776,9 @@ diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/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.16/drivers/md/md.c linux-2.6.32.16/drivers/md/md.c ---- linux-2.6.32.16/drivers/md/md.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/md/md.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/md/md.c linux-2.6.32.18/drivers/md/md.c +--- linux-2.6.32.18/drivers/md/md.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/md/md.c 2010-08-11 18:57:30.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); @@ -25783,9 +25815,9 @@ diff -urNp linux-2.6.32.16/drivers/md/md.c linux-2.6.32.16/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.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h ---- linux-2.6.32.16/drivers/md/md.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/md/md.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/md/md.h linux-2.6.32.18/drivers/md/md.h +--- linux-2.6.32.18/drivers/md/md.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/md/md.h 2010-08-11 18:57:30.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) @@ -25795,9 +25827,9 @@ diff -urNp linux-2.6.32.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-11 18:57:30.000000000 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -25806,9 +25838,9 @@ diff -urNp linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.16/d struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/media/radio/radio-cadet.c linux-2.6.32.18/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.18/drivers/media/radio/radio-cadet.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/media/radio/radio-cadet.c 2010-08-11 18:57:30.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++]; @@ -25818,9 +25850,9 @@ diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/dri return -EFAULT; return i; } -diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c 2010-08-11 18:57:30.000000000 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -25830,9 +25862,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-11 18:57:30.000000000 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -25842,9 +25874,9 @@ diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/drivers/message/fusion/mptdebug.h ---- linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/message/fusion/mptdebug.h linux-2.6.32.18/drivers/message/fusion/mptdebug.h +--- linux-2.6.32.18/drivers/message/fusion/mptdebug.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/message/fusion/mptdebug.h 2010-08-11 18:57:30.000000000 -0400 @@ -71,7 +71,7 @@ CMD; \ } @@ -25854,9 +25886,9 @@ diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/dri #endif -diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drivers/message/fusion/mptsas.c ---- linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/message/fusion/mptsas.c linux-2.6.32.18/drivers/message/fusion/mptsas.c +--- linux-2.6.32.18/drivers/message/fusion/mptsas.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/message/fusion/mptsas.c 2010-08-11 18:57:30.000000000 -0400 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -25905,9 +25937,9 @@ diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/message/i2o/i2o_proc.c linux-2.6.32.18/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.18/drivers/message/i2o/i2o_proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/message/i2o/i2o_proc.c 2010-08-11 18:57:30.000000000 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -25994,9 +26026,9 @@ diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/driver return 0; } -diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kgdbts.c ---- linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/misc/kgdbts.c linux-2.6.32.18/drivers/misc/kgdbts.c +--- linux-2.6.32.18/drivers/misc/kgdbts.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/misc/kgdbts.c 2010-08-11 18:57:30.000000000 -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -26015,9 +26047,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kg .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c 2010-08-11 18:57:30.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) @@ -26029,9 +26061,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/dri if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c 2010-08-11 18:57:30.000000000 -0400 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -26055,9 +26087,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/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.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h 2010-08-11 18:57:30.000000000 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -26241,9 +26273,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/driv } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/mtd/devices/doc2000.c linux-2.6.32.18/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.18/drivers/mtd/devices/doc2000.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/mtd/devices/doc2000.c 2010-08-11 18:57:30.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 */ @@ -26253,9 +26285,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/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.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/mtd/devices/doc2001.c linux-2.6.32.18/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.18/drivers/mtd/devices/doc2001.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/mtd/devices/doc2001.c 2010-08-11 18:57:30.000000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -26265,9 +26297,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/ubi/build.c ---- linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/mtd/ubi/build.c linux-2.6.32.18/drivers/mtd/ubi/build.c +--- linux-2.6.32.18/drivers/mtd/ubi/build.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/mtd/ubi/build.c 2010-08-11 18:57:30.000000000 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -26307,9 +26339,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/u } /** -diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/drivers/net/e1000e/82571.c ---- linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/e1000e/82571.c linux-2.6.32.18/drivers/net/e1000e/82571.c +--- linux-2.6.32.18/drivers/net/e1000e/82571.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/e1000e/82571.c 2010-08-11 18:57:30.000000000 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -26363,9 +26395,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/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.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/net/e1000e/e1000.h ---- linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/e1000e/e1000.h linux-2.6.32.18/drivers/net/e1000e/e1000.h +--- linux-2.6.32.18/drivers/net/e1000e/e1000.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/e1000e/e1000.h 2010-08-11 18:57:30.000000000 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -26379,9 +26411,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/ne }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/e1000e/es2lan.c linux-2.6.32.18/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.18/drivers/net/e1000e/es2lan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/e1000e/es2lan.c 2010-08-11 18:57:30.000000000 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -26417,9 +26449,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/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.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e1000e/hw.h ---- linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/e1000e/hw.h linux-2.6.32.18/drivers/net/e1000e/hw.h +--- linux-2.6.32.18/drivers/net/e1000e/hw.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/e1000e/hw.h 2010-08-11 18:57:30.000000000 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { /* Function pointers for the PHY. */ @@ -26479,9 +26511,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e }; struct e1000_mac_info { -diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/e1000e/ich8lan.c linux-2.6.32.18/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.18/drivers/net/e1000e/ich8lan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/e1000e/ich8lan.c 2010-08-11 18:57:30.000000000 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -26509,9 +26541,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/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.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibmveth.c ---- linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/ibmveth.c linux-2.6.32.18/drivers/net/ibmveth.c +--- linux-2.6.32.18/drivers/net/ibmveth.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/ibmveth.c 2010-08-11 18:57:30.000000000 -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -26521,10 +26553,10 @@ diff -urNp linux-2.6.32.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibm .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-09 14:50:36.000000000 -0400 -@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct +diff -urNp linux-2.6.32.18/drivers/net/igb/e1000_82575.c linux-2.6.32.18/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.18/drivers/net/igb/e1000_82575.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/igb/e1000_82575.c 2010-08-11 18:57:30.000000000 -0400 +@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -26533,7 +26565,7 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers .reset_hw = igb_reset_hw_82575, .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575, -@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000 +@@ -1419,13 +1419,13 @@ static struct e1000_mac_operations e1000 .get_speed_and_duplex = igb_get_speed_and_duplex_copper, }; @@ -26549,10 +26581,10 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-09 14:50:36.000000000 -0400 -@@ -303,17 +303,17 @@ struct e1000_phy_operations { +diff -urNp linux-2.6.32.18/drivers/net/igb/e1000_hw.h linux-2.6.32.18/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.18/drivers/net/igb/e1000_hw.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/igb/e1000_hw.h 2010-08-11 18:57:30.000000000 -0400 +@@ -305,17 +305,17 @@ struct e1000_phy_operations { }; struct e1000_nvm_operations { @@ -26577,9 +26609,9 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/ne }; extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/net/irda/vlsi_ir.c ---- linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/irda/vlsi_ir.c linux-2.6.32.18/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32.18/drivers/net/irda/vlsi_ir.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/irda/vlsi_ir.c 2010-08-11 18:57:30.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); @@ -26596,9 +26628,9 @@ diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/ne spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return NETDEV_TX_OK; -diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/net/iseries_veth.c ---- linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/iseries_veth.c linux-2.6.32.18/drivers/net/iseries_veth.c +--- linux-2.6.32.18/drivers/net/iseries_veth.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/iseries_veth.c 2010-08-11 18:57:30.000000000 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -26617,9 +26649,9 @@ diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/ne .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcnet32.c ---- linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/pcnet32.c linux-2.6.32.18/drivers/net/pcnet32.c +--- linux-2.6.32.18/drivers/net/pcnet32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/pcnet32.c 2010-08-11 18:57:30.000000000 -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -26629,9 +26661,9 @@ diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcn { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/drivers/net/tg3.h ---- linux-2.6.32.16/drivers/net/tg3.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/tg3.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/tg3.h linux-2.6.32.18/drivers/net/tg3.h +--- linux-2.6.32.18/drivers/net/tg3.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/tg3.h 2010-08-11 18:57:30.000000000 -0400 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -26640,9 +26672,9 @@ diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/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.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net/tulip/de4x5.c ---- linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/tulip/de4x5.c linux-2.6.32.18/drivers/net/tulip/de4x5.c +--- linux-2.6.32.18/drivers/net/tulip/de4x5.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/tulip/de4x5.c 2010-08-11 18:57:30.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]; @@ -26661,9 +26693,9 @@ diff -urNp linux-2.6.32.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net return -EFAULT; break; } -diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/drivers/net/usb/hso.c ---- linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/usb/hso.c linux-2.6.32.18/drivers/net/usb/hso.c +--- linux-2.6.32.18/drivers/net/usb/hso.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/usb/hso.c 2010-08-11 18:57:30.000000000 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -26742,9 +26774,9 @@ diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/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.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c 2010-08-11 18:57:30.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); @@ -26754,9 +26786,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/dr /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c 2010-08-11 18:57:30.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); @@ -26766,9 +26798,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-11 18:57:30.000000000 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -26778,9 +26810,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-11 18:57:30.000000000 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -26790,9 +26822,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-11 18:57:30.000000000 -0400 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -26802,9 +26834,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-11 18:57:30.000000000 -0400 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -26822,9 +26854,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-11 18:57:30.000000000 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -26834,9 +26866,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-11 18:57:30.000000000 -0400 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif @@ -26848,9 +26880,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-11 18:57:30.000000000 -0400 @@ -68,7 +68,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -26860,9 +26892,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c 2010-08-11 18:57:30.000000000 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -26872,9 +26904,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c 2010-08-11 18:57:31.000000000 -0400 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn devdbg(usbdev, "set_rts_threshold %i", rts_threshold); @@ -26884,9 +26916,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/dri rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/buffer_sync.c linux-2.6.32.18/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.18/drivers/oprofile/buffer_sync.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/buffer_sync.c 2010-08-11 18:57:31.000000000 -0400 @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -26922,9 +26954,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/driver } } release_mm(mm); -diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drivers/oprofile/event_buffer.c ---- linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/event_buffer.c linux-2.6.32.18/drivers/oprofile/event_buffer.c +--- linux-2.6.32.18/drivers/oprofile/event_buffer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/event_buffer.c 2010-08-11 18:57:31.000000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -26934,9 +26966,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drive return; } -diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/oprofile/oprof.c ---- linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-09 14:50:36.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/oprof.c linux-2.6.32.18/drivers/oprofile/oprof.c +--- linux-2.6.32.18/drivers/oprofile/oprof.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/oprof.c 2010-08-11 18:57:31.000000000 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -26946,9 +26978,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/opro start_switch_worker(); } -diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/oprofilefs.c linux-2.6.32.18/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.18/drivers/oprofile/oprofilefs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/oprofilefs.c 2010-08-11 18:57:31.000000000 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -26958,9 +26990,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/oprofile_stats.c linux-2.6.32.18/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.18/drivers/oprofile/oprofile_stats.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/oprofile_stats.c 2010-08-11 18:57:31.000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -26978,9 +27010,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/dri } -diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/oprofile/oprofile_stats.h linux-2.6.32.18/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.18/drivers/oprofile/oprofile_stats.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/oprofile/oprofile_stats.h 2010-08-11 18:57:31.000000000 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -26998,9 +27030,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/dri }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/parisc/pdc_stable.c ---- linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/parisc/pdc_stable.c linux-2.6.32.18/drivers/parisc/pdc_stable.c +--- linux-2.6.32.18/drivers/parisc/pdc_stable.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/parisc/pdc_stable.c 2010-08-11 18:57:31.000000000 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -27010,9 +27042,9 @@ diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/p .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parport/procfs.c ---- linux-2.6.32.16/drivers/parport/procfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/parport/procfs.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/parport/procfs.c linux-2.6.32.18/drivers/parport/procfs.c +--- linux-2.6.32.18/drivers/parport/procfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/parport/procfs.c 2010-08-11 18:57:31.000000000 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -27031,9 +27063,9 @@ diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parp } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c 2010-08-11 18:57:31.000000000 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -27043,9 +27075,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/dr .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-11 18:57:31.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -27060,9 +27092,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/dr dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/hotplug/fakephp.c linux-2.6.32.18/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.18/drivers/pci/hotplug/fakephp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/hotplug/fakephp.c 2010-08-11 18:57:31.000000000 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -27072,9 +27104,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci/intel-iommu.c ---- linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-09 14:50:44.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/intel-iommu.c linux-2.6.32.18/drivers/pci/intel-iommu.c +--- linux-2.6.32.18/drivers/pci/intel-iommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/intel-iommu.c 2010-08-11 18:57:31.000000000 -0400 @@ -2647,7 +2647,7 @@ error: return 0; } @@ -27144,9 +27176,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c 2010-08-11 18:57:31.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 */ @@ -27156,9 +27188,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/driver }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe.c ---- linux-2.6.32.16/drivers/pci/probe.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/probe.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/probe.c linux-2.6.32.18/drivers/pci/probe.c +--- linux-2.6.32.18/drivers/pci/probe.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/probe.c 2010-08-11 18:57:31.000000000 -0400 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -27176,9 +27208,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe struct device_attribute *attr, char *buf) { -diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/drivers/pci/proc.c ---- linux-2.6.32.16/drivers/pci/proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/proc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/proc.c linux-2.6.32.18/drivers/pci/proc.c +--- linux-2.6.32.18/drivers/pci/proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/proc.c 2010-08-11 18:57:31.000000000 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -27196,9 +27228,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/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.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c ---- linux-2.6.32.16/drivers/pci/slot.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pci/slot.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pci/slot.c linux-2.6.32.18/drivers/pci/slot.c +--- linux-2.6.32.18/drivers/pci/slot.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pci/slot.c 2010-08-11 18:57:31.000000000 -0400 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -27208,9 +27240,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmcia/ti113x.h ---- linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pcmcia/ti113x.h linux-2.6.32.18/drivers/pcmcia/ti113x.h +--- linux-2.6.32.18/drivers/pcmcia/ti113x.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pcmcia/ti113x.h 2010-08-11 18:57:31.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), @@ -27220,9 +27252,9 @@ diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmci }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pcmcia/yenta_socket.c linux-2.6.32.18/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32.18/drivers/pcmcia/yenta_socket.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pcmcia/yenta_socket.c 2010-08-11 18:57:31.000000000 -0400 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -27232,9 +27264,9 @@ diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/acer-wmi.c linux-2.6.32.18/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.18/drivers/platform/x86/acer-wmi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/acer-wmi.c 2010-08-11 18:57:31.000000000 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -27244,9 +27276,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drive .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/asus_acpi.c linux-2.6.32.18/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.18/drivers/platform/x86/asus_acpi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/asus_acpi.c 2010-08-11 18:57:31.000000000 -0400 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -27256,9 +27288,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/driv .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/asus-laptop.c linux-2.6.32.18/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/asus-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/asus-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -27268,9 +27300,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/dr .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/compal-laptop.c linux-2.6.32.18/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/compal-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/compal-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -27280,9 +27312,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/ .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/dell-laptop.c linux-2.6.32.18/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/dell-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/dell-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -27292,9 +27324,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/dr .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -27304,9 +27336,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/d .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -27316,9 +27348,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16 .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/msi-laptop.c linux-2.6.32.18/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/msi-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/msi-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -27328,9 +27360,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/dri .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -27340,9 +27372,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/sony-laptop.c linux-2.6.32.18/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.18/drivers/platform/x86/sony-laptop.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/sony-laptop.c 2010-08-11 18:57:31.000000000 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -27352,9 +27384,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/dr .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c 2010-08-11 18:57:31.000000000 -0400 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -27364,9 +27396,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/ .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c 2010-08-11 18:57:31.000000000 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -27376,9 +27408,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/d .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c 2010-08-11 18:57:31.000000000 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -27435,9 +27467,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quirks.c ---- linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pnp/quirks.c linux-2.6.32.18/drivers/pnp/quirks.c +--- linux-2.6.32.18/drivers/pnp/quirks.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pnp/quirks.c 2010-08-11 18:57:31.000000000 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -27447,9 +27479,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quir }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/resource.c ---- linux-2.6.32.16/drivers/pnp/resource.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/pnp/resource.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/pnp/resource.c linux-2.6.32.18/drivers/pnp/resource.c +--- linux-2.6.32.18/drivers/pnp/resource.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/pnp/resource.c 2010-08-11 18:57:31.000000000 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -27468,9 +27500,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/re return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/s390/cio/qdio_perf.c linux-2.6.32.18/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.18/drivers/s390/cio/qdio_perf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/s390/cio/qdio_perf.c 2010-08-11 18:57:31.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) { @@ -27546,9 +27578,9 @@ diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/s390/cio/qdio_perf.h linux-2.6.32.18/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.18/drivers/s390/cio/qdio_perf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/s390/cio/qdio_perf.h 2010-08-11 18:57:31.000000000 -0400 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -27621,9 +27653,9 @@ diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/ } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/drivers/scsi/ipr.c ---- linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/ipr.c linux-2.6.32.18/drivers/scsi/ipr.c +--- linux-2.6.32.18/drivers/scsi/ipr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/ipr.c 2010-08-11 18:57:31.000000000 -0400 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -27633,9 +27665,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/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.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c 2010-08-11 18:57:31.000000000 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -27757,9 +27789,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/ fc_frame_free(fp); } -diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c 2010-08-11 18:57:31.000000000 -0400 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -27769,9 +27801,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/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.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h ---- linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h +--- linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-11 18:57:31.000000000 -0400 @@ -79,7 +79,7 @@ CMD; \ } @@ -27781,9 +27813,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/ #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ -diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/scsi/scsi_logging.h ---- linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/scsi_logging.h linux-2.6.32.18/drivers/scsi/scsi_logging.h +--- linux-2.6.32.18/drivers/scsi/scsi_logging.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/scsi_logging.h 2010-08-11 18:57:31.000000000 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -27793,9 +27825,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/s #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c ---- linux-2.6.32.16/drivers/scsi/sg.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/scsi/sg.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/scsi/sg.c linux-2.6.32.18/drivers/scsi/sg.c +--- linux-2.6.32.18/drivers/scsi/sg.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/scsi/sg.c 2010-08-11 18:57:31.000000000 -0400 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -27814,9 +27846,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/serial/8250_pci.c ---- linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/serial/8250_pci.c linux-2.6.32.18/drivers/serial/8250_pci.c +--- linux-2.6.32.18/drivers/serial/8250_pci.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/serial/8250_pci.c 2010-08-11 18:57:31.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, @@ -27826,9 +27858,9 @@ diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/ser }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/serial/kgdboc.c ---- linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/serial/kgdboc.c linux-2.6.32.18/drivers/serial/kgdboc.c +--- linux-2.6.32.18/drivers/serial/kgdboc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/serial/kgdboc.c 2010-08-11 18:57:31.000000000 -0400 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -27847,9 +27879,9 @@ diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/seria .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/drivers/staging/android/binder.c ---- linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/android/binder.c linux-2.6.32.18/drivers/staging/android/binder.c +--- linux-2.6.32.18/drivers/staging/android/binder.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/android/binder.c 2010-08-11 18:57:31.000000000 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -27859,9 +27891,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/driv .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c 2010-08-11 18:57:31.000000000 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -27880,9 +27912,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c 2010-08-11 18:57:31.000000000 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -27892,9 +27924,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/ .close = comedi_unmap, }; -diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-11 18:57:31.000000000 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -27904,9 +27936,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-11 18:57:31.000000000 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -27916,9 +27948,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-11 18:57:31.000000000 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -27928,9 +27960,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-11 18:57:31.000000000 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -27940,9 +27972,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c 2010-08-11 18:57:31.000000000 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -27961,9 +27993,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-11 18:57:31.000000000 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -27973,9 +28005,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c 2010-08-11 18:57:31.000000000 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -27994,9 +28026,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-11 18:57:31.000000000 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -28006,9 +28038,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c 2010-08-11 18:57:31.000000000 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -28018,9 +28050,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/dri .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c 2010-08-11 18:57:31.000000000 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -28030,9 +28062,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.16/d .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-11 18:57:31.000000000 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -28051,9 +28083,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/staging/dst/dcore.c ---- linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dst/dcore.c linux-2.6.32.18/drivers/staging/dst/dcore.c +--- linux-2.6.32.18/drivers/staging/dst/dcore.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dst/dcore.c 2010-08-11 18:57:31.000000000 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -28072,9 +28104,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/drivers/staging/dst/trans.c ---- linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/dst/trans.c linux-2.6.32.18/drivers/staging/dst/trans.c +--- linux-2.6.32.18/drivers/staging/dst/trans.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/dst/trans.c 2010-08-11 18:57:31.000000000 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -28084,9 +28116,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/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.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c 2010-08-11 18:57:31.000000000 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -28096,9 +28128,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/ .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c 2010-08-11 18:57:31.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; @@ -28108,9 +28140,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drive .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/staging/hv/Hv.c ---- linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/hv/Hv.c linux-2.6.32.18/drivers/staging/hv/Hv.c +--- linux-2.6.32.18/drivers/staging/hv/Hv.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/hv/Hv.c 2010-08-11 18:57:31.000000000 -0400 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; u32 outputAddressHi = outputAddress >> 32; @@ -28120,9 +28152,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/stagi DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", Control, Input, Output); -diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers/staging/panel/panel.c ---- linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/panel/panel.c linux-2.6.32.18/drivers/staging/panel/panel.c +--- linux-2.6.32.18/drivers/staging/panel/panel.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/panel/panel.c 2010-08-11 18:57:31.000000000 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -28141,9 +28173,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drivers/staging/phison/phison.c ---- linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/phison/phison.c linux-2.6.32.18/drivers/staging/phison/phison.c +--- linux-2.6.32.18/drivers/staging/phison/phison.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/phison/phison.c 2010-08-11 18:57:31.000000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -28153,9 +28185,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drive .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/staging/poch/poch.c ---- linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/poch/poch.c linux-2.6.32.18/drivers/staging/poch/poch.c +--- linux-2.6.32.18/drivers/staging/poch/poch.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/poch/poch.c 2010-08-11 18:57:31.000000000 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -28165,9 +28197,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/s .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/inode.c linux-2.6.32.18/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.18/drivers/staging/pohmelfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/pohmelfs/inode.c 2010-08-11 18:57:31.000000000 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -28177,9 +28209,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/driv psb->trans_max_pages = 100; -diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c 2010-08-11 18:57:31.000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -28189,9 +28221,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/dri mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h 2010-08-11 18:57:31.000000000 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -28201,9 +28233,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/driv unsigned long mcache_timeout; unsigned int idx; -diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/sep/sep_driver.c linux-2.6.32.18/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.18/drivers/staging/sep/sep_driver.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/sep/sep_driver.c 2010-08-11 18:57:31.000000000 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -28213,9 +28245,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/driv .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -diff -urNp linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c 2010-08-11 18:57:31.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); @@ -28225,9 +28257,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1 .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c ---- linux-2.6.32.16/drivers/uio/uio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/uio/uio.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/uio/uio.c linux-2.6.32.18/drivers/uio/uio.c +--- linux-2.6.32.18/drivers/uio/uio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/uio/uio.c 2010-08-11 18:57:31.000000000 -0400 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -28246,9 +28278,9 @@ diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c .show = portio_type_show, }; -diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/atm/usbatm.c ---- linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/atm/usbatm.c linux-2.6.32.18/drivers/usb/atm/usbatm.c +--- linux-2.6.32.18/drivers/usb/atm/usbatm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/atm/usbatm.c 2010-08-11 18:57:31.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", @@ -28328,9 +28360,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/ if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/usb/class/cdc-acm.c ---- linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/class/cdc-acm.c linux-2.6.32.18/drivers/usb/class/cdc-acm.c +--- linux-2.6.32.18/drivers/usb/class/cdc-acm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/class/cdc-acm.c 2010-08-11 18:57:31.000000000 -0400 @@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -28340,9 +28372,21 @@ diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/u }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb/class/usblp.c ---- linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/class/cdc-wdm.c linux-2.6.32.18/drivers/usb/class/cdc-wdm.c +--- linux-2.6.32.18/drivers/usb/class/cdc-wdm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/class/cdc-wdm.c 2010-08-11 19:02:29.000000000 -0400 +@@ -314,7 +314,7 @@ static ssize_t wdm_write + if (r < 0) + goto outnp; + +- if (!file->f_flags && O_NONBLOCK) ++ if (!file->f_flags & O_NONBLOCK) + r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, + &desc->flags)); + else +diff -urNp linux-2.6.32.18/drivers/usb/class/usblp.c linux-2.6.32.18/drivers/usb/class/usblp.c +--- linux-2.6.32.18/drivers/usb/class/usblp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/class/usblp.c 2010-08-11 18:57:31.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 */ @@ -28361,9 +28405,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/core/hcd.c ---- linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/core/hcd.c linux-2.6.32.18/drivers/usb/core/hcd.c +--- linux-2.6.32.18/drivers/usb/core/hcd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/core/hcd.c 2010-08-11 18:57:31.000000000 -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -28382,9 +28426,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/co { if (mon_ops) -diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/core/hcd.h ---- linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/core/hcd.h linux-2.6.32.18/drivers/usb/core/hcd.h +--- linux-2.6.32.18/drivers/usb/core/hcd.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/core/hcd.h 2010-08-11 18:57:31.000000000 -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -28412,9 +28456,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/co void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/core/hub.c ---- linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/core/hub.c linux-2.6.32.18/drivers/usb/core/hub.c +--- linux-2.6.32.18/drivers/usb/core/hub.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/core/hub.c 2010-08-11 18:57:31.000000000 -0400 @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -28424,9 +28468,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/co }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/usb/core/message.c ---- linux-2.6.32.16/drivers/usb/core/message.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/core/message.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/core/message.c linux-2.6.32.18/drivers/usb/core/message.c +--- linux-2.6.32.18/drivers/usb/core/message.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/core/message.c 2010-08-11 18:57:31.000000000 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -28438,9 +28482,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/us if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/usb/host/ehci-pci.c ---- linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/host/ehci-pci.c linux-2.6.32.18/drivers/usb/host/ehci-pci.c +--- linux-2.6.32.18/drivers/usb/host/ehci-pci.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/host/ehci-pci.c 2010-08-11 18:57:31.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, @@ -28450,9 +28494,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/u }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/usb/host/uhci-hcd.c ---- linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/host/uhci-hcd.c linux-2.6.32.18/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32.18/drivers/usb/host/uhci-hcd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/host/uhci-hcd.c 2010-08-11 18:57:31.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), @@ -28462,9 +28506,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/u }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/misc/appledisplay.c linux-2.6.32.18/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.18/drivers/usb/misc/appledisplay.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/misc/appledisplay.c 2010-08-11 18:57:31.000000000 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -28474,9 +28518,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drive .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/usb/mon/mon_main.c ---- linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/mon/mon_main.c linux-2.6.32.18/drivers/usb/mon/mon_main.c +--- linux-2.6.32.18/drivers/usb/mon/mon_main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/mon/mon_main.c 2010-08-11 18:57:31.000000000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -28486,9 +28530,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/us .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/usb/storage/debug.h ---- linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/storage/debug.h linux-2.6.32.18/drivers/usb/storage/debug.h +--- linux-2.6.32.18/drivers/usb/storage/debug.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/storage/debug.h 2010-08-11 18:57:31.000000000 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -28502,9 +28546,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/u #endif #endif -diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb/storage/usb.c ---- linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/storage/usb.c linux-2.6.32.18/drivers/usb/storage/usb.c +--- linux-2.6.32.18/drivers/usb/storage/usb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/storage/usb.c 2010-08-11 18:57:31.000000000 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -28514,9 +28558,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/usb/storage/usual-tables.c linux-2.6.32.18/drivers/usb/storage/usual-tables.c +--- linux-2.6.32.18/drivers/usb/storage/usual-tables.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/usb/storage/usual-tables.c 2010-08-11 18:57:31.000000000 -0400 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -28526,9 +28570,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/dr }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/drivers/uwb/wlp/messages.c ---- linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/uwb/wlp/messages.c linux-2.6.32.18/drivers/uwb/wlp/messages.c +--- linux-2.6.32.18/drivers/uwb/wlp/messages.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/uwb/wlp/messages.c 2010-08-11 18:57:31.000000000 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -28538,9 +28582,9 @@ diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/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.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/uwb/wlp/sysfs.c linux-2.6.32.18/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.18/drivers/uwb/wlp/sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/uwb/wlp/sysfs.c 2010-08-11 18:57:31.000000000 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -28551,9 +28595,9 @@ diff -urNp linux-2.6.32.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/w .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/atmel_lcdfb.c linux-2.6.32.18/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.18/drivers/video/atmel_lcdfb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/atmel_lcdfb.c 2010-08-11 18:57:31.000000000 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -28563,9 +28607,9 @@ diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/v .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/video/aty/aty128fb.c ---- linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/aty/aty128fb.c linux-2.6.32.18/drivers/video/aty/aty128fb.c +--- linux-2.6.32.18/drivers/video/aty/aty128fb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/aty/aty128fb.c 2010-08-11 18:57:31.000000000 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -28575,9 +28619,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/ .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/aty/atyfb_base.c linux-2.6.32.18/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.18/drivers/video/aty/atyfb_base.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/aty/atyfb_base.c 2010-08-11 18:57:31.000000000 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -28587,9 +28631,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/driver .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/aty/radeon_backlight.c linux-2.6.32.18/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.18/drivers/video/aty/radeon_backlight.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/aty/radeon_backlight.c 2010-08-11 18:57:31.000000000 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -28599,9 +28643,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/ .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -28611,9 +28655,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/ .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/adx_bl.c linux-2.6.32.18/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.18/drivers/video/backlight/adx_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/adx_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -28623,9 +28667,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/driv .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -diff -urNp linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -28635,9 +28679,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/drivers/video/backlight/backlight.c ---- linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/backlight.c linux-2.6.32.18/drivers/video/backlight/backlight.c +--- linux-2.6.32.18/drivers/video/backlight/backlight.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/backlight.c 2010-08-11 18:57:31.000000000 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -28647,9 +28691,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c 2010-08-11 18:57:31.000000000 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -28659,9 +28703,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/d .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c 2010-08-11 18:57:31.000000000 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -28671,9 +28715,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/dr .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/da903x_bl.c linux-2.6.32.18/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.18/drivers/video/backlight/da903x_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/da903x_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -28683,9 +28727,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/d .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/generic_bl.c linux-2.6.32.18/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.18/drivers/video/backlight/generic_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/generic_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -28695,9 +28739,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/ .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/hp680_bl.c linux-2.6.32.18/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.18/drivers/video/backlight/hp680_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/hp680_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -28707,9 +28751,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/dr .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -28719,9 +28763,9 @@ diff -urNp linux-2.6.32.16/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.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -28731,9 +28775,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/d .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/locomolcd.c linux-2.6.32.18/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.18/drivers/video/backlight/locomolcd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/locomolcd.c 2010-08-11 18:57:31.000000000 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -28743,9 +28787,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/d .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -28755,9 +28799,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. }; /* Module parameters. */ -diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/omap1_bl.c linux-2.6.32.18/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.18/drivers/video/backlight/omap1_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/omap1_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -28767,9 +28811,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/dr .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/progear_bl.c linux-2.6.32.18/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.18/drivers/video/backlight/progear_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/progear_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -28779,9 +28823,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/ .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/pwm_bl.c linux-2.6.32.18/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.18/drivers/video/backlight/pwm_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/pwm_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -28791,9 +28835,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/driv .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/tosa_bl.c linux-2.6.32.18/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.18/drivers/video/backlight/tosa_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/tosa_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -28803,9 +28847,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/dri .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c 2010-08-11 18:57:31.000000000 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -28815,9 +28859,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/d .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/bf54x-lq043fb.c linux-2.6.32.18/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.18/drivers/video/bf54x-lq043fb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/bf54x-lq043fb.c 2010-08-11 18:57:31.000000000 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28827,9 +28871,9 @@ diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c 2010-08-11 18:57:31.000000000 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28839,9 +28883,9 @@ diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/driv .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/fbcmap.c ---- linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/fbcmap.c linux-2.6.32.18/drivers/video/fbcmap.c +--- linux-2.6.32.18/drivers/video/fbcmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/fbcmap.c 2010-08-11 18:57:31.000000000 -0400 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -28852,9 +28896,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/ rc = -EINVAL; goto out1; } -diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/fbmem.c ---- linux-2.6.32.16/drivers/video/fbmem.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/fbmem.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/fbmem.c linux-2.6.32.18/drivers/video/fbmem.c +--- linux-2.6.32.18/drivers/video/fbmem.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/fbmem.c 2010-08-11 18:57:31.000000000 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -28882,9 +28926,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/fbmon.c ---- linux-2.6.32.16/drivers/video/fbmon.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/fbmon.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/fbmon.c linux-2.6.32.18/drivers/video/fbmon.c +--- linux-2.6.32.18/drivers/video/fbmon.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/fbmon.c 2010-08-11 18:57:31.000000000 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -28894,9 +28938,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/f #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drivers/video/i810/i810_accel.c ---- linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/i810/i810_accel.c linux-2.6.32.18/drivers/video/i810/i810_accel.c +--- linux-2.6.32.18/drivers/video/i810/i810_accel.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/i810/i810_accel.c 2010-08-11 18:57:31.000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -28905,9 +28949,9 @@ diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drive i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/drivers/video/i810/i810_main.c ---- linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/i810/i810_main.c linux-2.6.32.18/drivers/video/i810/i810_main.c +--- linux-2.6.32.18/drivers/video/i810/i810_main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/i810/i810_main.c 2010-08-11 18:57:31.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, @@ -28917,9 +28961,9 @@ diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/driver }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/modedb.c ---- linux-2.6.32.16/drivers/video/modedb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/modedb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/modedb.c linux-2.6.32.18/drivers/video/modedb.c +--- linux-2.6.32.18/drivers/video/modedb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/modedb.c 2010-08-11 18:57:31.000000000 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -29220,9 +29264,9 @@ diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/ }, }; -diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c 2010-08-11 18:57:31.000000000 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -29232,9 +29276,9 @@ diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/d .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/video/riva/fbdev.c ---- linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/riva/fbdev.c linux-2.6.32.18/drivers/video/riva/fbdev.c +--- linux-2.6.32.18/drivers/video/riva/fbdev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/riva/fbdev.c 2010-08-11 18:57:31.000000000 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -29244,9 +29288,9 @@ diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/vi .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video/uvesafb.c ---- linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/uvesafb.c linux-2.6.32.18/drivers/video/uvesafb.c +--- linux-2.6.32.18/drivers/video/uvesafb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/uvesafb.c 2010-08-11 18:57:31.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -29322,9 +29366,9 @@ diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video } framebuffer_release(info); -diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/vesafb.c ---- linux-2.6.32.16/drivers/video/vesafb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/video/vesafb.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/video/vesafb.c linux-2.6.32.18/drivers/video/vesafb.c +--- linux-2.6.32.18/drivers/video/vesafb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/video/vesafb.c 2010-08-11 18:57:31.000000000 -0400 @@ -9,6 +9,7 @@ */ @@ -29428,9 +29472,9 @@ diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/drivers/xen/sys-hypervisor.c linux-2.6.32.18/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.18/drivers/xen/sys-hypervisor.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/drivers/xen/sys-hypervisor.c 2010-08-11 18:57:31.000000000 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -29440,9 +29484,9 @@ diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/ .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/fs/9p/vfs_inode.c ---- linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/9p/vfs_inode.c linux-2.6.32.18/fs/9p/vfs_inode.c +--- linux-2.6.32.18/fs/9p/vfs_inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/9p/vfs_inode.c 2010-08-11 18:57:31.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) @@ -29452,9 +29496,9 @@ diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/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.16/fs/aio.c linux-2.6.32.16/fs/aio.c ---- linux-2.6.32.16/fs/aio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/aio.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/aio.c linux-2.6.32.18/fs/aio.c +--- linux-2.6.32.18/fs/aio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/aio.c 2010-08-11 18:57:31.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; @@ -29464,9 +29508,9 @@ diff -urNp linux-2.6.32.16/fs/aio.c linux-2.6.32.16/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.16/fs/attr.c linux-2.6.32.16/fs/attr.c ---- linux-2.6.32.16/fs/attr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/attr.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/attr.c linux-2.6.32.18/fs/attr.c +--- linux-2.6.32.18/fs/attr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/attr.c 2010-08-11 18:57:31.000000000 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -29475,9 +29519,9 @@ diff -urNp linux-2.6.32.16/fs/attr.c linux-2.6.32.16/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.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c ---- linux-2.6.32.16/fs/autofs/root.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/autofs/root.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/autofs/root.c linux-2.6.32.18/fs/autofs/root.c +--- linux-2.6.32.18/fs/autofs/root.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/autofs/root.c 2010-08-11 18:57:31.000000000 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -29488,9 +29532,9 @@ diff -urNp linux-2.6.32.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symlink.c ---- linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/autofs4/symlink.c linux-2.6.32.18/fs/autofs4/symlink.c +--- linux-2.6.32.18/fs/autofs4/symlink.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/autofs4/symlink.c 2010-08-11 18:57:31.000000000 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -29500,9 +29544,9 @@ diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symli return NULL; } -diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c ---- linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/befs/linuxvfs.c linux-2.6.32.18/fs/befs/linuxvfs.c +--- linux-2.6.32.18/fs/befs/linuxvfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/befs/linuxvfs.c 2010-08-11 18:57:31.000000000 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -29512,9 +29556,9 @@ diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c ---- linux-2.6.32.16/fs/binfmt_aout.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/binfmt_aout.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/binfmt_aout.c linux-2.6.32.18/fs/binfmt_aout.c +--- linux-2.6.32.18/fs/binfmt_aout.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/binfmt_aout.c 2010-08-11 18:57:31.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -29582,9 +29626,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c ---- linux-2.6.32.16/fs/binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/binfmt_elf.c linux-2.6.32.18/fs/binfmt_elf.c +--- linux-2.6.32.18/fs/binfmt_elf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/binfmt_elf.c 2010-08-11 19:32:49.000000000 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -30148,13 +30192,13 @@ diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ); + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ; + -+#ifdef CONFIG_PAX_NOELFRELOCS -+ is_textrel_rw = false; -+ is_textrel_rx = false; -+#else ++#ifdef CONFIG_PAX_ELFRELOCS + /* possible TEXTREL */ + is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ); + is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ); ++#else ++ is_textrel_rw = false; ++ is_textrel_rx = false; +#endif + + /* possible RELRO */ @@ -30220,9 +30264,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c ---- linux-2.6.32.16/fs/binfmt_flat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/binfmt_flat.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/binfmt_flat.c linux-2.6.32.18/fs/binfmt_flat.c +--- linux-2.6.32.18/fs/binfmt_flat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/binfmt_flat.c 2010-08-11 18:57:31.000000000 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -30255,9 +30299,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c ---- linux-2.6.32.16/fs/binfmt_misc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/binfmt_misc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/binfmt_misc.c linux-2.6.32.18/fs/binfmt_misc.c +--- linux-2.6.32.18/fs/binfmt_misc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/binfmt_misc.c 2010-08-11 18:57:31.000000000 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -30267,9 +30311,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c ---- linux-2.6.32.16/fs/bio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/bio.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/bio.c linux-2.6.32.18/fs/bio.c +--- linux-2.6.32.18/fs/bio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/bio.c 2010-08-11 18:57:31.000000000 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -30288,9 +30332,9 @@ diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c ---- linux-2.6.32.16/fs/block_dev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/block_dev.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/block_dev.c linux-2.6.32.18/fs/block_dev.c +--- linux-2.6.32.18/fs/block_dev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/block_dev.c 2010-08-11 18:57:31.000000000 -0400 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, else if (bdev->bd_contains == bdev) res = 0; /* is a whole device which isn't held */ @@ -30300,9 +30344,9 @@ diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c res = 0; /* is a partition of a device that is being partitioned */ else if (bdev->bd_contains->bd_holder != NULL) res = -EBUSY; /* is a partition of a held device */ -diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c ---- linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/ctree.c linux-2.6.32.18/fs/btrfs/ctree.c +--- linux-2.6.32.18/fs/btrfs/ctree.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/ctree.c 2010-08-11 18:57:31.000000000 -0400 @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; @@ -30311,9 +30355,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c ---- linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/disk-io.c linux-2.6.32.18/fs/btrfs/disk-io.c +--- linux-2.6.32.18/fs/btrfs/disk-io.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/disk-io.c 2010-08-11 18:57:31.000000000 -0400 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -30332,9 +30376,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_io.h ---- linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/extent_io.h linux-2.6.32.18/fs/btrfs/extent_io.h +--- linux-2.6.32.18/fs/btrfs/extent_io.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/extent_io.h 2010-08-11 18:57:31.000000000 -0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -30395,9 +30439,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_ }; struct extent_state { -diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/free-space-cache.c ---- linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/free-space-cache.c linux-2.6.32.18/fs/btrfs/free-space-cache.c +--- linux-2.6.32.18/fs/btrfs/free-space-cache.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/free-space-cache.c 2010-08-11 18:57:31.000000000 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -30416,9 +30460,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/ if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c ---- linux-2.6.32.16/fs/btrfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/inode.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/inode.c linux-2.6.32.18/fs/btrfs/inode.c +--- linux-2.6.32.18/fs/btrfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/inode.c 2010-08-11 18:57:31.000000000 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -30437,9 +30481,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, -diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c ---- linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/btrfs/sysfs.c linux-2.6.32.18/fs/btrfs/sysfs.c +--- linux-2.6.32.18/fs/btrfs/sysfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/btrfs/sysfs.c 2010-08-11 18:57:31.000000000 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -30455,9 +30499,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c ---- linux-2.6.32.16/fs/buffer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/buffer.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/buffer.c linux-2.6.32.18/fs/buffer.c +--- linux-2.6.32.18/fs/buffer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/buffer.c 2010-08-11 18:57:31.000000000 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -30466,9 +30510,9 @@ diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bind.c ---- linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/cachefiles/bind.c linux-2.6.32.18/fs/cachefiles/bind.c +--- linux-2.6.32.18/fs/cachefiles/bind.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/cachefiles/bind.c 2010-08-11 18:57:31.000000000 -0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -30485,9 +30529,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bi cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/daemon.c ---- linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/cachefiles/daemon.c linux-2.6.32.18/fs/cachefiles/daemon.c +--- linux-2.6.32.18/fs/cachefiles/daemon.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/cachefiles/daemon.c 2010-08-11 18:57:31.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -30515,9 +30559,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/ return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rdwr.c ---- linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/cachefiles/rdwr.c linux-2.6.32.18/fs/cachefiles/rdwr.c +--- linux-2.6.32.18/fs/cachefiles/rdwr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/cachefiles/rdwr.c 2010-08-11 18:57:31.000000000 -0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -30527,9 +30571,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rd set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_uniupr.h ---- linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/cifs/cifs_uniupr.h linux-2.6.32.18/fs/cifs/cifs_uniupr.h +--- linux-2.6.32.18/fs/cifs/cifs_uniupr.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/cifs/cifs_uniupr.h 2010-08-11 18:57:31.000000000 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -30539,9 +30583,9 @@ diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_un }; #endif -diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c ---- linux-2.6.32.16/fs/cifs/link.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/cifs/link.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/cifs/link.c linux-2.6.32.18/fs/cifs/link.c +--- linux-2.6.32.18/fs/cifs/link.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/cifs/link.c 2010-08-11 18:57:31.000000000 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -30551,9 +30595,9 @@ diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binfmt_elf.c ---- linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/compat_binfmt_elf.c linux-2.6.32.18/fs/compat_binfmt_elf.c +--- linux-2.6.32.18/fs/compat_binfmt_elf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/compat_binfmt_elf.c 2010-08-11 18:57:31.000000000 -0400 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -30567,9 +30611,9 @@ diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binf #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c ---- linux-2.6.32.16/fs/compat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/compat.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/compat.c linux-2.6.32.18/fs/compat.c +--- linux-2.6.32.18/fs/compat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/compat.c 2010-08-11 18:57:31.000000000 -0400 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -30669,9 +30713,9 @@ diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c ---- linux-2.6.32.16/fs/compat_ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/compat_ioctl.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/compat_ioctl.c linux-2.6.32.18/fs/compat_ioctl.c +--- linux-2.6.32.18/fs/compat_ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/compat_ioctl.c 2010-08-11 18:57:31.000000000 -0400 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -30691,9 +30735,9 @@ diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c ---- linux-2.6.32.16/fs/debugfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/debugfs/inode.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/debugfs/inode.c linux-2.6.32.18/fs/debugfs/inode.c +--- linux-2.6.32.18/fs/debugfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/debugfs/inode.c 2010-08-11 18:57:31.000000000 -0400 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -30703,9 +30747,9 @@ diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c ---- linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/dlm/lockspace.c linux-2.6.32.18/fs/dlm/lockspace.c +--- linux-2.6.32.18/fs/dlm/lockspace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/dlm/lockspace.c 2010-08-11 18:57:31.000000000 -0400 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -30715,9 +30759,9 @@ diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode.c ---- linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ecryptfs/inode.c linux-2.6.32.18/fs/ecryptfs/inode.c +--- linux-2.6.32.18/fs/ecryptfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ecryptfs/inode.c 2010-08-11 18:57:31.000000000 -0400 @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -30736,9 +30780,9 @@ diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c ---- linux-2.6.32.16/fs/exec.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/exec.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/exec.c linux-2.6.32.18/fs/exec.c +--- linux-2.6.32.18/fs/exec.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/exec.c 2010-08-11 18:57:31.000000000 -0400 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -31217,9 +31261,9 @@ diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c ---- linux-2.6.32.16/fs/ext2/balloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext2/balloc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext2/balloc.c linux-2.6.32.18/fs/ext2/balloc.c +--- linux-2.6.32.18/fs/ext2/balloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext2/balloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -31229,9 +31273,9 @@ diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c ---- linux-2.6.32.16/fs/ext2/xattr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext2/xattr.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext2/xattr.c linux-2.6.32.18/fs/ext2/xattr.c +--- linux-2.6.32.18/fs/ext2/xattr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext2/xattr.c 2010-08-11 18:57:32.000000000 -0400 @@ -85,8 +85,8 @@ printk("\n"); \ } while (0) @@ -31243,9 +31287,9 @@ diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c #endif static int ext2_xattr_set2(struct inode *, struct buffer_head *, -diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c ---- linux-2.6.32.16/fs/ext3/balloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext3/balloc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext3/balloc.c linux-2.6.32.18/fs/ext3/balloc.c +--- linux-2.6.32.18/fs/ext3/balloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext3/balloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -31255,9 +31299,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c ---- linux-2.6.32.16/fs/ext3/namei.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext3/namei.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext3/namei.c linux-2.6.32.18/fs/ext3/namei.c +--- linux-2.6.32.18/fs/ext3/namei.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext3/namei.c 2010-08-11 18:57:32.000000000 -0400 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -31267,9 +31311,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c ---- linux-2.6.32.16/fs/ext3/xattr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext3/xattr.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext3/xattr.c linux-2.6.32.18/fs/ext3/xattr.c +--- linux-2.6.32.18/fs/ext3/xattr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext3/xattr.c 2010-08-11 18:57:32.000000000 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -31281,9 +31325,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c ---- linux-2.6.32.16/fs/ext4/balloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext4/balloc.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext4/balloc.c linux-2.6.32.18/fs/ext4/balloc.c +--- linux-2.6.32.18/fs/ext4/balloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext4/balloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -31293,10 +31337,10 @@ diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c ---- linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-09 14:50:37.000000000 -0400 -@@ -221,6 +221,9 @@ setversion_out: +diff -urNp linux-2.6.32.18/fs/ext4/ioctl.c linux-2.6.32.18/fs/ext4/ioctl.c +--- linux-2.6.32.18/fs/ext4/ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext4/ioctl.c 2010-08-11 18:57:32.000000000 -0400 +@@ -230,6 +230,9 @@ setversion_out: struct file *donor_filp; int err; @@ -31306,9 +31350,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c if (!(filp->f_mode & FMODE_READ) || !(filp->f_mode & FMODE_WRITE)) return -EBADF; -diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c ---- linux-2.6.32.16/fs/ext4/namei.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext4/namei.c 2010-07-09 14:50:37.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext4/namei.c linux-2.6.32.18/fs/ext4/namei.c +--- linux-2.6.32.18/fs/ext4/namei.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext4/namei.c 2010-08-11 18:57:32.000000000 -0400 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -31318,10 +31362,10 @@ diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c ---- linux-2.6.32.16/fs/ext4/super.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext4/super.c 2010-07-09 14:50:38.000000000 -0400 -@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje +diff -urNp linux-2.6.32.18/fs/ext4/super.c linux-2.6.32.18/fs/ext4/super.c +--- linux-2.6.32.18/fs/ext4/super.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext4/super.c 2010-08-11 18:57:32.000000000 -0400 +@@ -2280,7 +2280,7 @@ static void ext4_sb_release(struct kobje } @@ -31330,9 +31374,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c ---- linux-2.6.32.16/fs/ext4/xattr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ext4/xattr.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ext4/xattr.c linux-2.6.32.18/fs/ext4/xattr.c +--- linux-2.6.32.18/fs/ext4/xattr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ext4/xattr.c 2010-08-11 18:57:32.000000000 -0400 @@ -82,8 +82,8 @@ printk("\n"); \ } while (0) @@ -31344,9 +31388,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c #endif static void ext4_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c ---- linux-2.6.32.16/fs/fcntl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fcntl.c 2010-07-10 08:04:59.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fcntl.c linux-2.6.32.18/fs/fcntl.c +--- linux-2.6.32.18/fs/fcntl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fcntl.c 2010-08-11 18:57:32.000000000 -0400 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -31367,9 +31411,9 @@ diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c ---- linux-2.6.32.16/fs/fifo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fifo.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fifo.c linux-2.6.32.18/fs/fifo.c +--- linux-2.6.32.18/fs/fifo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fifo.c 2010-08-11 18:57:32.000000000 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -31440,9 +31484,9 @@ diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c ---- linux-2.6.32.16/fs/file.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/file.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/file.c linux-2.6.32.18/fs/file.c +--- linux-2.6.32.18/fs/file.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/file.c 2010-08-11 18:57:32.000000000 -0400 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -31460,9 +31504,9 @@ diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c ---- linux-2.6.32.16/fs/fs_struct.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fs_struct.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fs_struct.c linux-2.6.32.18/fs/fs_struct.c +--- linux-2.6.32.18/fs/fs_struct.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fs_struct.c 2010-08-11 18:57:32.000000000 -0400 @@ -4,6 +4,7 @@ #include <linux/path.h> #include <linux/slab.h> @@ -31542,9 +31586,9 @@ diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c ---- linux-2.6.32.16/fs/fuse/control.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fuse/control.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fuse/control.c linux-2.6.32.18/fs/fuse/control.c +--- linux-2.6.32.18/fs/fuse/control.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fuse/control.c 2010-08-11 18:57:32.000000000 -0400 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -31554,9 +31598,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c ---- linux-2.6.32.16/fs/fuse/cuse.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fuse/cuse.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fuse/cuse.c linux-2.6.32.18/fs/fuse/cuse.c +--- linux-2.6.32.18/fs/fuse/cuse.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fuse/cuse.c 2010-08-11 18:57:32.000000000 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -31591,9 +31635,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c ---- linux-2.6.32.16/fs/fuse/dev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fuse/dev.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fuse/dev.c linux-2.6.32.18/fs/fuse/dev.c +--- linux-2.6.32.18/fs/fuse/dev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fuse/dev.c 2010-08-11 18:57:32.000000000 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -31699,9 +31743,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, -diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c ---- linux-2.6.32.16/fs/fuse/dir.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fuse/dir.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fuse/dir.c linux-2.6.32.18/fs/fuse/dir.c +--- linux-2.6.32.18/fs/fuse/dir.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fuse/dir.c 2010-08-11 18:57:32.000000000 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -31711,9 +31755,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h ---- linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/fuse/fuse_i.h linux-2.6.32.18/fs/fuse/fuse_i.h +--- linux-2.6.32.18/fs/fuse/fuse_i.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/fuse/fuse_i.h 2010-08-11 18:57:32.000000000 -0400 @@ -521,6 +521,16 @@ extern const struct file_operations fuse extern const struct dentry_operations fuse_dentry_operations; @@ -31731,9 +31775,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c ---- linux-2.6.32.16/fs/gfs2/sys.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/gfs2/sys.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/gfs2/sys.c linux-2.6.32.18/fs/gfs2/sys.c +--- linux-2.6.32.18/fs/gfs2/sys.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/gfs2/sys.c 2010-08-11 18:57:32.000000000 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -31752,9 +31796,9 @@ diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c ---- linux-2.6.32.16/fs/hfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/hfs/inode.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/hfs/inode.c linux-2.6.32.18/fs/hfs/inode.c +--- linux-2.6.32.18/fs/hfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/hfs/inode.c 2010-08-11 18:57:32.000000000 -0400 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -31773,9 +31817,9 @@ diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c ---- linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/hfsplus/inode.c linux-2.6.32.18/fs/hfsplus/inode.c +--- linux-2.6.32.18/fs/hfsplus/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/hfsplus/inode.c 2010-08-11 18:57:32.000000000 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -31812,9 +31856,9 @@ diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/inode.c ---- linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/hugetlbfs/inode.c linux-2.6.32.18/fs/hugetlbfs/inode.c +--- linux-2.6.32.18/fs/hugetlbfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/hugetlbfs/inode.c 2010-08-11 18:57:32.000000000 -0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -31824,9 +31868,9 @@ diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/ino static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c ---- linux-2.6.32.16/fs/ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ioctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ioctl.c linux-2.6.32.18/fs/ioctl.c +--- linux-2.6.32.18/fs/ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ioctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -31854,9 +31898,9 @@ diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h ---- linux-2.6.32.16/fs/jffs2/debug.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/jffs2/debug.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/jffs2/debug.h linux-2.6.32.18/fs/jffs2/debug.h +--- linux-2.6.32.18/fs/jffs2/debug.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/jffs2/debug.h 2010-08-11 18:57:32.000000000 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -31958,9 +32002,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c ---- linux-2.6.32.16/fs/jffs2/erase.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/jffs2/erase.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/jffs2/erase.c linux-2.6.32.18/fs/jffs2/erase.c +--- linux-2.6.32.18/fs/jffs2/erase.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/jffs2/erase.c 2010-08-11 18:57:32.000000000 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -31971,9 +32015,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h ---- linux-2.6.32.16/fs/jffs2/summary.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/jffs2/summary.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/jffs2/summary.h linux-2.6.32.18/fs/jffs2/summary.h +--- linux-2.6.32.18/fs/jffs2/summary.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/jffs2/summary.h 2010-08-11 18:57:32.000000000 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -32002,9 +32046,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c ---- linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/jffs2/wbuf.c linux-2.6.32.18/fs/jffs2/wbuf.c +--- linux-2.6.32.18/fs/jffs2/wbuf.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/jffs2/wbuf.c 2010-08-11 18:57:32.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -32015,9 +32059,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c ---- linux-2.6.32.16/fs/lockd/svc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/lockd/svc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/lockd/svc.c linux-2.6.32.18/fs/lockd/svc.c +--- linux-2.6.32.18/fs/lockd/svc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/lockd/svc.c 2010-08-11 18:57:32.000000000 -0400 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -32027,9 +32071,9 @@ diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c ---- linux-2.6.32.16/fs/locks.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/locks.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/locks.c linux-2.6.32.18/fs/locks.c +--- linux-2.6.32.18/fs/locks.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/locks.c 2010-08-11 18:57:32.000000000 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -32051,9 +32095,9 @@ diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c ---- linux-2.6.32.16/fs/namei.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/namei.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/namei.c linux-2.6.32.18/fs/namei.c +--- linux-2.6.32.18/fs/namei.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/namei.c 2010-08-11 18:57:32.000000000 -0400 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -32380,9 +32424,9 @@ diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c ---- linux-2.6.32.16/fs/namespace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/namespace.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/namespace.c linux-2.6.32.18/fs/namespace.c +--- linux-2.6.32.18/fs/namespace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/namespace.c 2010-08-11 18:57:32.000000000 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -32443,9 +32487,9 @@ diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c ---- linux-2.6.32.16/fs/nfs/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/nfs/inode.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/nfs/inode.c linux-2.6.32.18/fs/nfs/inode.c +--- linux-2.6.32.18/fs/nfs/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/nfs/inode.c 2010-08-11 18:57:32.000000000 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -32466,9 +32510,9 @@ diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c ---- linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/nfs/nfs4proc.c linux-2.6.32.18/fs/nfs/nfs4proc.c +--- linux-2.6.32.18/fs/nfs/nfs4proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/nfs/nfs4proc.c 2010-08-11 18:57:32.000000000 -0400 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -32739,9 +32783,9 @@ diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c ---- linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/nfsd/lockd.c linux-2.6.32.18/fs/nfsd/lockd.c +--- linux-2.6.32.18/fs/nfsd/lockd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/nfsd/lockd.c 2010-08-11 18:57:32.000000000 -0400 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -32751,9 +32795,9 @@ diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c ---- linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/nfsd/vfs.c linux-2.6.32.18/fs/nfsd/vfs.c +--- linux-2.6.32.18/fs/nfsd/vfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/nfsd/vfs.c 2010-08-11 18:57:32.000000000 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -32781,9 +32825,9 @@ diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c ---- linux-2.6.32.16/fs/nls/nls_base.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/nls/nls_base.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/nls/nls_base.c linux-2.6.32.18/fs/nls/nls_base.c +--- linux-2.6.32.18/fs/nls/nls_base.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/nls/nls_base.c 2010-08-11 18:57:32.000000000 -0400 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -32793,9 +32837,9 @@ diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c ---- linux-2.6.32.16/fs/ntfs/file.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ntfs/file.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ntfs/file.c linux-2.6.32.18/fs/ntfs/file.c +--- linux-2.6.32.18/fs/ntfs/file.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ntfs/file.c 2010-08-11 18:57:32.000000000 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -32805,9 +32849,9 @@ diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ocfs2/cluster/masklog.c linux-2.6.32.18/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.18/fs/ocfs2/cluster/masklog.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ocfs2/cluster/masklog.c 2010-08-11 18:57:32.000000000 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -32817,9 +32861,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/c .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/localalloc.c ---- linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ocfs2/localalloc.c linux-2.6.32.18/fs/ocfs2/localalloc.c +--- linux-2.6.32.18/fs/ocfs2/localalloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ocfs2/localalloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -32829,9 +32873,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/locala status = 0; bail: -diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h ---- linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ocfs2/ocfs2.h linux-2.6.32.18/fs/ocfs2/ocfs2.h +--- linux-2.6.32.18/fs/ocfs2/ocfs2.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ocfs2/ocfs2.h 2010-08-11 18:57:32.000000000 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -32849,9 +32893,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc.c ---- linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ocfs2/suballoc.c linux-2.6.32.18/fs/ocfs2/suballoc.c +--- linux-2.6.32.18/fs/ocfs2/suballoc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ocfs2/suballoc.c 2010-08-11 18:57:32.000000000 -0400 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -32897,9 +32941,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc } } if (status < 0) { -diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c ---- linux-2.6.32.16/fs/ocfs2/super.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/ocfs2/super.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/ocfs2/super.c linux-2.6.32.18/fs/ocfs2/super.c +--- linux-2.6.32.18/fs/ocfs2/super.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/ocfs2/super.c 2010-08-11 18:57:32.000000000 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -32934,9 +32978,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c ---- linux-2.6.32.16/fs/open.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/open.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/open.c linux-2.6.32.18/fs/open.c +--- linux-2.6.32.18/fs/open.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/open.c 2010-08-11 18:57:32.000000000 -0400 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -33110,9 +33154,9 @@ diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c ---- linux-2.6.32.16/fs/pipe.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/pipe.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/pipe.c linux-2.6.32.18/fs/pipe.c +--- linux-2.6.32.18/fs/pipe.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/pipe.c 2010-08-11 18:57:32.000000000 -0400 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -33236,9 +33280,9 @@ diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c ---- linux-2.6.32.16/fs/proc/array.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/array.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/array.c linux-2.6.32.18/fs/proc/array.c +--- linux-2.6.32.18/fs/proc/array.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/array.c 2010-08-11 18:57:32.000000000 -0400 @@ -321,6 +321,21 @@ static inline void task_context_switch_c p->nivcsw); } @@ -33329,9 +33373,9 @@ diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c ---- linux-2.6.32.16/fs/proc/base.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/base.c 2010-07-10 14:56:09.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/base.c linux-2.6.32.18/fs/proc/base.c +--- linux-2.6.32.18/fs/proc/base.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/base.c 2010-08-11 18:57:32.000000000 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -33687,9 +33731,9 @@ diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c ---- linux-2.6.32.16/fs/proc/cmdline.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/cmdline.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/cmdline.c linux-2.6.32.18/fs/proc/cmdline.c +--- linux-2.6.32.18/fs/proc/cmdline.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/cmdline.c 2010-08-11 18:57:32.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -33702,9 +33746,9 @@ diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c ---- linux-2.6.32.16/fs/proc/devices.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/devices.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/devices.c linux-2.6.32.18/fs/proc/devices.c +--- linux-2.6.32.18/fs/proc/devices.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/devices.c 2010-08-11 18:57:32.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -33717,9 +33761,9 @@ diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c ---- linux-2.6.32.16/fs/proc/inode.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/inode.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/inode.c linux-2.6.32.18/fs/proc/inode.c +--- linux-2.6.32.18/fs/proc/inode.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/inode.c 2010-08-11 18:57:32.000000000 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -33732,9 +33776,9 @@ diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h ---- linux-2.6.32.16/fs/proc/internal.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/internal.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/internal.h linux-2.6.32.18/fs/proc/internal.h +--- linux-2.6.32.18/fs/proc/internal.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/internal.h 2010-08-11 18:57:32.000000000 -0400 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -33745,9 +33789,9 @@ diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig ---- linux-2.6.32.16/fs/proc/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/Kconfig 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/Kconfig linux-2.6.32.18/fs/proc/Kconfig +--- linux-2.6.32.18/fs/proc/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/Kconfig 2010-08-11 18:57:32.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -33775,9 +33819,9 @@ diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c ---- linux-2.6.32.16/fs/proc/kcore.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/kcore.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/kcore.c linux-2.6.32.18/fs/proc/kcore.c +--- linux-2.6.32.18/fs/proc/kcore.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/kcore.c 2010-08-11 18:57:32.000000000 -0400 @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use static int open_kcore(struct inode *inode, struct file *filp) @@ -33788,9 +33832,9 @@ diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c ---- linux-2.6.32.16/fs/proc/meminfo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/meminfo.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/meminfo.c linux-2.6.32.18/fs/proc/meminfo.c +--- linux-2.6.32.18/fs/proc/meminfo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/meminfo.c 2010-08-11 18:57:32.000000000 -0400 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -33800,9 +33844,9 @@ diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c #endif ); -diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c ---- linux-2.6.32.16/fs/proc/nommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/nommu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/nommu.c linux-2.6.32.18/fs/proc/nommu.c +--- linux-2.6.32.18/fs/proc/nommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/nommu.c 2010-08-11 18:57:32.000000000 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -33812,9 +33856,9 @@ diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c ---- linux-2.6.32.16/fs/proc/proc_net.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/proc_net.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/proc_net.c linux-2.6.32.18/fs/proc/proc_net.c +--- linux-2.6.32.18/fs/proc/proc_net.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/proc_net.c 2010-08-11 18:57:32.000000000 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -33833,9 +33877,9 @@ diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sysctl.c ---- linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/proc_sysctl.c linux-2.6.32.18/fs/proc/proc_sysctl.c +--- linux-2.6.32.18/fs/proc/proc_sysctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/proc_sysctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -33875,9 +33919,9 @@ diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sy generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c ---- linux-2.6.32.16/fs/proc/root.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/root.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/root.c linux-2.6.32.18/fs/proc/root.c +--- linux-2.6.32.18/fs/proc/root.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/root.c 2010-08-11 18:57:32.000000000 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -33894,9 +33938,9 @@ diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c ---- linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/task_mmu.c linux-2.6.32.18/fs/proc/task_mmu.c +--- linux-2.6.32.18/fs/proc/task_mmu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/task_mmu.c 2010-08-11 18:57:32.000000000 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -34017,9 +34061,9 @@ diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nommu.c ---- linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/proc/task_nommu.c linux-2.6.32.18/fs/proc/task_nommu.c +--- linux-2.6.32.18/fs/proc/task_nommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/proc/task_nommu.c 2010-08-11 18:57:32.000000000 -0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -34038,9 +34082,9 @@ diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nom } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c ---- linux-2.6.32.16/fs/readdir.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/readdir.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/readdir.c linux-2.6.32.18/fs/readdir.c +--- linux-2.6.32.18/fs/readdir.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/readdir.c 2010-08-11 18:57:32.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -34130,9 +34174,9 @@ diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do_balan.c ---- linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/reiserfs/do_balan.c linux-2.6.32.18/fs/reiserfs/do_balan.c +--- linux-2.6.32.18/fs/reiserfs/do_balan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/reiserfs/do_balan.c 2010-08-11 18:57:32.000000000 -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -34142,9 +34186,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/item_ops.c ---- linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/reiserfs/item_ops.c linux-2.6.32.18/fs/reiserfs/item_ops.c +--- linux-2.6.32.18/fs/reiserfs/item_ops.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/reiserfs/item_ops.c 2010-08-11 18:57:32.000000000 -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -34199,9 +34243,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/procfs.c ---- linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/reiserfs/procfs.c linux-2.6.32.18/fs/reiserfs/procfs.c +--- linux-2.6.32.18/fs/reiserfs/procfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/reiserfs/procfs.c 2010-08-11 18:57:32.000000000 -0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -34211,9 +34255,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/proc SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c ---- linux-2.6.32.16/fs/select.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/select.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/select.c linux-2.6.32.18/fs/select.c +--- linux-2.6.32.18/fs/select.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/select.c 2010-08-11 18:57:32.000000000 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -34230,9 +34274,9 @@ diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c ---- linux-2.6.32.16/fs/seq_file.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/seq_file.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/seq_file.c linux-2.6.32.18/fs/seq_file.c +--- linux-2.6.32.18/fs/seq_file.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/seq_file.c 2010-08-11 18:57:32.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -34273,9 +34317,9 @@ diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c ---- linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/smbfs/symlink.c linux-2.6.32.18/fs/smbfs/symlink.c +--- linux-2.6.32.18/fs/smbfs/symlink.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/smbfs/symlink.c 2010-08-11 18:57:32.000000000 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -34285,9 +34329,9 @@ diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c ---- linux-2.6.32.16/fs/splice.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/splice.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/splice.c linux-2.6.32.18/fs/splice.c +--- linux-2.6.32.18/fs/splice.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/splice.c 2010-08-11 18:57:32.000000000 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -34426,9 +34470,9 @@ diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c ---- linux-2.6.32.16/fs/sysfs/file.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/sysfs/file.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/sysfs/file.c linux-2.6.32.18/fs/sysfs/file.c +--- linux-2.6.32.18/fs/sysfs/file.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/sysfs/file.c 2010-08-11 18:57:32.000000000 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -34465,9 +34509,9 @@ diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c int error = -EACCES; char *p; -diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c ---- linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/sysfs/symlink.c linux-2.6.32.18/fs/sysfs/symlink.c +--- linux-2.6.32.18/fs/sysfs/symlink.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/sysfs/symlink.c 2010-08-11 18:57:32.000000000 -0400 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -34477,9 +34521,9 @@ diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c ---- linux-2.6.32.16/fs/udf/balloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/udf/balloc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/udf/balloc.c linux-2.6.32.18/fs/udf/balloc.c +--- linux-2.6.32.18/fs/udf/balloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/udf/balloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -34502,9 +34546,9 @@ diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c ---- linux-2.6.32.16/fs/udf/misc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/udf/misc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/udf/misc.c linux-2.6.32.18/fs/udf/misc.c +--- linux-2.6.32.18/fs/udf/misc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/udf/misc.c 2010-08-11 18:57:32.000000000 -0400 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat iinfo->i_lenEAttr += size; return (struct genericFormat *)&ea[offset]; @@ -34516,9 +34560,9 @@ diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c return NULL; } -diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h ---- linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/udf/udfdecl.h linux-2.6.32.18/fs/udf/udfdecl.h +--- linux-2.6.32.18/fs/udf/udfdecl.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/udf/udfdecl.h 2010-08-11 18:57:32.000000000 -0400 @@ -26,7 +26,7 @@ do { \ printk(f, ##a); \ } while (0) @@ -34528,9 +34572,9 @@ diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h #endif #define udf_info(f, a...) \ -diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c ---- linux-2.6.32.16/fs/utimes.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/utimes.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/utimes.c linux-2.6.32.18/fs/utimes.c +--- linux-2.6.32.18/fs/utimes.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/utimes.c 2010-08-11 18:57:32.000000000 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -34552,9 +34596,9 @@ diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -34564,9 +34608,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.16/fs/xfs/l copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c 2010-08-11 18:57:32.000000000 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -34576,9 +34620,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.16/fs/xfs/li if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c ---- linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/fs/xfs/xfs_bmap.c linux-2.6.32.18/fs/xfs/xfs_bmap.c +--- linux-2.6.32.18/fs/xfs/xfs_bmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/fs/xfs/xfs_bmap.c 2010-08-11 18:57:32.000000000 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -34588,9 +34632,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/gracl_alloc.c ---- linux-2.6.32.16/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_alloc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_alloc.c linux-2.6.32.18/grsecurity/gracl_alloc.c +--- linux-2.6.32.18/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_alloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -34697,9 +34741,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/g + else + return 1; +} -diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c ---- linux-2.6.32.16/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl.c 2010-07-10 08:10:31.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl.c linux-2.6.32.18/grsecurity/gracl.c +--- linux-2.6.32.18/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl.c 2010-08-11 18:59:54.000000000 -0400 @@ -0,0 +1,3919 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -38374,7 +38418,7 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c + struct acl_object_label *obj, *obj2; + + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) && -+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode)) { ++ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && filp->f_path.mnt != shm_mnt) { + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, + task->role->root_label); @@ -38620,9 +38664,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gracl_cap.c ---- linux-2.6.32.16/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_cap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_cap.c linux-2.6.32.18/grsecurity/gracl_cap.c +--- linux-2.6.32.18/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_cap.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,138 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -38762,9 +38806,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gra + return 0; +} + -diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/gracl_fs.c ---- linux-2.6.32.16/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_fs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_fs.c linux-2.6.32.18/grsecurity/gracl_fs.c +--- linux-2.6.32.18/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_fs.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39190,9 +39234,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/grac + + return 0; +} -diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/gracl_ip.c ---- linux-2.6.32.16/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_ip.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_ip.c linux-2.6.32.18/grsecurity/gracl_ip.c +--- linux-2.6.32.18/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_ip.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -39533,9 +39577,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/grac + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/gracl_learn.c ---- linux-2.6.32.16/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_learn.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_learn.c linux-2.6.32.18/grsecurity/gracl_learn.c +--- linux-2.6.32.18/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_learn.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39748,9 +39792,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/g + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gracl_res.c ---- linux-2.6.32.16/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_res.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_res.c linux-2.6.32.18/grsecurity/gracl_res.c +--- linux-2.6.32.18/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_res.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,67 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39819,9 +39863,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gra + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gracl_segv.c ---- linux-2.6.32.16/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_segv.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_segv.c linux-2.6.32.18/grsecurity/gracl_segv.c +--- linux-2.6.32.18/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_segv.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -40133,9 +40177,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gracl_shm.c ---- linux-2.6.32.16/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/gracl_shm.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/gracl_shm.c linux-2.6.32.18/grsecurity/gracl_shm.c +--- linux-2.6.32.18/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/gracl_shm.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -40177,9 +40221,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gra + + return 1; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/grsec_chdir.c ---- linux-2.6.32.16/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_chdir.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_chdir.c linux-2.6.32.18/grsecurity/grsec_chdir.c +--- linux-2.6.32.18/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_chdir.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40200,9 +40244,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/grsec_chroot.c ---- linux-2.6.32.16/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_chroot.c 2010-07-10 08:10:14.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_chroot.c linux-2.6.32.18/grsecurity/grsec_chroot.c +--- linux-2.6.32.18/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_chroot.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,389 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -40593,9 +40637,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurity/grsec_disabled.c ---- linux-2.6.32.16/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_disabled.c 2010-07-10 07:45:05.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_disabled.c linux-2.6.32.18/grsecurity/grsec_disabled.c +--- linux-2.6.32.18/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_disabled.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -41028,9 +41072,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurit +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/grsec_exec.c ---- linux-2.6.32.16/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_exec.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_exec.c linux-2.6.32.18/grsecurity/grsec_exec.c +--- linux-2.6.32.18/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_exec.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41121,9 +41165,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/grsec_fifo.c ---- linux-2.6.32.16/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_fifo.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_fifo.c linux-2.6.32.18/grsecurity/grsec_fifo.c +--- linux-2.6.32.18/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_fifo.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41149,9 +41193,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/grsec_fork.c ---- linux-2.6.32.16/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_fork.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_fork.c linux-2.6.32.18/grsecurity/grsec_fork.c +--- linux-2.6.32.18/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_fork.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41168,9 +41212,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/grsec_init.c ---- linux-2.6.32.16/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_init.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_init.c linux-2.6.32.18/grsecurity/grsec_init.c +--- linux-2.6.32.18/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_init.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,258 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41430,9 +41474,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/grsec_link.c ---- linux-2.6.32.16/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_link.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_link.c linux-2.6.32.18/grsecurity/grsec_link.c +--- linux-2.6.32.18/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_link.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41477,9 +41521,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grsec_log.c ---- linux-2.6.32.16/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_log.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_log.c linux-2.6.32.18/grsecurity/grsec_log.c +--- linux-2.6.32.18/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_log.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,306 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41787,9 +41831,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grsec_mem.c ---- linux-2.6.32.16/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_mem.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_mem.c linux-2.6.32.18/grsecurity/grsec_mem.c +--- linux-2.6.32.18/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_mem.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41876,9 +41920,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grs + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/grsec_mount.c ---- linux-2.6.32.16/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_mount.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_mount.c linux-2.6.32.18/grsecurity/grsec_mount.c +--- linux-2.6.32.18/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_mount.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41942,9 +41986,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/g +#endif + return 0; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/grsec_ptrace.c ---- linux-2.6.32.16/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_ptrace.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_ptrace.c linux-2.6.32.18/grsecurity/grsec_ptrace.c +--- linux-2.6.32.18/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_ptrace.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41960,9 +42004,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/ +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grsec_sig.c ---- linux-2.6.32.16/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_sig.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_sig.c linux-2.6.32.18/grsecurity/grsec_sig.c +--- linux-2.6.32.18/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_sig.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42029,9 +42073,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grs + return; +} + -diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/grsec_sock.c ---- linux-2.6.32.16/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_sock.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_sock.c linux-2.6.32.18/grsecurity/grsec_sock.c +--- linux-2.6.32.18/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_sock.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -42304,9 +42348,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/gr + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/grsec_sysctl.c ---- linux-2.6.32.16/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_sysctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_sysctl.c linux-2.6.32.18/grsecurity/grsec_sysctl.c +--- linux-2.6.32.18/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_sysctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,459 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42767,9 +42811,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity/grsec_textrel.c ---- linux-2.6.32.16/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_textrel.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_textrel.c linux-2.6.32.18/grsecurity/grsec_textrel.c +--- linux-2.6.32.18/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_textrel.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42787,9 +42831,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/grsec_time.c ---- linux-2.6.32.16/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_time.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_time.c linux-2.6.32.18/grsecurity/grsec_time.c +--- linux-2.6.32.18/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_time.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42804,9 +42848,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grsec_tpe.c ---- linux-2.6.32.16/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsec_tpe.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsec_tpe.c linux-2.6.32.18/grsecurity/grsec_tpe.c +--- linux-2.6.32.18/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsec_tpe.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42846,9 +42890,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grs +#endif + return 1; +} -diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c ---- linux-2.6.32.16/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/grsum.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/grsum.c linux-2.6.32.18/grsecurity/grsum.c +--- linux-2.6.32.18/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/grsum.c 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -42911,10 +42955,10 @@ diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig ---- linux-2.6.32.16/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/Kconfig 2010-07-09 14:50:38.000000000 -0400 -@@ -0,0 +1,981 @@ +diff -urNp linux-2.6.32.18/grsecurity/Kconfig linux-2.6.32.18/grsecurity/Kconfig +--- linux-2.6.32.18/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/Kconfig 2010-08-11 22:07:12.000000000 -0400 +@@ -0,0 +1,982 @@ +# +# grecurity configuration +# @@ -42993,7 +43037,7 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig + select PAX_ASLR + select PAX_RANDMMAP + select PAX_REFCOUNT if (X86 || SPARC64) -+ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC32 || PPC64) && (SLAB || SLUB || SLOB)) ++ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB)) + + help + If you say Y here, several features in addition to those included @@ -43065,7 +43109,7 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig + select PAX_EI_PAX + select PAX_PT_PAX_FLAGS + select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) ++ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) + select PAX_MEMORY_UDEREF if (X86_32 && !XEN) + select PAX_RANDKSTACK if (X86_TSC && !X86_64) + select PAX_SEGMEXEC if (X86_32) @@ -43074,8 +43118,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig + select PAX_EMUTRAMP if (PARISC) + select PAX_EMUSIGRT if (PARISC) + select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC) ++ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86)) + select PAX_REFCOUNT if (X86 || SPARC64) -+ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB)) ++ select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB)) + help + If you say Y here, many of the features of grsecurity will be + enabled, which will protect you against many kinds of attacks @@ -43896,9 +43941,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefile ---- linux-2.6.32.16/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/grsecurity/Makefile 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/grsecurity/Makefile linux-2.6.32.18/grsecurity/Makefile +--- linux-2.6.32.18/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/grsecurity/Makefile 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -43929,9 +43974,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefi + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/acoutput.h ---- linux-2.6.32.16/include/acpi/acoutput.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/acpi/acoutput.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/acpi/acoutput.h linux-2.6.32.18/include/acpi/acoutput.h +--- linux-2.6.32.18/include/acpi/acoutput.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/acpi/acoutput.h 2010-08-11 18:57:32.000000000 -0400 @@ -264,8 +264,8 @@ * leaving no executable debug code! */ @@ -43943,9 +43988,9 @@ diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/ #endif /* ACPI_DEBUG_OUTPUT */ -diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/acpi/acpi_drivers.h ---- linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/acpi/acpi_drivers.h linux-2.6.32.18/include/acpi/acpi_drivers.h +--- linux-2.6.32.18/include/acpi/acpi_drivers.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/acpi/acpi_drivers.h 2010-08-11 18:57:32.000000000 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -43975,9 +44020,9 @@ diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/include/asm-generic/atomic-long.h ---- linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/atomic-long.h linux-2.6.32.18/include/asm-generic/atomic-long.h +--- linux-2.6.32.18/include/asm-generic/atomic-long.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/atomic-long.h 2010-08-11 18:57:32.000000000 -0400 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -44232,9 +44277,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/inc +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.16/include/asm-generic/dma-mapping-common.h linux-2.6.32.16/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/dma-mapping-common.h linux-2.6.32.18/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.18/include/asm-generic/dma-mapping-common.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/dma-mapping-common.h 2010-08-11 18:57:32.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -44343,9 +44388,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/dma-mapping-common.h linux-2.6.32 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/asm-generic/futex.h ---- linux-2.6.32.16/include/asm-generic/futex.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/futex.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/futex.h linux-2.6.32.18/include/asm-generic/futex.h +--- linux-2.6.32.18/include/asm-generic/futex.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/futex.h 2010-08-11 18:57:32.000000000 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -44364,9 +44409,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include/asm-generic/int-l64.h ---- linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/int-l64.h linux-2.6.32.18/include/asm-generic/int-l64.h +--- linux-2.6.32.18/include/asm-generic/int-l64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/int-l64.h 2010-08-11 18:57:32.000000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -44376,9 +44421,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/include/asm-generic/int-ll64.h ---- linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/int-ll64.h linux-2.6.32.18/include/asm-generic/int-ll64.h +--- linux-2.6.32.18/include/asm-generic/int-ll64.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/int-ll64.h 2010-08-11 18:57:32.000000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -44388,9 +44433,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/includ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/include/asm-generic/kmap_types.h ---- linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/kmap_types.h linux-2.6.32.18/include/asm-generic/kmap_types.h +--- linux-2.6.32.18/include/asm-generic/kmap_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/kmap_types.h 2010-08-11 18:57:32.000000000 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -44401,9 +44446,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/incl }; #undef KMAP_D -diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include/asm-generic/pgtable.h ---- linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/pgtable.h linux-2.6.32.18/include/asm-generic/pgtable.h +--- linux-2.6.32.18/include/asm-generic/pgtable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/pgtable.h 2010-08-11 18:57:32.000000000 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -44419,9 +44464,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h ---- linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h +--- linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h 2010-08-11 18:57:32.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -44458,9 +44503,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h linux-2.6.32.16/i /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopud.h linux-2.6.32.16/include/asm-generic/pgtable-nopud.h ---- linux-2.6.32.16/include/asm-generic/pgtable-nopud.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/pgtable-nopud.h 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/pgtable-nopud.h linux-2.6.32.18/include/asm-generic/pgtable-nopud.h +--- linux-2.6.32.18/include/asm-generic/pgtable-nopud.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/pgtable-nopud.h 2010-08-11 18:57:32.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -44491,9 +44536,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopud.h linux-2.6.32.16/i /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/asm-generic/vmlinux.lds.h linux-2.6.32.18/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.18/include/asm-generic/vmlinux.lds.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/asm-generic/vmlinux.lds.h 2010-08-11 18:57:32.000000000 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -44532,9 +44577,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/inc /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/drm_pciids.h ---- linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/drm/drm_pciids.h linux-2.6.32.18/include/drm/drm_pciids.h +--- linux-2.6.32.18/include/drm/drm_pciids.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/drm/drm_pciids.h 2010-08-11 18:57:32.000000000 -0400 @@ -377,7 +377,7 @@ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -44638,9 +44683,9 @@ diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/ {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h ---- linux-2.6.32.16/include/drm/drmP.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/drm/drmP.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/drm/drmP.h linux-2.6.32.18/include/drm/drmP.h +--- linux-2.6.32.18/include/drm/drmP.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/drm/drmP.h 2010-08-11 18:57:32.000000000 -0400 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -44668,9 +44713,9 @@ diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a.out.h ---- linux-2.6.32.16/include/linux/a.out.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/a.out.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/a.out.h linux-2.6.32.18/include/linux/a.out.h +--- linux-2.6.32.18/include/linux/a.out.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/a.out.h 2010-08-11 18:57:32.000000000 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -44686,9 +44731,9 @@ diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/atmdev.h ---- linux-2.6.32.16/include/linux/atmdev.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/atmdev.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/atmdev.h linux-2.6.32.18/include/linux/atmdev.h +--- linux-2.6.32.18/include/linux/atmdev.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/atmdev.h 2010-08-11 18:57:32.000000000 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -44698,9 +44743,9 @@ diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/linux/backlight.h ---- linux-2.6.32.16/include/linux/backlight.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/backlight.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/backlight.h linux-2.6.32.18/include/linux/backlight.h +--- linux-2.6.32.18/include/linux/backlight.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/backlight.h 2010-08-11 18:57:32.000000000 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -44742,9 +44787,9 @@ diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux/binfmts.h ---- linux-2.6.32.16/include/linux/binfmts.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/binfmts.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/binfmts.h linux-2.6.32.18/include/linux/binfmts.h +--- linux-2.6.32.18/include/linux/binfmts.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/binfmts.h 2010-08-11 18:57:32.000000000 -0400 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -44753,9 +44798,9 @@ diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/blkdev.h ---- linux-2.6.32.16/include/linux/blkdev.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/blkdev.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/blkdev.h linux-2.6.32.18/include/linux/blkdev.h +--- linux-2.6.32.18/include/linux/blkdev.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/blkdev.h 2010-08-11 18:57:32.000000000 -0400 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -44787,9 +44832,9 @@ diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/ }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/cache.h ---- linux-2.6.32.16/include/linux/cache.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/cache.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/cache.h linux-2.6.32.18/include/linux/cache.h +--- linux-2.6.32.18/include/linux/cache.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/cache.h 2010-08-11 18:57:32.000000000 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -44801,9 +44846,9 @@ diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/linux/capability.h ---- linux-2.6.32.16/include/linux/capability.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/capability.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/capability.h linux-2.6.32.18/include/linux/capability.h +--- linux-2.6.32.18/include/linux/capability.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/capability.h 2010-08-11 18:57:32.000000000 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -44812,9 +44857,9 @@ diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/li /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include/linux/compiler-gcc4.h ---- linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/compiler-gcc4.h linux-2.6.32.18/include/linux/compiler-gcc4.h +--- linux-2.6.32.18/include/linux/compiler-gcc4.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/compiler-gcc4.h 2010-08-11 18:57:32.000000000 -0400 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -44824,9 +44869,9 @@ diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linux/compiler.h ---- linux-2.6.32.16/include/linux/compiler.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/compiler.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/compiler.h linux-2.6.32.18/include/linux/compiler.h +--- linux-2.6.32.18/include/linux/compiler.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/compiler.h 2010-08-11 18:57:32.000000000 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -44850,9 +44895,9 @@ diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linu /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include/linux/decompress/mm.h ---- linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/decompress/mm.h linux-2.6.32.18/include/linux/decompress/mm.h +--- linux-2.6.32.18/include/linux/decompress/mm.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/decompress/mm.h 2010-08-11 18:57:32.000000000 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -44862,9 +44907,9 @@ diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/linux/dma-mapping.h ---- linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/dma-mapping.h linux-2.6.32.18/include/linux/dma-mapping.h +--- linux-2.6.32.18/include/linux/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/dma-mapping.h 2010-08-11 18:57:32.000000000 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -44931,9 +44976,9 @@ diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/l }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst.h ---- linux-2.6.32.16/include/linux/dst.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/dst.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/dst.h linux-2.6.32.18/include/linux/dst.h +--- linux-2.6.32.18/include/linux/dst.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/dst.h 2010-08-11 18:57:32.000000000 -0400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -44943,9 +44988,9 @@ diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf.h ---- linux-2.6.32.16/include/linux/elf.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/elf.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/elf.h linux-2.6.32.18/include/linux/elf.h +--- linux-2.6.32.18/include/linux/elf.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/elf.h 2010-08-11 18:57:32.000000000 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -45018,9 +45063,9 @@ diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf #endif -diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h ---- linux-2.6.32.16/include/linux/fs.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/fs.h 2010-07-10 08:00:09.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/fs.h linux-2.6.32.18/include/linux/fs.h +--- linux-2.6.32.18/include/linux/fs.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/fs.h 2010-08-11 18:57:32.000000000 -0400 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -45182,9 +45227,9 @@ diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h }; /* -diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/linux/fs_struct.h ---- linux-2.6.32.16/include/linux/fs_struct.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/fs_struct.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/fs_struct.h linux-2.6.32.18/include/linux/fs_struct.h +--- linux-2.6.32.18/include/linux/fs_struct.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/fs_struct.h 2010-08-11 18:57:32.000000000 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -45194,9 +45239,9 @@ diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/genhd.h ---- linux-2.6.32.16/include/linux/genhd.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/genhd.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/genhd.h linux-2.6.32.18/include/linux/genhd.h +--- linux-2.6.32.18/include/linux/genhd.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/genhd.h 2010-08-11 18:57:32.000000000 -0400 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -45206,9 +45251,9 @@ diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/g struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/gracl.h ---- linux-2.6.32.16/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/gracl.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/gracl.h linux-2.6.32.18/include/linux/gracl.h +--- linux-2.6.32.18/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/gracl.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,310 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -45520,9 +45565,9 @@ diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/g + +#endif + -diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux/gralloc.h ---- linux-2.6.32.16/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/gralloc.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/gralloc.h linux-2.6.32.18/include/linux/gralloc.h +--- linux-2.6.32.18/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/gralloc.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -45533,9 +45578,9 @@ diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/grdefs.h ---- linux-2.6.32.16/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/grdefs.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/grdefs.h linux-2.6.32.18/include/linux/grdefs.h +--- linux-2.6.32.18/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/grdefs.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -45673,9 +45718,9 @@ diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/ +}; + +#endif -diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/linux/grinternal.h ---- linux-2.6.32.16/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/grinternal.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/grinternal.h linux-2.6.32.18/include/linux/grinternal.h +--- linux-2.6.32.18/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/grinternal.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,211 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -45888,9 +45933,9 @@ diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/li +#endif + +#endif -diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/grmsg.h ---- linux-2.6.32.16/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/grmsg.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/grmsg.h linux-2.6.32.18/include/linux/grmsg.h +--- linux-2.6.32.18/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/grmsg.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" @@ -46000,9 +46045,9 @@ diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/g +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " -diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/linux/grsecurity.h ---- linux-2.6.32.16/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/include/linux/grsecurity.h 2010-07-10 07:56:56.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/grsecurity.h linux-2.6.32.18/include/linux/grsecurity.h +--- linux-2.6.32.18/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/include/linux/grsecurity.h 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1,203 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -46207,9 +46252,9 @@ diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/li +#endif + +#endif -diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include/linux/hdpu_features.h ---- linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/hdpu_features.h linux-2.6.32.18/include/linux/hdpu_features.h +--- linux-2.6.32.18/include/linux/hdpu_features.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/hdpu_features.h 2010-08-11 18:57:32.000000000 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -46219,9 +46264,9 @@ diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux/highmem.h ---- linux-2.6.32.16/include/linux/highmem.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/highmem.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/highmem.h linux-2.6.32.18/include/linux/highmem.h +--- linux-2.6.32.18/include/linux/highmem.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/highmem.h 2010-08-11 18:57:32.000000000 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -46241,9 +46286,9 @@ diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/linux/interrupt.h ---- linux-2.6.32.16/include/linux/interrupt.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/interrupt.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/interrupt.h linux-2.6.32.18/include/linux/interrupt.h +--- linux-2.6.32.18/include/linux/interrupt.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/interrupt.h 2010-08-11 18:57:32.000000000 -0400 @@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -46268,9 +46313,9 @@ diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/lin extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jbd2.h ---- linux-2.6.32.16/include/linux/jbd2.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/jbd2.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/jbd2.h linux-2.6.32.18/include/linux/jbd2.h +--- linux-2.6.32.18/include/linux/jbd2.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/jbd2.h 2010-08-11 18:57:32.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -46280,9 +46325,9 @@ diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jb #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd.h ---- linux-2.6.32.16/include/linux/jbd.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/jbd.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/jbd.h linux-2.6.32.18/include/linux/jbd.h +--- linux-2.6.32.18/include/linux/jbd.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/jbd.h 2010-08-11 18:57:32.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -46292,9 +46337,9 @@ diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linux/kallsyms.h ---- linux-2.6.32.16/include/linux/kallsyms.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/kallsyms.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/kallsyms.h linux-2.6.32.18/include/linux/kallsyms.h +--- linux-2.6.32.18/include/linux/kallsyms.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/kallsyms.h 2010-08-11 18:57:32.000000000 -0400 @@ -15,7 +15,8 @@ struct module; @@ -46315,9 +46360,9 @@ diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linu /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kgdb.h ---- linux-2.6.32.16/include/linux/kgdb.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/kgdb.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/kgdb.h linux-2.6.32.18/include/linux/kgdb.h +--- linux-2.6.32.18/include/linux/kgdb.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/kgdb.h 2010-08-11 18:57:32.000000000 -0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -46348,9 +46393,9 @@ diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kg extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux/kobject.h ---- linux-2.6.32.16/include/linux/kobject.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/kobject.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/kobject.h linux-2.6.32.18/include/linux/kobject.h +--- linux-2.6.32.18/include/linux/kobject.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/kobject.h 2010-08-11 18:57:32.000000000 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -46399,9 +46444,9 @@ diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linux/kvm_host.h ---- linux-2.6.32.16/include/linux/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/kvm_host.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/kvm_host.h linux-2.6.32.18/include/linux/kvm_host.h +--- linux-2.6.32.18/include/linux/kvm_host.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/kvm_host.h 2010-08-11 18:57:32.000000000 -0400 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -46420,9 +46465,9 @@ diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linu void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/libata.h ---- linux-2.6.32.16/include/linux/libata.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/libata.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/libata.h linux-2.6.32.18/include/linux/libata.h +--- linux-2.6.32.18/include/linux/libata.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/libata.h 2010-08-11 18:57:32.000000000 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -46488,9 +46533,9 @@ diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/linux/lockd/bind.h ---- linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/lockd/bind.h linux-2.6.32.18/include/linux/lockd/bind.h +--- linux-2.6.32.18/include/linux/lockd/bind.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/lockd/bind.h 2010-08-11 18:57:32.000000000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -46508,9 +46553,9 @@ diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/li /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h ---- linux-2.6.32.16/include/linux/mm.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/mm.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/mm.h linux-2.6.32.18/include/linux/mm.h +--- linux-2.6.32.18/include/linux/mm.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/mm.h 2010-08-11 18:57:32.000000000 -0400 @@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ @@ -46577,9 +46622,9 @@ diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linux/mm_types.h ---- linux-2.6.32.16/include/linux/mm_types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/mm_types.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/mm_types.h linux-2.6.32.18/include/linux/mm_types.h +--- linux-2.6.32.18/include/linux/mm_types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/mm_types.h 2010-08-11 18:57:32.000000000 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -46614,9 +46659,9 @@ diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linu }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/linux/mmu_notifier.h ---- linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/mmu_notifier.h linux-2.6.32.18/include/linux/mmu_notifier.h +--- linux-2.6.32.18/include/linux/mmu_notifier.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/mmu_notifier.h 2010-08-11 18:57:32.000000000 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -46633,9 +46678,9 @@ diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/ }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.16/include/linux/mmzone.h linux-2.6.32.16/include/linux/mmzone.h ---- linux-2.6.32.16/include/linux/mmzone.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/mmzone.h 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/mmzone.h linux-2.6.32.18/include/linux/mmzone.h +--- linux-2.6.32.18/include/linux/mmzone.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/mmzone.h 2010-08-11 18:57:32.000000000 -0400 @@ -343,7 +343,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -46645,9 +46690,9 @@ diff -urNp linux-2.6.32.16/include/linux/mmzone.h linux-2.6.32.16/include/linux/ /* * prev_priority holds the scanning priority for this zone. It is -diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/include/linux/mod_devicetable.h ---- linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/mod_devicetable.h linux-2.6.32.18/include/linux/mod_devicetable.h +--- linux-2.6.32.18/include/linux/mod_devicetable.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/mod_devicetable.h 2010-08-11 18:57:32.000000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -46666,9 +46711,9 @@ diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/inclu struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/module.h ---- linux-2.6.32.16/include/linux/module.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/module.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/module.h linux-2.6.32.18/include/linux/module.h +--- linux-2.6.32.18/include/linux/module.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/module.h 2010-08-11 18:57:32.000000000 -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -46741,9 +46786,9 @@ diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/ } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/linux/moduleloader.h ---- linux-2.6.32.16/include/linux/moduleloader.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/moduleloader.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/moduleloader.h linux-2.6.32.18/include/linux/moduleloader.h +--- linux-2.6.32.18/include/linux/moduleloader.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/moduleloader.h 2010-08-11 18:57:32.000000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -46766,9 +46811,9 @@ diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/namei.h ---- linux-2.6.32.16/include/linux/namei.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/namei.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/namei.h linux-2.6.32.18/include/linux/namei.h +--- linux-2.6.32.18/include/linux/namei.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/namei.h 2010-08-11 18:57:32.000000000 -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -46793,9 +46838,9 @@ diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/n { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linux/nodemask.h ---- linux-2.6.32.16/include/linux/nodemask.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/nodemask.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/nodemask.h linux-2.6.32.18/include/linux/nodemask.h +--- linux-2.6.32.18/include/linux/nodemask.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/nodemask.h 2010-08-11 18:57:32.000000000 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -46812,9 +46857,9 @@ diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linu }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linux/oprofile.h ---- linux-2.6.32.16/include/linux/oprofile.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/oprofile.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/oprofile.h linux-2.6.32.18/include/linux/oprofile.h +--- linux-2.6.32.18/include/linux/oprofile.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/oprofile.h 2010-08-11 18:57:32.000000000 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -46827,9 +46872,9 @@ diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linu /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/linux/pipe_fs_i.h ---- linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/pipe_fs_i.h linux-2.6.32.18/include/linux/pipe_fs_i.h +--- linux-2.6.32.18/include/linux/pipe_fs_i.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/pipe_fs_i.h 2010-08-11 18:57:32.000000000 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -46843,9 +46888,9 @@ diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/lin unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/poison.h ---- linux-2.6.32.16/include/linux/poison.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/poison.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/poison.h linux-2.6.32.18/include/linux/poison.h +--- linux-2.6.32.18/include/linux/poison.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/poison.h 2010-08-11 18:57:32.000000000 -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -46857,9 +46902,9 @@ diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/ /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux/proc_fs.h ---- linux-2.6.32.16/include/linux/proc_fs.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/proc_fs.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/proc_fs.h linux-2.6.32.18/include/linux/proc_fs.h +--- linux-2.6.32.18/include/linux/proc_fs.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/proc_fs.h 2010-08-11 18:57:32.000000000 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -46880,9 +46925,9 @@ diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/random.h ---- linux-2.6.32.16/include/linux/random.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/random.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/random.h linux-2.6.32.18/include/linux/random.h +--- linux-2.6.32.18/include/linux/random.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/random.h 2010-08-11 18:57:32.000000000 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -46895,9 +46940,9 @@ diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/ #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/linux/reiserfs_fs.h ---- linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/reiserfs_fs.h linux-2.6.32.18/include/linux/reiserfs_fs.h +--- linux-2.6.32.18/include/linux/reiserfs_fs.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/reiserfs_fs.h 2010-08-11 18:57:32.000000000 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -46944,9 +46989,9 @@ diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/l #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/reiserfs_fs_sb.h linux-2.6.32.18/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.18/include/linux/reiserfs_fs_sb.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/reiserfs_fs_sb.h 2010-08-11 18:57:32.000000000 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -46956,9 +47001,9 @@ diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/includ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/sched.h ---- linux-2.6.32.16/include/linux/sched.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/sched.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/sched.h linux-2.6.32.18/include/linux/sched.h +--- linux-2.6.32.18/include/linux/sched.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/sched.h 2010-08-11 18:57:32.000000000 -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -47174,9 +47219,9 @@ diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/s extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/linux/screen_info.h ---- linux-2.6.32.16/include/linux/screen_info.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/screen_info.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/screen_info.h linux-2.6.32.18/include/linux/screen_info.h +--- linux-2.6.32.18/include/linux/screen_info.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/screen_info.h 2010-08-11 18:57:32.000000000 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -47187,9 +47232,9 @@ diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/l } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linux/security.h ---- linux-2.6.32.16/include/linux/security.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/security.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/security.h linux-2.6.32.18/include/linux/security.h +--- linux-2.6.32.18/include/linux/security.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/security.h 2010-08-11 18:57:32.000000000 -0400 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -47198,9 +47243,9 @@ diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linu #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm.h ---- linux-2.6.32.16/include/linux/shm.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/shm.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/shm.h linux-2.6.32.18/include/linux/shm.h +--- linux-2.6.32.18/include/linux/shm.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/shm.h 2010-08-11 18:57:32.000000000 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -47212,9 +47257,9 @@ diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/slab.h ---- linux-2.6.32.16/include/linux/slab.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/slab.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/slab.h linux-2.6.32.18/include/linux/slab.h +--- linux-2.6.32.18/include/linux/slab.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/slab.h 2010-08-11 18:57:32.000000000 -0400 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -47286,9 +47331,9 @@ diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/sl +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linux/slub_def.h ---- linux-2.6.32.16/include/linux/slub_def.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/slub_def.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/slub_def.h linux-2.6.32.18/include/linux/slub_def.h +--- linux-2.6.32.18/include/linux/slub_def.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/slub_def.h 2010-08-11 18:57:32.000000000 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -47298,9 +47343,9 @@ diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linu void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/sonet.h ---- linux-2.6.32.16/include/linux/sonet.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/sonet.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/sonet.h linux-2.6.32.18/include/linux/sonet.h +--- linux-2.6.32.18/include/linux/sonet.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/sonet.h 2010-08-11 18:57:32.000000000 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -47310,9 +47355,9 @@ diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux/suspend.h ---- linux-2.6.32.16/include/linux/suspend.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/suspend.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/suspend.h linux-2.6.32.18/include/linux/suspend.h +--- linux-2.6.32.18/include/linux/suspend.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/suspend.h 2010-08-11 18:57:32.000000000 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -47401,9 +47446,9 @@ diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/sysctl.h ---- linux-2.6.32.16/include/linux/sysctl.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/sysctl.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/sysctl.h linux-2.6.32.18/include/linux/sysctl.h +--- linux-2.6.32.18/include/linux/sysctl.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/sysctl.h 2010-08-11 18:57:32.000000000 -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -47417,9 +47462,9 @@ diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/ /* CTL_VM names: */ enum -diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/sysfs.h ---- linux-2.6.32.16/include/linux/sysfs.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/sysfs.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/sysfs.h linux-2.6.32.18/include/linux/sysfs.h +--- linux-2.6.32.18/include/linux/sysfs.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/sysfs.h 2010-08-11 18:57:32.000000000 -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -47431,9 +47476,9 @@ diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/s }; struct sysfs_dirent; -diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/linux/thread_info.h ---- linux-2.6.32.16/include/linux/thread_info.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/thread_info.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/thread_info.h linux-2.6.32.18/include/linux/thread_info.h +--- linux-2.6.32.18/include/linux/thread_info.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/thread_info.h 2010-08-11 18:57:32.000000000 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -47443,9 +47488,9 @@ diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/l u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty.h ---- linux-2.6.32.16/include/linux/tty.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/tty.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/tty.h linux-2.6.32.18/include/linux/tty.h +--- linux-2.6.32.18/include/linux/tty.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/tty.h 2010-08-11 18:57:32.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -47481,9 +47526,9 @@ diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/linux/tty_ldisc.h ---- linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/tty_ldisc.h linux-2.6.32.18/include/linux/tty_ldisc.h +--- linux-2.6.32.18/include/linux/tty_ldisc.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/tty_ldisc.h 2010-08-11 18:57:32.000000000 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -47493,9 +47538,9 @@ diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/lin }; struct tty_ldisc { -diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/types.h ---- linux-2.6.32.16/include/linux/types.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/types.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/types.h linux-2.6.32.18/include/linux/types.h +--- linux-2.6.32.18/include/linux/types.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/types.h 2010-08-11 18:57:32.000000000 -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -47523,9 +47568,9 @@ diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/t #endif struct ustat { -diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux/uaccess.h ---- linux-2.6.32.16/include/linux/uaccess.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/uaccess.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/uaccess.h linux-2.6.32.18/include/linux/uaccess.h +--- linux-2.6.32.18/include/linux/uaccess.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/uaccess.h 2010-08-11 18:57:32.000000000 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -47557,9 +47602,9 @@ diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux/vmalloc.h ---- linux-2.6.32.16/include/linux/vmalloc.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/vmalloc.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/vmalloc.h linux-2.6.32.18/include/linux/vmalloc.h +--- linux-2.6.32.18/include/linux/vmalloc.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/vmalloc.h 2010-08-11 18:57:32.000000000 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -47654,9 +47699,9 @@ diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.16/include/linux/vmstat.h linux-2.6.32.16/include/linux/vmstat.h ---- linux-2.6.32.16/include/linux/vmstat.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/linux/vmstat.h 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/include/linux/vmstat.h linux-2.6.32.18/include/linux/vmstat.h +--- linux-2.6.32.18/include/linux/vmstat.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/linux/vmstat.h 2010-08-11 18:57:32.000000000 -0400 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -47711,9 +47756,9 @@ diff -urNp linux-2.6.32.16/include/linux/vmstat.h linux-2.6.32.16/include/linux/ } static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include/net/irda/ircomm_tty.h ---- linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/net/irda/ircomm_tty.h linux-2.6.32.18/include/net/irda/ircomm_tty.h +--- linux-2.6.32.18/include/net/irda/ircomm_tty.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/net/irda/ircomm_tty.h 2010-08-11 18:57:32.000000000 -0400 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -47725,9 +47770,9 @@ diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/neighbour.h ---- linux-2.6.32.16/include/net/neighbour.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/net/neighbour.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/net/neighbour.h linux-2.6.32.18/include/net/neighbour.h +--- linux-2.6.32.18/include/net/neighbour.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/net/neighbour.h 2010-08-11 18:57:32.000000000 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -47747,9 +47792,9 @@ diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/n }; struct pneigh_entry -diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/sctp/sctp.h ---- linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/net/sctp/sctp.h linux-2.6.32.18/include/net/sctp/sctp.h +--- linux-2.6.32.18/include/net/sctp/sctp.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/net/sctp/sctp.h 2010-08-11 18:57:32.000000000 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -47761,9 +47806,9 @@ diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/s #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h ---- linux-2.6.32.16/include/net/tcp.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/net/tcp.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/net/tcp.h linux-2.6.32.18/include/net/tcp.h +--- linux-2.6.32.18/include/net/tcp.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/net/tcp.h 2010-08-11 18:57:32.000000000 -0400 @@ -1420,6 +1420,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -47772,9 +47817,9 @@ diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h ---- linux-2.6.32.16/include/net/udp.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/net/udp.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/net/udp.h linux-2.6.32.18/include/net/udp.h +--- linux-2.6.32.18/include/net/udp.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/net/udp.h 2010-08-11 18:57:32.000000000 -0400 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -47783,9 +47828,9 @@ diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/sound/ac97_codec.h ---- linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/sound/ac97_codec.h linux-2.6.32.18/include/sound/ac97_codec.h +--- linux-2.6.32.18/include/sound/ac97_codec.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/sound/ac97_codec.h 2010-08-11 18:57:32.000000000 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -47818,9 +47863,9 @@ diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/trace/events/irq.h ---- linux-2.6.32.16/include/trace/events/irq.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/trace/events/irq.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/trace/events/irq.h linux-2.6.32.18/include/trace/events/irq.h +--- linux-2.6.32.18/include/trace/events/irq.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/trace/events/irq.h 2010-08-11 18:57:32.000000000 -0400 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -47857,9 +47902,9 @@ diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/tr TP_ARGS(h, vec), -diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video/uvesafb.h ---- linux-2.6.32.16/include/video/uvesafb.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/include/video/uvesafb.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/include/video/uvesafb.h linux-2.6.32.18/include/video/uvesafb.h +--- linux-2.6.32.18/include/video/uvesafb.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/include/video/uvesafb.h 2010-08-11 18:57:32.000000000 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -47868,9 +47913,9 @@ diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c ---- linux-2.6.32.16/init/do_mounts.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/do_mounts.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/do_mounts.c linux-2.6.32.18/init/do_mounts.c +--- linux-2.6.32.18/init/do_mounts.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/do_mounts.c 2010-08-11 18:57:32.000000000 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -47916,9 +47961,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h ---- linux-2.6.32.16/init/do_mounts.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/do_mounts.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/do_mounts.h linux-2.6.32.18/init/do_mounts.h +--- linux-2.6.32.18/init/do_mounts.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/do_mounts.h 2010-08-11 18:57:32.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -47938,9 +47983,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mounts_initrd.c ---- linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/do_mounts_initrd.c linux-2.6.32.18/init/do_mounts_initrd.c +--- linux-2.6.32.18/init/do_mounts_initrd.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/do_mounts_initrd.c 2010-08-11 18:57:32.000000000 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -48024,9 +48069,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mount + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md.c ---- linux-2.6.32.16/init/do_mounts_md.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/do_mounts_md.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/do_mounts_md.c linux-2.6.32.18/init/do_mounts_md.c +--- linux-2.6.32.18/init/do_mounts_md.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/do_mounts_md.c 2010-08-11 18:57:32.000000000 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -48054,9 +48099,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c ---- linux-2.6.32.16/init/initramfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/initramfs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/initramfs.c linux-2.6.32.18/init/initramfs.c +--- linux-2.6.32.18/init/initramfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/initramfs.c 2010-08-11 18:57:32.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -48165,9 +48210,9 @@ diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig ---- linux-2.6.32.16/init/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/Kconfig 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/Kconfig linux-2.6.32.18/init/Kconfig +--- linux-2.6.32.18/init/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/Kconfig 2010-08-11 18:57:32.000000000 -0400 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -48177,9 +48222,9 @@ diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c ---- linux-2.6.32.16/init/main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/main.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/main.c linux-2.6.32.18/init/main.c +--- linux-2.6.32.18/init/main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/main.c 2010-08-11 18:57:32.000000000 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -48324,9 +48369,9 @@ diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c ---- linux-2.6.32.16/init/noinitramfs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/init/noinitramfs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/init/noinitramfs.c linux-2.6.32.18/init/noinitramfs.c +--- linux-2.6.32.18/init/noinitramfs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/init/noinitramfs.c 2010-08-11 18:57:32.000000000 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -48345,9 +48390,9 @@ diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c ---- linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/ipc/ipc_sysctl.c linux-2.6.32.18/ipc/ipc_sysctl.c +--- linux-2.6.32.18/ipc/ipc_sysctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/ipc/ipc_sysctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -48366,9 +48411,9 @@ diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c ---- linux-2.6.32.16/ipc/mqueue.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/ipc/mqueue.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/ipc/mqueue.c linux-2.6.32.18/ipc/mqueue.c +--- linux-2.6.32.18/ipc/mqueue.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/ipc/mqueue.c 2010-08-11 18:57:32.000000000 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -48377,9 +48422,9 @@ diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c ---- linux-2.6.32.16/ipc/shm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/ipc/shm.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/ipc/shm.c linux-2.6.32.18/ipc/shm.c +--- linux-2.6.32.18/ipc/shm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/ipc/shm.c 2010-08-11 18:57:32.000000000 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -48432,9 +48477,9 @@ diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c ---- linux-2.6.32.16/kernel/acct.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/acct.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/acct.c linux-2.6.32.18/kernel/acct.c +--- linux-2.6.32.18/kernel/acct.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/acct.c 2010-08-11 18:57:32.000000000 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -48444,9 +48489,9 @@ diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability.c ---- linux-2.6.32.16/kernel/capability.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/capability.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/capability.c linux-2.6.32.18/kernel/capability.c +--- linux-2.6.32.18/kernel/capability.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/capability.c 2010-08-11 18:57:32.000000000 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -48470,9 +48515,9 @@ diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c ---- linux-2.6.32.16/kernel/configs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/configs.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/configs.c linux-2.6.32.18/kernel/configs.c +--- linux-2.6.32.18/kernel/configs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/configs.c 2010-08-11 18:57:32.000000000 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -48493,9 +48538,9 @@ diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c ---- linux-2.6.32.16/kernel/cpu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/cpu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/cpu.c linux-2.6.32.18/kernel/cpu.c +--- linux-2.6.32.18/kernel/cpu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/cpu.c 2010-08-11 18:57:32.000000000 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -48505,9 +48550,9 @@ diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c ---- linux-2.6.32.16/kernel/cred.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/cred.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/cred.c linux-2.6.32.18/kernel/cred.c +--- linux-2.6.32.18/kernel/cred.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/cred.c 2010-08-11 18:57:32.000000000 -0400 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -48517,9 +48562,9 @@ diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c ---- linux-2.6.32.16/kernel/exit.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/exit.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/exit.c linux-2.6.32.18/kernel/exit.c +--- linux-2.6.32.18/kernel/exit.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/exit.c 2010-08-11 18:57:32.000000000 -0400 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -48609,9 +48654,9 @@ diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c ---- linux-2.6.32.16/kernel/fork.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/fork.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/fork.c linux-2.6.32.18/kernel/fork.c +--- linux-2.6.32.18/kernel/fork.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/fork.c 2010-08-11 18:57:32.000000000 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -48750,9 +48795,9 @@ diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c ---- linux-2.6.32.16/kernel/futex.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/futex.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/futex.c linux-2.6.32.18/kernel/futex.c +--- linux-2.6.32.18/kernel/futex.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/futex.c 2010-08-11 18:57:32.000000000 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -48773,7 +48818,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c /* * The futex address must be "naturally" aligned. */ -@@ -1852,7 +1858,7 @@ retry: +@@ -1843,7 +1849,7 @@ retry: restart = ¤t_thread_info()->restart_block; restart->fn = futex_wait_restart; @@ -48782,7 +48827,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; -@@ -2385,7 +2391,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2376,7 +2382,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi { struct robust_list_head __user *head; unsigned long ret; @@ -48794,7 +48839,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c if (!futex_cmpxchg_enabled) return -ENOSYS; -@@ -2401,11 +2410,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2392,11 +2401,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi if (!p) goto err_unlock; ret = -EPERM; @@ -48811,7 +48856,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c head = p->robust_list; rcu_read_unlock(); } -@@ -2467,7 +2481,7 @@ retry: +@@ -2458,7 +2472,7 @@ retry: */ static inline int fetch_robust_entry(struct robust_list __user **entry, struct robust_list __user * __user *head, @@ -48820,9 +48865,9 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_compat.c ---- linux-2.6.32.16/kernel/futex_compat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/futex_compat.c 2010-07-09 15:16:46.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/futex_compat.c linux-2.6.32.18/kernel/futex_compat.c +--- linux-2.6.32.18/kernel/futex_compat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/futex_compat.c 2010-08-11 18:57:32.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -48860,9 +48905,9 @@ diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_co head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c ---- linux-2.6.32.16/kernel/gcov/base.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/gcov/base.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/gcov/base.c linux-2.6.32.18/kernel/gcov/base.c +--- linux-2.6.32.18/kernel/gcov/base.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/gcov/base.c 2010-08-11 18:57:32.000000000 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -48884,9 +48929,9 @@ diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c ---- linux-2.6.32.16/kernel/hrtimer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/hrtimer.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/hrtimer.c linux-2.6.32.18/kernel/hrtimer.c +--- linux-2.6.32.18/kernel/hrtimer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/hrtimer.c 2010-08-11 18:57:32.000000000 -0400 @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -48896,9 +48941,9 @@ diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c ---- linux-2.6.32.16/kernel/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/kallsyms.c 2010-07-09 14:50:44.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/kallsyms.c linux-2.6.32.18/kernel/kallsyms.c +--- linux-2.6.32.18/kernel/kallsyms.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/kallsyms.c 2010-08-11 18:57:32.000000000 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -48987,9 +49032,9 @@ diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c ---- linux-2.6.32.16/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/kgdb.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/kgdb.c linux-2.6.32.18/kernel/kgdb.c +--- linux-2.6.32.18/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/kgdb.c 2010-08-11 18:57:32.000000000 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -49017,9 +49062,9 @@ diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c ---- linux-2.6.32.16/kernel/kmod.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/kmod.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/kmod.c linux-2.6.32.18/kernel/kmod.c +--- linux-2.6.32.18/kernel/kmod.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/kmod.c 2010-08-11 18:57:32.000000000 -0400 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -49039,9 +49084,9 @@ diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c ---- linux-2.6.32.16/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/kprobes.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/kprobes.c linux-2.6.32.18/kernel/kprobes.c +--- linux-2.6.32.18/kernel/kprobes.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/kprobes.c 2010-08-11 18:57:32.000000000 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -49078,9 +49123,9 @@ diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c ---- linux-2.6.32.16/kernel/lockdep.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/lockdep.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/lockdep.c linux-2.6.32.18/kernel/lockdep.c +--- linux-2.6.32.18/kernel/lockdep.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/lockdep.c 2010-08-11 18:57:32.000000000 -0400 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -49110,9 +49155,9 @@ diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_proc.c ---- linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/lockdep_proc.c linux-2.6.32.18/kernel/lockdep_proc.c +--- linux-2.6.32.18/kernel/lockdep_proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/lockdep_proc.c 2010-08-11 18:57:32.000000000 -0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v static void print_name(struct seq_file *m, struct lock_class *class) @@ -49122,9 +49167,9 @@ diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_ const char *name = class->name; if (!name) { -diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c ---- linux-2.6.32.16/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/module.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/module.c linux-2.6.32.18/kernel/module.c +--- linux-2.6.32.18/kernel/module.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/module.c 2010-08-11 18:57:32.000000000 -0400 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -49162,7 +49207,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -1543,7 +1544,8 @@ static void free_module(struct module *m +@@ -1545,7 +1546,8 @@ static void free_module(struct module *m destroy_params(mod->kp, mod->num_kp); /* This may be NULL, but that's OK */ @@ -49172,7 +49217,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c kfree(mod->args); if (mod->percpu) percpu_modfree(mod->percpu); -@@ -1552,10 +1554,12 @@ static void free_module(struct module *m +@@ -1554,10 +1556,12 @@ static void free_module(struct module *m percpu_modfree(mod->refptr); #endif /* Free lock-classes: */ @@ -49187,7 +49232,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c #ifdef CONFIG_MPU update_protections(current->mm); -@@ -1649,7 +1653,9 @@ static int simplify_symbols(Elf_Shdr *se +@@ -1651,7 +1655,9 @@ static int simplify_symbols(Elf_Shdr *se strtab + sym[i].st_name, mod); /* Ok if resolved. */ if (ksym) { @@ -49197,7 +49242,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c break; } -@@ -1668,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se +@@ -1670,7 +1676,9 @@ static int simplify_symbols(Elf_Shdr *se secbase = (unsigned long)mod->percpu; else secbase = sechdrs[sym[i].st_shndx].sh_addr; @@ -49207,7 +49252,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c break; } } -@@ -1729,11 +1737,12 @@ static void layout_sections(struct modul +@@ -1731,11 +1739,12 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || strstarts(secstrings + s->sh_name, ".init")) continue; @@ -49223,7 +49268,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c } DEBUGP("Init section allocation order:\n"); -@@ -1746,12 +1755,13 @@ static void layout_sections(struct modul +@@ -1748,12 +1757,13 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || !strstarts(secstrings + s->sh_name, ".init")) continue; @@ -49241,7 +49286,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c } } -@@ -1855,9 +1865,8 @@ static int is_exported(const char *name, +@@ -1857,9 +1867,8 @@ static int is_exported(const char *name, /* As per nm */ static char elf_type(const Elf_Sym *sym, @@ -49253,7 +49298,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c { if (ELF_ST_BIND(sym->st_info) == STB_WEAK) { if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT) -@@ -1932,7 +1941,7 @@ static unsigned long layout_symtab(struc +@@ -1934,7 +1943,7 @@ static unsigned long layout_symtab(struc /* Put symbol section at end of init part of module. */ symsect->sh_flags |= SHF_ALLOC; @@ -49262,7 +49307,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c symindex) | INIT_OFFSET_MASK; DEBUGP("\t%s\n", secstrings + symsect->sh_name); -@@ -1949,19 +1958,19 @@ static unsigned long layout_symtab(struc +@@ -1951,19 +1960,19 @@ static unsigned long layout_symtab(struc } /* Append room for core symbols at end of core part. */ @@ -49287,7 +49332,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c return symoffs; } -@@ -1985,12 +1994,14 @@ static void add_kallsyms(struct module * +@@ -1987,12 +1996,14 @@ static void add_kallsyms(struct module * mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym); mod->strtab = (void *)sechdrs[strindex].sh_addr; @@ -49304,7 +49349,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c src = mod->symtab; *dst = *src; for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { -@@ -2002,10 +2013,12 @@ static void add_kallsyms(struct module * +@@ -2004,10 +2015,12 @@ static void add_kallsyms(struct module * } mod->core_num_syms = ndst; @@ -49318,7 +49363,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c } #else static inline unsigned long layout_symtab(struct module *mod, -@@ -2042,16 +2055,30 @@ static void dynamic_debug_setup(struct _ +@@ -2044,16 +2057,30 @@ static void dynamic_debug_setup(struct _ #endif } @@ -49354,7 +49399,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c } return ret; } -@@ -2063,8 +2090,8 @@ static void kmemleak_load_module(struct +@@ -2065,8 +2092,8 @@ static void kmemleak_load_module(struct unsigned int i; /* only scan the sections containing data */ @@ -49365,7 +49410,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c sizeof(struct module), GFP_KERNEL); for (i = 1; i < hdr->e_shnum; i++) { -@@ -2074,8 +2101,8 @@ static void kmemleak_load_module(struct +@@ -2076,8 +2103,8 @@ static void kmemleak_load_module(struct && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0) continue; @@ -49376,7 +49421,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c sechdrs[i].sh_size, GFP_KERNEL); } } -@@ -2261,7 +2288,7 @@ static noinline struct module *load_modu +@@ -2263,7 +2290,7 @@ static noinline struct module *load_modu secstrings, &stroffs, strmap); /* Do the allocs. */ @@ -49385,7 +49430,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2272,23 +2299,47 @@ static noinline struct module *load_modu +@@ -2274,23 +2301,47 @@ static noinline struct module *load_modu err = -ENOMEM; goto free_percpu; } @@ -49441,7 +49486,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ DEBUGP("final section addresses:\n"); -@@ -2298,17 +2349,41 @@ static noinline struct module *load_modu +@@ -2300,17 +2351,41 @@ static noinline struct module *load_modu if (!(sechdrs[i].sh_flags & SHF_ALLOC)) continue; @@ -49492,7 +49537,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); } /* Module has been moved. */ -@@ -2320,7 +2395,7 @@ static noinline struct module *load_modu +@@ -2322,7 +2397,7 @@ static noinline struct module *load_modu mod->name); if (!mod->refptr) { err = -ENOMEM; @@ -49501,7 +49546,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c } #endif /* Now we've moved module, initialize linked lists, etc. */ -@@ -2429,8 +2504,8 @@ static noinline struct module *load_modu +@@ -2431,8 +2506,8 @@ static noinline struct module *load_modu /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { @@ -49511,7 +49556,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* Not a valid relocation section? */ if (info >= hdr->e_shnum) -@@ -2491,12 +2566,12 @@ static noinline struct module *load_modu +@@ -2493,12 +2568,12 @@ static noinline struct module *load_modu * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -49530,7 +49575,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c set_fs(old_fs); -@@ -2544,12 +2619,16 @@ static noinline struct module *load_modu +@@ -2546,12 +2621,16 @@ static noinline struct module *load_modu free_unload: module_unload_free(mod); #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) @@ -49551,7 +49596,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* mod will be freed with core. Don't access it beyond this line! */ free_percpu: if (percpu) -@@ -2651,10 +2730,12 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2653,10 +2732,12 @@ SYSCALL_DEFINE3(init_module, void __user mod->symtab = mod->core_symtab; mod->strtab = mod->core_strtab; #endif @@ -49568,7 +49613,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c mutex_unlock(&module_mutex); return 0; -@@ -2685,10 +2766,16 @@ static const char *get_ksymbol(struct mo +@@ -2687,10 +2768,16 @@ static const char *get_ksymbol(struct mo unsigned long nextval; /* At worse, next value is at end of module */ @@ -49588,7 +49633,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* Scan for closest preceeding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -2934,7 +3021,7 @@ static int m_show(struct seq_file *m, vo +@@ -2936,7 +3023,7 @@ static int m_show(struct seq_file *m, vo char buf[8]; seq_printf(m, "%s %u", @@ -49597,7 +49642,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c print_unload_info(m, mod); /* Informative for users. */ -@@ -2943,7 +3030,7 @@ static int m_show(struct seq_file *m, vo +@@ -2945,7 +3032,7 @@ static int m_show(struct seq_file *m, vo mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -49606,7 +49651,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c /* Taints info */ if (mod->taints) -@@ -2979,7 +3066,17 @@ static const struct file_operations proc +@@ -2981,7 +3068,17 @@ static const struct file_operations proc static int __init proc_modules_init(void) { @@ -49624,7 +49669,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c return 0; } module_init(proc_modules_init); -@@ -3038,12 +3135,12 @@ struct module *__module_address(unsigned +@@ -3040,12 +3137,12 @@ struct module *__module_address(unsigned { struct module *mod; @@ -49640,7 +49685,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c return mod; return NULL; } -@@ -3077,11 +3174,20 @@ bool is_module_text_address(unsigned lon +@@ -3079,11 +3176,20 @@ bool is_module_text_address(unsigned lon */ struct module *__module_text_address(unsigned long addr) { @@ -49664,9 +49709,9 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c ---- linux-2.6.32.16/kernel/panic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/panic.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/panic.c linux-2.6.32.18/kernel/panic.c +--- linux-2.6.32.18/kernel/panic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/panic.c 2010-08-11 18:57:32.000000000 -0400 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) @@ -49677,9 +49722,9 @@ diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c ---- linux-2.6.32.16/kernel/params.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/params.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/params.c linux-2.6.32.18/kernel/params.c +--- linux-2.6.32.18/kernel/params.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/params.c 2010-08-11 18:57:32.000000000 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -49698,9 +49743,9 @@ diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c ---- linux-2.6.32.16/kernel/pid.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/pid.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/pid.c linux-2.6.32.18/kernel/pid.c +--- linux-2.6.32.18/kernel/pid.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/pid.c 2010-08-11 18:57:32.000000000 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -49734,9 +49779,9 @@ diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posix-cpu-timers.c ---- linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/posix-cpu-timers.c linux-2.6.32.18/kernel/posix-cpu-timers.c +--- linux-2.6.32.18/kernel/posix-cpu-timers.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/posix-cpu-timers.c 2010-08-11 18:57:32.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -49761,9 +49806,9 @@ diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posi if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) { /* * At the hard limit, we just die. -diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power/hibernate.c ---- linux-2.6.32.16/kernel/power/hibernate.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/power/hibernate.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/power/hibernate.c linux-2.6.32.18/kernel/power/hibernate.c +--- linux-2.6.32.18/kernel/power/hibernate.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/power/hibernate.c 2010-08-11 18:57:32.000000000 -0400 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -49781,9 +49826,9 @@ diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/poweroff.c ---- linux-2.6.32.16/kernel/power/poweroff.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/power/poweroff.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/power/poweroff.c linux-2.6.32.18/kernel/power/poweroff.c +--- linux-2.6.32.18/kernel/power/poweroff.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/power/poweroff.c 2010-08-11 18:57:32.000000000 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -49793,9 +49838,9 @@ diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/process.c ---- linux-2.6.32.16/kernel/power/process.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/power/process.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/power/process.c linux-2.6.32.18/kernel/power/process.c +--- linux-2.6.32.18/kernel/power/process.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/power/process.c 2010-08-11 18:57:32.000000000 -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -49835,9 +49880,9 @@ diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/p do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/suspend.c ---- linux-2.6.32.16/kernel/power/suspend.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/power/suspend.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/power/suspend.c linux-2.6.32.18/kernel/power/suspend.c +--- linux-2.6.32.18/kernel/power/suspend.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/power/suspend.c 2010-08-11 18:57:32.000000000 -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -49854,9 +49899,9 @@ diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c ---- linux-2.6.32.16/kernel/printk.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/printk.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/printk.c linux-2.6.32.18/kernel/printk.c +--- linux-2.6.32.18/kernel/printk.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/printk.c 2010-08-11 18:57:32.000000000 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -49869,9 +49914,9 @@ diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c ---- linux-2.6.32.16/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/ptrace.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/ptrace.c linux-2.6.32.18/kernel/ptrace.c +--- linux-2.6.32.18/kernel/ptrace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/ptrace.c 2010-08-11 18:57:32.000000000 -0400 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -49953,9 +49998,9 @@ diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c ---- linux-2.6.32.16/kernel/rcutree.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/rcutree.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/rcutree.c linux-2.6.32.18/kernel/rcutree.c +--- linux-2.6.32.18/kernel/rcutree.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/rcutree.c 2010-08-11 18:57:32.000000000 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -49965,9 +50010,9 @@ diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c ---- linux-2.6.32.16/kernel/relay.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/relay.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/relay.c linux-2.6.32.18/kernel/relay.c +--- linux-2.6.32.18/kernel/relay.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/relay.c 2010-08-11 18:57:32.000000000 -0400 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -49977,9 +50022,9 @@ diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c ---- linux-2.6.32.16/kernel/resource.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/resource.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/resource.c linux-2.6.32.18/kernel/resource.c +--- linux-2.6.32.18/kernel/resource.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/resource.c 2010-08-11 18:57:32.000000000 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -49999,10 +50044,10 @@ diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c ---- linux-2.6.32.16/kernel/sched.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/sched.c 2010-07-09 14:50:38.000000000 -0400 -@@ -4841,7 +4841,7 @@ out: +diff -urNp linux-2.6.32.18/kernel/sched.c linux-2.6.32.18/kernel/sched.c +--- linux-2.6.32.18/kernel/sched.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/sched.c 2010-08-11 18:57:32.000000000 -0400 +@@ -4848,7 +4848,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * rebalancing for all the cpus for whom scheduler ticks are stopped. */ @@ -50011,7 +50056,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c { int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); -@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p +@@ -6117,6 +6117,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -50020,7 +50065,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } -@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -6150,7 +6152,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -50030,7 +50075,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c return -EPERM; retval = security_task_setnice(current, nice); -@@ -7452,7 +7455,7 @@ static struct ctl_table sd_ctl_dir[] = { +@@ -7459,7 +7462,7 @@ static struct ctl_table sd_ctl_dir[] = { .procname = "sched_domain", .mode = 0555, }, @@ -50039,7 +50084,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c }; static struct ctl_table sd_ctl_root[] = { -@@ -7462,7 +7465,7 @@ static struct ctl_table sd_ctl_root[] = +@@ -7469,7 +7472,7 @@ static struct ctl_table sd_ctl_root[] = .mode = 0555, .child = sd_ctl_dir, }, @@ -50048,9 +50093,9 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c ---- linux-2.6.32.16/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/signal.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/signal.c linux-2.6.32.18/kernel/signal.c +--- linux-2.6.32.18/kernel/signal.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/signal.c 2010-08-11 18:57:32.000000000 -0400 @@ -41,12 +41,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -50136,9 +50181,9 @@ diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c return ret; } -diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c ---- linux-2.6.32.16/kernel/smp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/smp.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/smp.c linux-2.6.32.18/kernel/smp.c +--- linux-2.6.32.18/kernel/smp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/smp.c 2010-08-11 18:57:32.000000000 -0400 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -50166,9 +50211,9 @@ diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c ---- linux-2.6.32.16/kernel/softirq.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/softirq.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/softirq.c linux-2.6.32.18/kernel/softirq.c +--- linux-2.6.32.18/kernel/softirq.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/softirq.c 2010-08-11 18:57:32.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -50223,9 +50268,9 @@ diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c ---- linux-2.6.32.16/kernel/sys.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/sys.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/sys.c linux-2.6.32.18/kernel/sys.c +--- linux-2.6.32.18/kernel/sys.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/sys.c 2010-08-11 18:57:32.000000000 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -50361,9 +50406,9 @@ diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c ---- linux-2.6.32.16/kernel/sysctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/sysctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/sysctl.c linux-2.6.32.18/kernel/sysctl.c +--- linux-2.6.32.18/kernel/sysctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/sysctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -50485,9 +50530,9 @@ diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c ---- linux-2.6.32.16/kernel/taskstats.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/taskstats.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/taskstats.c linux-2.6.32.18/kernel/taskstats.c +--- linux-2.6.32.18/kernel/taskstats.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/taskstats.c 2010-08-11 18:57:32.000000000 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -50511,9 +50556,9 @@ diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/time/tick-broadcast.c ---- linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/time/tick-broadcast.c linux-2.6.32.18/kernel/time/tick-broadcast.c +--- linux-2.6.32.18/kernel/time/tick-broadcast.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/time/tick-broadcast.c 2010-08-11 18:57:32.000000000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -50523,9 +50568,9 @@ diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/t cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c ---- linux-2.6.32.16/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/time.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/time.c linux-2.6.32.18/kernel/time.c +--- linux-2.6.32.18/kernel/time.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/time.c 2010-08-11 18:57:32.000000000 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -50563,9 +50608,9 @@ diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c ---- linux-2.6.32.16/kernel/timer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/timer.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/timer.c linux-2.6.32.18/kernel/timer.c +--- linux-2.6.32.18/kernel/timer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/timer.c 2010-08-11 18:57:32.000000000 -0400 @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -50575,9 +50620,9 @@ diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c { struct tvec_base *base = __get_cpu_var(tvec_bases); -diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ftrace.c ---- linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/ftrace.c linux-2.6.32.18/kernel/trace/ftrace.c +--- linux-2.6.32.18/kernel/trace/ftrace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/ftrace.c 2010-08-11 18:57:32.000000000 -0400 @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -50599,9 +50644,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ft } /* -diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kconfig ---- linux-2.6.32.16/kernel/trace/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/Kconfig 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/Kconfig linux-2.6.32.18/kernel/trace/Kconfig +--- linux-2.6.32.18/kernel/trace/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/Kconfig 2010-08-11 18:57:32.000000000 -0400 @@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" @@ -50618,9 +50663,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kco select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/trace/ring_buffer.c ---- linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/ring_buffer.c linux-2.6.32.18/kernel/trace/ring_buffer.c +--- linux-2.6.32.18/kernel/trace/ring_buffer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/ring_buffer.c 2010-08-11 18:57:32.000000000 -0400 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * its flags will be non zero. @@ -50630,9 +50675,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/tra rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/trace.c ---- linux-2.6.32.16/kernel/trace/trace.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/trace.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/trace.c linux-2.6.32.18/kernel/trace/trace.c +--- linux-2.6.32.18/kernel/trace/trace.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/trace.c 2010-08-11 18:57:32.000000000 -0400 @@ -3808,10 +3808,9 @@ static const struct file_operations trac }; #endif @@ -50657,9 +50702,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/tra static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/trace/trace_events.c ---- linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/trace_events.c linux-2.6.32.18/kernel/trace/trace_events.c +--- linux-2.6.32.18/kernel/trace/trace_events.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/trace_events.c 2010-08-11 18:57:32.000000000 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -50669,9 +50714,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/tr struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/trace/trace_output.c ---- linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/trace_output.c linux-2.6.32.18/kernel/trace/trace_output.c +--- linux-2.6.32.18/kernel/trace/trace_output.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/trace_output.c 2010-08-11 18:57:32.000000000 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, return 0; p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -50681,9 +50726,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/tr if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/trace/trace_stack.c ---- linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/trace/trace_stack.c linux-2.6.32.18/kernel/trace/trace_stack.c +--- linux-2.6.32.18/kernel/trace/trace_stack.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/trace/trace_stack.c 2010-08-11 18:57:32.000000000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -50693,9 +50738,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/tra return; local_irq_save(flags); -diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsname_sysctl.c ---- linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/kernel/utsname_sysctl.c linux-2.6.32.18/kernel/utsname_sysctl.c +--- linux-2.6.32.18/kernel/utsname_sysctl.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/kernel/utsname_sysctl.c 2010-08-11 18:57:32.000000000 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -50714,9 +50759,9 @@ diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsnam }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c ---- linux-2.6.32.16/lib/bug.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/bug.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/bug.c linux-2.6.32.18/lib/bug.c +--- linux-2.6.32.18/lib/bug.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/bug.c 2010-08-11 18:57:32.000000000 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -50726,9 +50771,9 @@ diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c ---- linux-2.6.32.16/lib/debugobjects.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/debugobjects.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/debugobjects.c linux-2.6.32.18/lib/debugobjects.c +--- linux-2.6.32.18/lib/debugobjects.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/debugobjects.c 2010-08-11 18:57:32.000000000 -0400 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -50738,9 +50783,9 @@ diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c ---- linux-2.6.32.16/lib/dma-debug.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/dma-debug.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/dma-debug.c linux-2.6.32.18/lib/dma-debug.c +--- linux-2.6.32.18/lib/dma-debug.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/dma-debug.c 2010-08-11 18:57:32.000000000 -0400 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -50750,9 +50795,9 @@ diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c ---- linux-2.6.32.16/lib/idr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/idr.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/idr.c linux-2.6.32.18/lib/idr.c +--- linux-2.6.32.18/lib/idr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/idr.c 2010-08-11 18:57:32.000000000 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -50762,9 +50807,9 @@ diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c *starting_id = id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c ---- linux-2.6.32.16/lib/inflate.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/inflate.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/inflate.c linux-2.6.32.18/lib/inflate.c +--- linux-2.6.32.18/lib/inflate.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/inflate.c 2010-08-11 18:57:32.000000000 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -50774,9 +50819,9 @@ diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug ---- linux-2.6.32.16/lib/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/Kconfig.debug 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/Kconfig.debug linux-2.6.32.18/lib/Kconfig.debug +--- linux-2.6.32.18/lib/Kconfig.debug 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/Kconfig.debug 2010-08-11 18:57:32.000000000 -0400 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -50786,9 +50831,9 @@ diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c ---- linux-2.6.32.16/lib/kobject.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/kobject.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/kobject.c linux-2.6.32.18/lib/kobject.c +--- linux-2.6.32.18/lib/kobject.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/kobject.c 2010-08-11 18:57:32.000000000 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -50816,9 +50861,9 @@ diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_uevent.c ---- linux-2.6.32.16/lib/kobject_uevent.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/kobject_uevent.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/kobject_uevent.c linux-2.6.32.18/lib/kobject_uevent.c +--- linux-2.6.32.18/lib/kobject_uevent.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/kobject_uevent.c 2010-08-11 18:57:32.000000000 -0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -50828,9 +50873,9 @@ diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_ueve u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c ---- linux-2.6.32.16/lib/parser.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/parser.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/parser.c linux-2.6.32.18/lib/parser.c +--- linux-2.6.32.18/lib/parser.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/parser.c 2010-08-11 18:57:32.000000000 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -50840,9 +50885,9 @@ diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c ---- linux-2.6.32.16/lib/radix-tree.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/radix-tree.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/radix-tree.c linux-2.6.32.18/lib/radix-tree.c +--- linux-2.6.32.18/lib/radix-tree.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/radix-tree.c 2010-08-11 18:57:32.000000000 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -50852,9 +50897,9 @@ diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c ---- linux-2.6.32.16/lib/random32.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/lib/random32.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/lib/random32.c linux-2.6.32.18/lib/random32.c +--- linux-2.6.32.18/lib/random32.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/lib/random32.c 2010-08-11 18:57:32.000000000 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -50864,14 +50909,14 @@ diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c } /** -diff -urNp linux-2.6.32.16/localversion-grsec linux-2.6.32.16/localversion-grsec ---- linux-2.6.32.16/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.16/localversion-grsec 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/localversion-grsec linux-2.6.32.18/localversion-grsec +--- linux-2.6.32.18/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.18/localversion-grsec 2010-08-11 18:57:32.000000000 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile ---- linux-2.6.32.16/Makefile 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/Makefile 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/Makefile linux-2.6.32.18/Makefile +--- linux-2.6.32.18/Makefile 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/Makefile 2010-08-11 18:57:32.000000000 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -50892,9 +50937,9 @@ diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c ---- linux-2.6.32.16/mm/filemap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/filemap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/filemap.c linux-2.6.32.18/mm/filemap.c +--- linux-2.6.32.18/mm/filemap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/filemap.c 2010-08-11 18:57:32.000000000 -0400 @@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -50912,9 +50957,9 @@ diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c ---- linux-2.6.32.16/mm/fremap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/fremap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/fremap.c linux-2.6.32.18/mm/fremap.c +--- linux-2.6.32.18/mm/fremap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/fremap.c 2010-08-11 18:57:32.000000000 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -50927,9 +50972,9 @@ diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c ---- linux-2.6.32.16/mm/highmem.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/highmem.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/highmem.c linux-2.6.32.18/mm/highmem.c +--- linux-2.6.32.18/mm/highmem.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/highmem.c 2010-08-11 18:57:32.000000000 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -50955,9 +51000,9 @@ diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c ---- linux-2.6.32.16/mm/hugetlb.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/hugetlb.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/hugetlb.c linux-2.6.32.18/mm/hugetlb.c +--- linux-2.6.32.18/mm/hugetlb.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/hugetlb.c 2010-08-11 18:57:32.000000000 -0400 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -51037,9 +51082,9 @@ diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig ---- linux-2.6.32.16/mm/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/Kconfig 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/Kconfig linux-2.6.32.18/mm/Kconfig +--- linux-2.6.32.18/mm/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/Kconfig 2010-08-11 18:57:32.000000000 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -51049,9 +51094,9 @@ diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c ---- linux-2.6.32.16/mm/maccess.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/maccess.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/maccess.c linux-2.6.32.18/mm/maccess.c +--- linux-2.6.32.18/mm/maccess.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/maccess.c 2010-08-11 18:57:32.000000000 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -51070,9 +51115,9 @@ diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c ---- linux-2.6.32.16/mm/madvise.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/madvise.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/madvise.c linux-2.6.32.18/mm/madvise.c +--- linux-2.6.32.18/mm/madvise.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/madvise.c 2010-08-11 18:57:32.000000000 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -51149,9 +51194,9 @@ diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c ---- linux-2.6.32.16/mm/memory.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/memory.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/memory.c linux-2.6.32.18/mm/memory.c +--- linux-2.6.32.18/mm/memory.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/memory.c 2010-08-11 18:57:32.000000000 -0400 @@ -48,6 +48,7 @@ #include <linux/ksm.h> #include <linux/rmap.h> @@ -51199,7 +51244,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c if (!vma && in_gate_area(tsk, start)) { unsigned long pg = start & PAGE_MASK; struct vm_area_struct *gate_vma = get_gate_vma(tsk); -@@ -1296,7 +1305,7 @@ int __get_user_pages(struct task_struct +@@ -1306,7 +1315,7 @@ int __get_user_pages(struct task_struct continue; } @@ -51208,7 +51253,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1371,7 +1380,7 @@ int __get_user_pages(struct task_struct +@@ -1381,7 +1390,7 @@ int __get_user_pages(struct task_struct start += PAGE_SIZE; nr_pages--; } while (nr_pages && start < vma->vm_end); @@ -51217,7 +51262,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c return i; } -@@ -1967,6 +1976,186 @@ static inline void cow_user_page(struct +@@ -1977,6 +1986,186 @@ static inline void cow_user_page(struct copy_user_highpage(dst, src, va, vma); } @@ -51404,7 +51449,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2146,6 +2335,12 @@ gotten: +@@ -2156,6 +2345,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -51417,7 +51462,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter(mm, file_rss); -@@ -2197,6 +2392,10 @@ gotten: +@@ -2207,6 +2402,10 @@ gotten: page_remove_rmap(old_page); } @@ -51428,7 +51473,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -2594,6 +2793,11 @@ static int do_swap_page(struct mm_struct +@@ -2604,6 +2803,11 @@ static int do_swap_page(struct mm_struct swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -51440,7 +51485,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c unlock_page(page); if (flags & FAULT_FLAG_WRITE) { -@@ -2605,6 +2809,11 @@ static int do_swap_page(struct mm_struct +@@ -2615,6 +2819,11 @@ static int do_swap_page(struct mm_struct /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, pte); @@ -51452,7 +51497,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -2628,7 +2837,7 @@ static int do_anonymous_page(struct mm_s +@@ -2638,7 +2847,7 @@ static int do_anonymous_page(struct mm_s unsigned long address, pte_t *page_table, pmd_t *pmd, unsigned int flags) { @@ -51461,7 +51506,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c spinlock_t *ptl; pte_t entry; -@@ -2663,6 +2872,11 @@ static int do_anonymous_page(struct mm_s +@@ -2673,6 +2882,11 @@ static int do_anonymous_page(struct mm_s if (!pte_none(*page_table)) goto release; @@ -51473,7 +51518,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c inc_mm_counter(mm, anon_rss); page_add_new_anon_rmap(page, vma, address); setpte: -@@ -2670,6 +2884,12 @@ setpte: +@@ -2680,6 +2894,12 @@ setpte: /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, entry); @@ -51486,7 +51531,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -2812,6 +3032,12 @@ static int __do_fault(struct mm_struct * +@@ -2822,6 +3042,12 @@ static int __do_fault(struct mm_struct * */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -51499,7 +51544,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -2831,6 +3057,14 @@ static int __do_fault(struct mm_struct * +@@ -2841,6 +3067,14 @@ static int __do_fault(struct mm_struct * /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, entry); @@ -51514,7 +51559,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -2978,6 +3212,12 @@ static inline int handle_pte_fault(struc +@@ -2988,6 +3222,12 @@ static inline int handle_pte_fault(struc if (flags & FAULT_FLAG_WRITE) flush_tlb_page(vma, address); } @@ -51527,7 +51572,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -2994,6 +3234,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3004,6 +3244,10 @@ int handle_mm_fault(struct mm_struct *mm pmd_t *pmd; pte_t *pte; @@ -51538,7 +51583,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -3001,6 +3245,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3011,6 +3255,34 @@ int handle_mm_fault(struct mm_struct *mm if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -51573,7 +51618,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); if (!pud) -@@ -3098,7 +3370,7 @@ static int __init gate_vma_init(void) +@@ -3108,7 +3380,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -51582,9 +51627,9 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure.c ---- linux-2.6.32.16/mm/memory-failure.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/memory-failure.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/memory-failure.c linux-2.6.32.18/mm/memory-failure.c +--- linux-2.6.32.18/mm/memory-failure.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/memory-failure.c 2010-08-11 18:57:32.000000000 -0400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -51603,9 +51648,9 @@ diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c ---- linux-2.6.32.16/mm/mempolicy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/mempolicy.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/mempolicy.c linux-2.6.32.18/mm/mempolicy.c +--- linux-2.6.32.18/mm/mempolicy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/mempolicy.c 2010-08-11 18:57:32.000000000 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -51686,9 +51731,9 @@ diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c ---- linux-2.6.32.16/mm/migrate.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/migrate.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/migrate.c linux-2.6.32.18/mm/migrate.c +--- linux-2.6.32.18/mm/migrate.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/migrate.c 2010-08-11 18:57:32.000000000 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -51714,9 +51759,9 @@ diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c ---- linux-2.6.32.16/mm/mlock.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/mlock.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/mlock.c linux-2.6.32.18/mm/mlock.c +--- linux-2.6.32.18/mm/mlock.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/mlock.c 2010-08-11 18:57:32.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -51785,9 +51830,9 @@ diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c ---- linux-2.6.32.16/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/mmap.c 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/mmap.c linux-2.6.32.18/mm/mmap.c +--- linux-2.6.32.18/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/mmap.c 2010-08-11 18:57:32.000000000 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -52856,9 +52901,9 @@ diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c ---- linux-2.6.32.16/mm/mprotect.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/mprotect.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/mprotect.c linux-2.6.32.18/mm/mprotect.c +--- linux-2.6.32.18/mm/mprotect.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/mprotect.c 2010-08-11 18:57:32.000000000 -0400 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -53056,9 +53101,9 @@ diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c ---- linux-2.6.32.16/mm/mremap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/mremap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/mremap.c linux-2.6.32.18/mm/mremap.c +--- linux-2.6.32.18/mm/mremap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/mremap.c 2010-08-11 18:57:32.000000000 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -53159,9 +53204,9 @@ diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c ---- linux-2.6.32.16/mm/nommu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/nommu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/nommu.c linux-2.6.32.18/mm/nommu.c +--- linux-2.6.32.18/mm/nommu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/nommu.c 2010-08-11 18:57:32.000000000 -0400 @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -53178,9 +53223,9 @@ diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c ---- linux-2.6.32.16/mm/page_alloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/page_alloc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/page_alloc.c linux-2.6.32.18/mm/page_alloc.c +--- linux-2.6.32.18/mm/page_alloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/page_alloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page int bad = 0; int wasMlocked = __TestClearPageMlocked(page); @@ -53237,9 +53282,9 @@ diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c struct zone *zone, unsigned long zonesize) {} #endif /* CONFIG_SPARSEMEM */ -diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c ---- linux-2.6.32.16/mm/percpu.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/percpu.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/percpu.c linux-2.6.32.18/mm/percpu.c +--- linux-2.6.32.18/mm/percpu.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/percpu.c 2010-08-11 18:57:32.000000000 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -53249,9 +53294,9 @@ diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c ---- linux-2.6.32.16/mm/rmap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/rmap.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/rmap.c linux-2.6.32.18/mm/rmap.c +--- linux-2.6.32.18/mm/rmap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/rmap.c 2010-08-11 18:57:32.000000000 -0400 @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -53280,9 +53325,9 @@ diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c ---- linux-2.6.32.16/mm/shmem.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/shmem.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/shmem.c linux-2.6.32.18/mm/shmem.c +--- linux-2.6.32.18/mm/shmem.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/shmem.c 2010-08-11 18:57:32.000000000 -0400 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -53292,9 +53337,9 @@ diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c ---- linux-2.6.32.16/mm/slab.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/slab.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/slab.c linux-2.6.32.18/mm/slab.c +--- linux-2.6.32.18/mm/slab.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/slab.c 2010-08-11 18:57:32.000000000 -0400 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -53400,9 +53445,9 @@ diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c ---- linux-2.6.32.16/mm/slob.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/slob.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/slob.c linux-2.6.32.18/mm/slob.c +--- linux-2.6.32.18/mm/slob.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/slob.c 2010-08-11 18:57:32.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -53723,9 +53768,9 @@ diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c ---- linux-2.6.32.16/mm/slub.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/slub.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/slub.c linux-2.6.32.18/mm/slub.c +--- linux-2.6.32.18/mm/slub.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/slub.c 2010-08-11 18:57:32.000000000 -0400 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * page = virt_to_head_page(x); @@ -53888,9 +53933,9 @@ diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c ---- linux-2.6.32.16/mm/util.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/util.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/util.c linux-2.6.32.18/mm/util.c +--- linux-2.6.32.18/mm/util.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/util.c 2010-08-11 18:57:32.000000000 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -53904,9 +53949,9 @@ diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c ---- linux-2.6.32.16/mm/vmalloc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/vmalloc.c 2010-07-09 14:50:44.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/vmalloc.c linux-2.6.32.18/mm/vmalloc.c +--- linux-2.6.32.18/mm/vmalloc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/vmalloc.c 2010-08-11 18:57:32.000000000 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -54134,9 +54179,9 @@ diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.32.16/mm/vmstat.c linux-2.6.32.16/mm/vmstat.c ---- linux-2.6.32.16/mm/vmstat.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/mm/vmstat.c 2010-07-16 21:06:43.000000000 -0400 +diff -urNp linux-2.6.32.18/mm/vmstat.c linux-2.6.32.18/mm/vmstat.c +--- linux-2.6.32.18/mm/vmstat.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/mm/vmstat.c 2010-08-11 18:57:32.000000000 -0400 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -54185,9 +54230,9 @@ diff -urNp linux-2.6.32.16/mm/vmstat.c linux-2.6.32.16/mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c ---- linux-2.6.32.16/net/8021q/vlan.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/8021q/vlan.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/8021q/vlan.c linux-2.6.32.18/net/8021q/vlan.c +--- linux-2.6.32.18/net/8021q/vlan.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/8021q/vlan.c 2010-08-11 18:57:32.000000000 -0400 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -54198,9 +54243,9 @@ diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c ---- linux-2.6.32.16/net/atm/atm_misc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/atm/atm_misc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/atm/atm_misc.c linux-2.6.32.18/net/atm/atm_misc.c +--- linux-2.6.32.18/net/atm/atm_misc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/atm/atm_misc.c 2010-08-11 18:57:32.000000000 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -54237,9 +54282,9 @@ diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c ---- linux-2.6.32.16/net/atm/proc.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/atm/proc.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/atm/proc.c linux-2.6.32.18/net/atm/proc.c +--- linux-2.6.32.18/net/atm/proc.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/atm/proc.c 2010-08-11 18:57:32.000000000 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -54253,9 +54298,9 @@ diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources.c ---- linux-2.6.32.16/net/atm/resources.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/atm/resources.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/atm/resources.c linux-2.6.32.18/net/atm/resources.c +--- linux-2.6.32.18/net/atm/resources.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/atm/resources.c 2010-08-11 18:57:32.000000000 -0400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -54274,9 +54319,9 @@ diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br_private.h ---- linux-2.6.32.16/net/bridge/br_private.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/bridge/br_private.h 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/bridge/br_private.h linux-2.6.32.18/net/bridge/br_private.h +--- linux-2.6.32.18/net/bridge/br_private.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/bridge/br_private.h 2010-08-11 18:57:32.000000000 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -54286,9 +54331,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_stp_if.c ---- linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/bridge/br_stp_if.c linux-2.6.32.18/net/bridge/br_stp_if.c +--- linux-2.6.32.18/net/bridge/br_stp_if.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/bridge/br_stp_if.c 2010-08-11 18:57:32.000000000 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -54298,9 +54343,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/br_sysfs_if.c ---- linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-09 14:50:38.000000000 -0400 +diff -urNp linux-2.6.32.18/net/bridge/br_sysfs_if.c linux-2.6.32.18/net/bridge/br_sysfs_if.c +--- linux-2.6.32.18/net/bridge/br_sysfs_if.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/bridge/br_sysfs_if.c 2010-08-11 18:57:32.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -54310,9 +54355,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/b .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c ---- linux-2.6.32.16/net/core/dev.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/core/dev.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/core/dev.c linux-2.6.32.18/net/core/dev.c +--- linux-2.6.32.18/net/core/dev.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/core/dev.c 2010-08-11 18:57:32.000000000 -0400 @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -54331,9 +54376,9 @@ diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c { struct list_head *list = &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c ---- linux-2.6.32.16/net/core/flow.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/core/flow.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/core/flow.c linux-2.6.32.18/net/core/flow.c +--- linux-2.6.32.18/net/core/flow.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/core/flow.c 2010-08-11 18:57:33.000000000 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -54361,9 +54406,9 @@ diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids/ccid3.c ---- linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/dccp/ccids/ccid3.c linux-2.6.32.18/net/dccp/ccids/ccid3.c +--- linux-2.6.32.18/net/dccp/ccids/ccid3.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/dccp/ccids/ccid3.c 2010-08-11 18:57:33.000000000 -0400 @@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -54373,9 +54418,9 @@ diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids #endif /* -diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h ---- linux-2.6.32.16/net/dccp/dccp.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/dccp/dccp.h 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/dccp/dccp.h linux-2.6.32.18/net/dccp/dccp.h +--- linux-2.6.32.18/net/dccp/dccp.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/dccp/dccp.h 2010-08-11 18:57:33.000000000 -0400 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) @@ -54389,9 +54434,9 @@ diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/decnet/sysctl_net_decnet.c linux-2.6.32.18/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.18/net/decnet/sysctl_net_decnet.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/decnet/sysctl_net_decnet.c 2010-08-11 18:57:33.000000000 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -54410,9 +54455,9 @@ diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/de return -EFAULT; *lenp = len; -diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/inet_hashtables.c ---- linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/inet_hashtables.c linux-2.6.32.18/net/ipv4/inet_hashtables.c +--- linux-2.6.32.18/net/ipv4/inet_hashtables.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/inet_hashtables.c 2010-08-11 18:57:33.000000000 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -54437,9 +54482,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-11 18:57:33.000000000 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -54449,9 +54494,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1 if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/tcp_ipv4.c linux-2.6.32.18/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.18/net/ipv4/tcp_ipv4.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/tcp_ipv4.c 2010-08-11 18:58:10.000000000 -0400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -54462,7 +54507,17 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4 #ifdef CONFIG_TCP_MD5SIG static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, -@@ -1603,12 +1606,20 @@ int tcp_v4_rcv(struct sk_buff *skb) +@@ -1542,6 +1545,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc + return 0; + + reset: ++#ifdef CONFIG_GRKERNSEC_BLACKHOLE ++ if (!grsec_enable_blackhole) ++#endif + tcp_v4_send_reset(rsk, skb); + discard: + kfree_skb(skb); +@@ -1603,12 +1609,20 @@ int tcp_v4_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -54485,7 +54540,7 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) goto discard_and_relse; -@@ -1650,6 +1661,10 @@ no_tcp_socket: +@@ -1650,6 +1664,10 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -54496,9 +54551,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4 tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/tcp_minisocks.c linux-2.6.32.18/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.18/net/ipv4/tcp_minisocks.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/tcp_minisocks.c 2010-08-11 18:57:33.000000000 -0400 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -54521,9 +54576,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_probe.c ---- linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/tcp_probe.c linux-2.6.32.18/net/ipv4/tcp_probe.c +--- linux-2.6.32.18/net/ipv4/tcp_probe.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/tcp_probe.c 2010-08-11 18:57:33.000000000 -0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -54533,9 +54588,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_pro return -EFAULT; cnt += width; } -diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_timer.c ---- linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/tcp_timer.c linux-2.6.32.18/net/ipv4/tcp_timer.c +--- linux-2.6.32.18/net/ipv4/tcp_timer.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/tcp_timer.c 2010-08-11 18:57:33.000000000 -0400 @@ -21,6 +21,10 @@ #include <linux/module.h> #include <net/tcp.h> @@ -54561,9 +54616,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_tim if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c ---- linux-2.6.32.16/net/ipv4/udp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv4/udp.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv4/udp.c linux-2.6.32.18/net/ipv4/udp.c +--- linux-2.6.32.18/net/ipv4/udp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv4/udp.c 2010-08-11 18:57:33.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -54633,9 +54688,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c ---- linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv6/exthdrs.c linux-2.6.32.18/net/ipv6/exthdrs.c +--- linux-2.6.32.18/net/ipv6/exthdrs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv6/exthdrs.c 2010-08-11 18:57:33.000000000 -0400 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -54645,9 +54700,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c ---- linux-2.6.32.16/net/ipv6/raw.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv6/raw.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv6/raw.c linux-2.6.32.18/net/ipv6/raw.c +--- linux-2.6.32.18/net/ipv6/raw.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv6/raw.c 2010-08-11 18:57:33.000000000 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -54657,9 +54712,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv6/tcp_ipv6.c linux-2.6.32.18/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.18/net/ipv6/tcp_ipv6.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv6/tcp_ipv6.c 2010-08-11 18:58:39.000000000 -0400 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -54671,7 +54726,17 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6 static void tcp_v6_hash(struct sock *sk) { if (sk->sk_state != TCP_CLOSE) { -@@ -1655,12 +1659,20 @@ static int tcp_v6_rcv(struct sk_buff *sk +@@ -1578,6 +1582,9 @@ static int tcp_v6_do_rcv(struct sock *sk + return 0; + + reset: ++#ifdef CONFIG_GRKERNSEC_BLACKHOLE ++ if (!grsec_enable_blackhole) ++#endif + tcp_v6_send_reset(sk, skb); + discard: + if (opt_skb) +@@ -1655,12 +1662,20 @@ static int tcp_v6_rcv(struct sk_buff *sk TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -54694,7 +54759,7 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) goto discard_and_relse; -@@ -1700,6 +1712,10 @@ no_tcp_socket: +@@ -1700,6 +1715,10 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -54705,9 +54770,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6 tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c ---- linux-2.6.32.16/net/ipv6/udp.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/ipv6/udp.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/ipv6/udp.c linux-2.6.32.18/net/ipv6/udp.c +--- linux-2.6.32.18/net/ipv6/udp.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/ipv6/udp.c 2010-08-11 18:57:33.000000000 -0400 @@ -49,6 +49,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -54729,9 +54794,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c 2010-08-11 18:57:33.000000000 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -54854,9 +54919,9 @@ diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac80211/ieee80211_i.h ---- linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/ieee80211_i.h linux-2.6.32.18/net/mac80211/ieee80211_i.h +--- linux-2.6.32.18/net/mac80211/ieee80211_i.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/ieee80211_i.h 2010-08-11 18:57:33.000000000 -0400 @@ -635,7 +635,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -54866,9 +54931,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac802 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/iface.c ---- linux-2.6.32.16/net/mac80211/iface.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/iface.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/iface.c linux-2.6.32.18/net/mac80211/iface.c +--- linux-2.6.32.18/net/mac80211/iface.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/iface.c 2010-08-11 18:57:33.000000000 -0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -54923,9 +54988,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main.c ---- linux-2.6.32.16/net/mac80211/main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/main.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/main.c linux-2.6.32.18/net/mac80211/main.c +--- linux-2.6.32.18/net/mac80211/main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/main.c 2010-08-11 18:57:33.000000000 -0400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -54935,9 +55000,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c ---- linux-2.6.32.16/net/mac80211/pm.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/pm.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/pm.c linux-2.6.32.18/net/mac80211/pm.c +--- linux-2.6.32.18/net/mac80211/pm.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/pm.c 2010-08-11 18:57:33.000000000 -0400 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -54947,9 +55012,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate.c ---- linux-2.6.32.16/net/mac80211/rate.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/rate.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/rate.c linux-2.6.32.18/net/mac80211/rate.c +--- linux-2.6.32.18/net/mac80211/rate.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/rate.c 2010-08-11 18:57:33.000000000 -0400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -54959,9 +55024,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c ---- linux-2.6.32.16/net/mac80211/tx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/tx.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/tx.c linux-2.6.32.18/net/mac80211/tx.c +--- linux-2.6.32.18/net/mac80211/tx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/tx.c 2010-08-11 18:57:33.000000000 -0400 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct return cpu_to_le16(dur); } @@ -54971,9 +55036,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c struct net_device *dev) { return local == wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util.c ---- linux-2.6.32.16/net/mac80211/util.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/mac80211/util.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/mac80211/util.c linux-2.6.32.18/net/mac80211/util.c +--- linux-2.6.32.18/net/mac80211/util.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/mac80211/util.c 2010-08-11 18:57:33.000000000 -0400 @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -54991,9 +55056,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" -diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c ---- linux-2.6.32.16/net/sctp/socket.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/sctp/socket.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/sctp/socket.c linux-2.6.32.18/net/sctp/socket.c +--- linux-2.6.32.18/net/sctp/socket.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/sctp/socket.c 2010-08-11 18:57:33.000000000 -0400 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -55011,9 +55076,9 @@ diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c ---- linux-2.6.32.16/net/socket.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/socket.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/socket.c linux-2.6.32.18/net/socket.c +--- linux-2.6.32.18/net/socket.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/socket.c 2010-08-11 18:57:33.000000000 -0400 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -55168,9 +55233,9 @@ diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-11 18:57:33.000000000 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -= *ppos; if (len > *lenp) @@ -55180,9 +55245,9 @@ diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/su return -EFAULT; *lenp = len; *ppos += len; -diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c ---- linux-2.6.32.16/net/sysctl_net.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/sysctl_net.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/sysctl_net.c linux-2.6.32.18/net/sysctl_net.c +--- linux-2.6.32.18/net/sysctl_net.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/sysctl_net.c 2010-08-11 18:57:33.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -55192,9 +55257,9 @@ diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c ---- linux-2.6.32.16/net/tipc/socket.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/tipc/socket.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/tipc/socket.c linux-2.6.32.18/net/tipc/socket.c +--- linux-2.6.32.18/net/tipc/socket.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/tipc/socket.c 2010-08-11 18:57:33.000000000 -0400 @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, } else { if (res == 0) @@ -55207,9 +55272,9 @@ diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c sock->state = SS_DISCONNECTING; } -diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c ---- linux-2.6.32.16/net/unix/af_unix.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/unix/af_unix.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/unix/af_unix.c linux-2.6.32.18/net/unix/af_unix.c +--- linux-2.6.32.18/net/unix/af_unix.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/unix/af_unix.c 2010-08-11 18:57:33.000000000 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -55267,9 +55332,9 @@ diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext.c ---- linux-2.6.32.16/net/wireless/wext.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/wireless/wext.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/wireless/wext.c linux-2.6.32.18/net/wireless/wext.c +--- linux-2.6.32.18/net/wireless/wext.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/wireless/wext.c 2010-08-11 18:57:33.000000000 -0400 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc */ @@ -55280,9 +55345,9 @@ diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext /* Allow userspace to GET more than max so * we can support any size GET requests. * There is still a limit : -ENOMEM. -diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_policy.c ---- linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/net/xfrm/xfrm_policy.c linux-2.6.32.18/net/xfrm/xfrm_policy.c +--- linux-2.6.32.18/net/xfrm/xfrm_policy.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/net/xfrm/xfrm_policy.c 2010-08-11 18:57:33.000000000 -0400 @@ -1477,7 +1477,7 @@ free_dst: goto out; } @@ -55310,9 +55375,9 @@ diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/samples/kobject/kset-example.c ---- linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/samples/kobject/kset-example.c linux-2.6.32.18/samples/kobject/kset-example.c +--- linux-2.6.32.18/samples/kobject/kset-example.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/samples/kobject/kset-example.c 2010-08-11 18:57:33.000000000 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -55322,9 +55387,9 @@ diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/sample .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/fixdep.c ---- linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/basic/fixdep.c linux-2.6.32.18/scripts/basic/fixdep.c +--- linux-2.6.32.18/scripts/basic/fixdep.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/basic/fixdep.c 2010-08-11 18:57:33.000000000 -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen static void parse_config_file(char *map, size_t len) @@ -55346,9 +55411,9 @@ diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/ if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c ---- linux-2.6.32.16/scripts/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/kallsyms.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/kallsyms.c linux-2.6.32.18/scripts/kallsyms.c +--- linux-2.6.32.18/scripts/kallsyms.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/kallsyms.c 2010-08-11 18:57:33.000000000 -0400 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -55364,9 +55429,9 @@ diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/file2alias.c ---- linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/mod/file2alias.c linux-2.6.32.18/scripts/mod/file2alias.c +--- linux-2.6.32.18/scripts/mod/file2alias.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/mod/file2alias.c 2010-08-11 18:57:33.000000000 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -55421,9 +55486,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/ sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/modpost.c ---- linux-2.6.32.16/scripts/mod/modpost.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/mod/modpost.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/mod/modpost.c linux-2.6.32.18/scripts/mod/modpost.c +--- linux-2.6.32.18/scripts/mod/modpost.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/mod/modpost.c 2010-08-11 18:57:33.000000000 -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -55491,9 +55556,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/mod goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/modpost.h ---- linux-2.6.32.16/scripts/mod/modpost.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/mod/modpost.h 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/mod/modpost.h linux-2.6.32.18/scripts/mod/modpost.h +--- linux-2.6.32.18/scripts/mod/modpost.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/mod/modpost.h 2010-08-11 18:57:33.000000000 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -55513,9 +55578,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/mod struct module { struct module *next; -diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/sumversion.c ---- linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/mod/sumversion.c linux-2.6.32.18/scripts/mod/sumversion.c +--- linux-2.6.32.18/scripts/mod/sumversion.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/mod/sumversion.c 2010-08-11 18:57:33.000000000 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -55525,9 +55590,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo.c ---- linux-2.6.32.16/scripts/pnmtologo.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/scripts/pnmtologo.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/scripts/pnmtologo.c linux-2.6.32.18/scripts/pnmtologo.c +--- linux-2.6.32.18/scripts/pnmtologo.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/scripts/pnmtologo.c 2010-08-11 18:57:33.000000000 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -55554,9 +55619,9 @@ diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commoncap.c ---- linux-2.6.32.16/security/commoncap.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/commoncap.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/commoncap.c linux-2.6.32.18/security/commoncap.c +--- linux-2.6.32.18/security/commoncap.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/commoncap.c 2010-08-11 18:57:33.000000000 -0400 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -55579,9 +55644,9 @@ diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commonc return 0; } -diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/security/integrity/ima/ima_api.c ---- linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/integrity/ima/ima_api.c linux-2.6.32.18/security/integrity/ima/ima_api.c +--- linux-2.6.32.18/security/integrity/ima/ima_api.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/integrity/ima/ima_api.c 2010-08-11 18:57:33.000000000 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -55591,9 +55656,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/secu entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/security/integrity/ima/ima_fs.c ---- linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/integrity/ima/ima_fs.c linux-2.6.32.18/security/integrity/ima/ima_fs.c +--- linux-2.6.32.18/security/integrity/ima/ima_fs.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/integrity/ima/ima_fs.c 2010-08-11 18:57:33.000000000 -0400 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -55609,9 +55674,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/secur return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security/integrity/ima/ima.h ---- linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/integrity/ima/ima.h linux-2.6.32.18/security/integrity/ima/ima.h +--- linux-2.6.32.18/security/integrity/ima/ima.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/integrity/ima/ima.h 2010-08-11 18:57:33.000000000 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -55623,9 +55688,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/security/integrity/ima/ima_queue.c ---- linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/integrity/ima/ima_queue.c linux-2.6.32.18/security/integrity/ima/ima_queue.c +--- linux-2.6.32.18/security/integrity/ima/ima_queue.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/integrity/ima/ima_queue.c 2010-08-11 18:57:33.000000000 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -55635,10 +55700,10 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/se key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig ---- linux-2.6.32.16/security/Kconfig 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/Kconfig 2010-07-09 14:50:39.000000000 -0400 -@@ -4,6 +4,499 @@ +diff -urNp linux-2.6.32.18/security/Kconfig linux-2.6.32.18/security/Kconfig +--- linux-2.6.32.18/security/Kconfig 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/Kconfig 2010-08-11 22:24:24.000000000 -0400 +@@ -4,6 +4,498 @@ menu "Security options" @@ -55655,6 +55720,10 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig + default 47 if !PAX_PER_CPU_PGD + default 42 if PAX_PER_CPU_PGD + ++ config PAX_ENABLE_PAE ++ bool ++ default y if (X86_32 && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUM4 || MK7 || MK8 || MVIAC7 || MPSC || MCORE2 || MATOM)) ++ +config PAX + bool "Enable various PaX features" + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86) @@ -55774,7 +55843,7 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig + +config PAX_PAGEEXEC + bool "Paging based non-executable pages" -+ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) ++ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MATOM || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) + select S390_SWITCH_AMODE if S390 + select S390_EXEC_PROTECT if S390 + help @@ -55875,9 +55944,10 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig + NOTE: you can use the 'chpax' or 'paxctl' utilities to control + this feature on a per file basis. + -+config PAX_NOELFRELOCS -+ bool "Disallow ELF text relocations" -+ depends on PAX_MPROTECT && !PAX_ETEXECRELOCS && (IA64 || PPC || X86) ++config PAX_ELFRELOCS ++ bool "Allow ELF text relocations (read help)" ++ depends on PAX_MPROTECT && (PAX_ETEXECRELOCS || (IA64 || PPC || X86)) ++ default n + help + Non-executable pages and mprotect() restrictions are effective + in preventing the introduction of new executable code into an @@ -55891,14 +55961,8 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig + the former approach is beyond PaX, the latter can be prevented + by having only PIC ELF libraries on one's system (which do not + need to relocate their code). If you are sure this is your case, -+ then enable this option otherwise be careful as you may not even -+ be able to boot or log on your system (for example, some PAM -+ modules are erroneously compiled as non-PIC by default). -+ -+ NOTE: if you are using dynamic ELF executables (as suggested -+ when using ASLR) then you must have made sure that you linked -+ your files using the PIC version of crt1 (the et_dyn.tar.gz package -+ referenced there has already been updated to support this). ++ as is the case with all modern Linux distributions, then leave ++ this option disabled. You should say 'n' here. + +config PAX_ETEXECRELOCS + bool "Allow ELF ET_EXEC text relocations" @@ -56138,7 +56202,7 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig config KEYS bool "Enable access key retention support" help -@@ -146,7 +639,7 @@ config INTEL_TXT +@@ -146,7 +638,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX @@ -56147,9 +56211,9 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr.c ---- linux-2.6.32.16/security/min_addr.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/security/min_addr.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/security/min_addr.c linux-2.6.32.18/security/min_addr.c +--- linux-2.6.32.18/security/min_addr.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/security/min_addr.c 2010-08-11 18:57:33.000000000 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -56166,9 +56230,9 @@ diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr } /* -diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/codecs/onyx.c ---- linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/aoa/codecs/onyx.c linux-2.6.32.18/sound/aoa/codecs/onyx.c +--- linux-2.6.32.18/sound/aoa/codecs/onyx.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/aoa/codecs/onyx.c 2010-08-11 18:57:33.000000000 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -56197,9 +56261,9 @@ diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/cod onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/oss/pcm_oss.c ---- linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/core/oss/pcm_oss.c linux-2.6.32.18/sound/core/oss/pcm_oss.c +--- linux-2.6.32.18/sound/core/oss/pcm_oss.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/core/oss/pcm_oss.c 2010-08-11 18:57:33.000000000 -0400 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -56211,9 +56275,9 @@ diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/o #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/seq/seq_lock.h ---- linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/core/seq/seq_lock.h linux-2.6.32.18/sound/core/seq/seq_lock.h +--- linux-2.6.32.18/sound/core/seq/seq_lock.h 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/core/seq/seq_lock.h 2010-08-11 18:57:33.000000000 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -56229,9 +56293,9 @@ diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/ #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/mts64.c ---- linux-2.6.32.16/sound/drivers/mts64.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/drivers/mts64.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/drivers/mts64.c linux-2.6.32.18/sound/drivers/mts64.c +--- linux-2.6.32.18/sound/drivers/mts64.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/drivers/mts64.c 2010-08-11 18:57:33.000000000 -0400 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -56280,9 +56344,9 @@ diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/m return 0; } -diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/drivers/portman2x4.c ---- linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/drivers/portman2x4.c linux-2.6.32.18/sound/drivers/portman2x4.c +--- linux-2.6.32.18/sound/drivers/portman2x4.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/drivers/portman2x4.c 2010-08-11 18:57:33.000000000 -0400 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -56292,9 +56356,9 @@ diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/driv int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_audio.c ---- linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/oss/sb_audio.c linux-2.6.32.18/sound/oss/sb_audio.c +--- linux-2.6.32.18/sound/oss/sb_audio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/oss/sb_audio.c 2010-08-11 18:57:33.000000000 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -56304,9 +56368,9 @@ diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_aud if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/ac97/ac97_codec.c linux-2.6.32.18/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.18/sound/pci/ac97/ac97_codec.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/ac97/ac97_codec.c 2010-08-11 18:57:33.000000000 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -56316,9 +56380,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/ac97/ac97_patch.c linux-2.6.32.18/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.18/sound/pci/ac97/ac97_patch.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/ac97/ac97_patch.c 2010-08-11 18:57:33.000000000 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -56625,9 +56689,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370.c ---- linux-2.6.32.16/sound/pci/ens1370.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/ens1370.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/ens1370.c linux-2.6.32.18/sound/pci/ens1370.c +--- linux-2.6.32.18/sound/pci/ens1370.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/ens1370.c 2010-08-11 18:57:33.000000000 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ @@ -56637,9 +56701,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370 }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c ---- linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c 2010-08-11 18:57:33.000000000 -0400 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); @@ -56655,9 +56719,9 @@ diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound } -diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8x0.c ---- linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/intel8x0.c linux-2.6.32.18/sound/pci/intel8x0.c +--- linux-2.6.32.18/sound/pci/intel8x0.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/intel8x0.c 2010-08-11 18:57:33.000000000 -0400 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ @@ -56676,9 +56740,9 @@ diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel8x0m.c ---- linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/sound/pci/intel8x0m.c linux-2.6.32.18/sound/pci/intel8x0m.c +--- linux-2.6.32.18/sound/pci/intel8x0m.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/sound/pci/intel8x0m.c 2010-08-11 18:57:33.000000000 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ @@ -56697,9 +56761,9 @@ diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio.c ---- linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/usr/gen_init_cpio.c linux-2.6.32.18/usr/gen_init_cpio.c +--- linux-2.6.32.18/usr/gen_init_cpio.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/usr/gen_init_cpio.c 2010-08-11 18:57:33.000000000 -0400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -56722,9 +56786,9 @@ diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio } else break; } -diff -urNp linux-2.6.32.16/virt/kvm/kvm_main.c linux-2.6.32.16/virt/kvm/kvm_main.c ---- linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-05 14:14:00.000000000 -0400 -+++ linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-09 14:50:39.000000000 -0400 +diff -urNp linux-2.6.32.18/virt/kvm/kvm_main.c linux-2.6.32.18/virt/kvm/kvm_main.c +--- linux-2.6.32.18/virt/kvm/kvm_main.c 2010-08-10 13:45:57.000000000 -0400 ++++ linux-2.6.32.18/virt/kvm/kvm_main.c 2010-08-11 18:57:33.000000000 -0400 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 5f4cb8c2b4..ec5f8db345 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.15 -# Wed Jun 16 07:30:34 2010 +# Linux kernel version: 2.6.32.16 +# Thu Aug 12 15:19:19 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1059,6 +1059,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y @@ -4478,7 +4479,7 @@ CONFIG_PAX_PAGEEXEC=y # CONFIG_PAX_SEGMEXEC is not set CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y -CONFIG_PAX_NOELFRELOCS=y +# CONFIG_PAX_ELFRELOCS is not set CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 912954526a..ff2597f754 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.32.16 _kernver=2.6.32 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -16,6 +16,7 @@ install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 http://vserver.13thfloor.at/Experimental/patch-2.6.32.16-vs2.3.0.36.29.4.diff + x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch kernelconfig.x86 " subpackages="$pkgname-dev" @@ -29,10 +30,15 @@ prepare() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 fi - for i in ../*.diff ../*.patch; do - [ -f $i ] || continue - msg "Applying $i..." - patch -p1 -N < $i || return 1 + # first apply patches in specified order + for i in $source; do + i=${i##*/} + case $i in + *.patch|*.diff) + msg "Applying $i..." + patch -s -p1 -N < "$srcdir"/$i || return 1 + ;; + esac done mkdir -p "$srcdir"/build @@ -120,4 +126,5 @@ dev() { md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 24354a6fd8798792b9ee21f086721cd9 patch-2.6.32.16-vs2.3.0.36.29.4.diff +a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" diff --git a/main/linux-vserver/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch b/main/linux-vserver/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch new file mode 100644 index 0000000000..a4f94d7fa4 --- /dev/null +++ b/main/linux-vserver/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch @@ -0,0 +1,48 @@ +From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001 +From: H. Peter Anvin <hpa@zytor.com> +Date: Wed, 17 Feb 2010 18:32:06 -0800 +Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info + +When we restore the screen content after a mode change, we return the +cursor to its former position. However, we need to also update +boot_params.screen_info accordingly, so that the decompression code +knows where on the screen the cursor is. Just in case the video BIOS +does something extra screwy, read the cursor position back from the +BIOS instead of relying on it doing the right thing. + +While we're at it, make sure we cap the cursor position to the new +screen coordinates. + +Reported-by: Wim Osterholt <wim@djo.tudelft.nl> +Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 +Signed-off-by: H. Peter Anvin <hpa@zytor.com> +--- + arch/x86/boot/video.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c +index f767164..43eda28 100644 +--- a/arch/x86/boot/video.c ++++ b/arch/x86/boot/video.c +@@ -298,11 +298,18 @@ static void restore_screen(void) + } + + /* Restore cursor position */ ++ if (saved.curx >= xs) ++ saved.curx = xs-1; ++ if (saved.cury >= ys) ++ saved.cury = ys-1; ++ + initregs(&ireg); + ireg.ah = 0x02; /* Set cursor position */ + ireg.dh = saved.cury; + ireg.dl = saved.curx; + intcall(0x10, &ireg, NULL); ++ ++ store_cursor_position(); + } + + void set_video(void) +-- +1.7.1 + diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD index ca9e323f81..e683200d76 100644 --- a/main/lua-posix/APKBUILD +++ b/main/lua-posix/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-posix _name=luaposix -pkgver=5.1.4 -pkgrel=1 +pkgver=5.1.7 +pkgrel=0 pkgdesc="POSIX library for Lua" url="http://luaforge.net/projects/luaposix/" license="MIT" depends="lua" makedepends="lua-dev" -source="http://luaforge.net/frs/download.php/3572/luaposix-$pkgver.tar.gz" +source="http://git.alpinelinux.org/cgit/luaposix/snapshot/luaposix-$pkgver.tar.bz2" replaces="luaposix" build() { @@ -21,4 +21,4 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -md5sums="073019b1a52bfddb94e2521553b47ef5 luaposix-5.1.4.tar.gz" +md5sums="e7ed42536548ebc109bc1cb73f08b1e9 luaposix-5.1.7.tar.bz2" diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index c49ca24daf..938f752d7d 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=1.6 +pkgver=1.6.2 pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="http://www.selenic.com/mercurial" @@ -29,4 +29,4 @@ package() { install -Dm644 contrib/vim/HGAnnotate.vim \ "${vimpath}/syntax/HGAnnotate.vim" || return 1 } -md5sums="e97772cb424d29d9382c41daafa6f92d mercurial-1.6.tar.gz" +md5sums="847359d7488caf8074a69d4b87ca64d2 mercurial-1.6.2.tar.gz" diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index af86c94edb..426ada44be 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,15 +1,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs pkgver=2.0_rc9 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger:/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + mod-deps.patch " license="GPL-2" +prepare() { + cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case "$i" in + *.patch) patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$srcdir"/$pkgname-$pkgver make || return 1 @@ -19,4 +29,5 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="54eb3779916b61c91f91c608dc99667a mkinitfs-2.0_rc9.tar.bz2" +md5sums="54eb3779916b61c91f91c608dc99667a mkinitfs-2.0_rc9.tar.bz2 +ff8fd46b88690e74505f3fe31fae0aff mod-deps.patch" diff --git a/main/mkinitfs/mod-deps.patch b/main/mkinitfs/mod-deps.patch new file mode 100644 index 0000000000..bc08d61859 --- /dev/null +++ b/main/mkinitfs/mod-deps.patch @@ -0,0 +1,23 @@ +commit 18f70462c7fefe7cadcc1cd618b88de565a0f717 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon Aug 9 15:56:35 2010 +0000 + + mkinitfs: handle the case when modules.dep has full path + + we do that by simply removing the prepend string + +diff --git a/mkinitfs.in b/mkinitfs.in +index c3d8354..8246d07 100755 +--- a/mkinitfs.in ++++ b/mkinitfs.in +@@ -92,6 +92,10 @@ BEGIN { + modulesdep="modules.dep"; + FS = ": "; + while ( (getline < modulesdep) > 0) { ++ if (substr($0,1,1) == "/") { ++ gsub(prepend, "", $1); ++ gsub(prepend, "", $2); ++ } + deps[$1] = $2; + } + } diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 48e1d46380..0bbad2a05d 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.48 -pkgrel=1 +pkgver=5.1.49 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" pkgusers="mysql" @@ -79,6 +79,6 @@ client() { done } -md5sums="d04c54d1cfbd8c6c8650c8d078f885b2 mysql-5.1.48.tar.gz +md5sums="a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index 1c12ef0c48..c1555b2f57 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=nano -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=0 pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." url="http://www.nano-editor.org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="6304308afb1f7ef4a5e93eb99206632a nano-2.2.4.tar.gz" +md5sums="77a10a49589f975ce98350a4527a2ebf nano-2.2.5.tar.gz" diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index ac65b9a8ab..0276a27d37 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g -pkgver=2010.5.22 +pkgver=2010.8.8 pkgrel=0 pkgdesc="A userspace ntfs driver with write support" url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -27,4 +27,4 @@ package() { } -md5sums="caa08c73220a7106c76f697b7a7915ec ntfs-3g-2010.5.22.tgz" +md5sums="6c109746c2708f679725a2ea441c61c6 ntfs-3g-2010.8.8.tgz" diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD index 87961b1f4f..56c1efd5ec 100644 --- a/main/perl-html-parser/APKBUILD +++ b/main/perl-html-parser/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.64 +pkgver=3.66 pkgrel=1 pkgdesc="Parse section of HTML documents" url="http://search.cpan.org/~gaas/HTML-Parser-3.60/" @@ -23,4 +23,4 @@ build() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="26ceb6357e855b9e7aad5a5fd66d493e HTML-Parser-3.64.tar.gz" +md5sums="0ef1cad08c85f56ca2dfcdafdc820842 HTML-Parser-3.66.tar.gz" diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD index 8643038afb..b23fd63ab5 100644 --- a/main/perl-netaddr-ip/APKBUILD +++ b/main/perl-netaddr-ip/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-netaddr-ip _realname=NetAddr-IP -pkgver=4.027 +pkgver=4.028 pkgrel=1 pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets" url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/" @@ -23,4 +23,4 @@ build() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="c4a21a76e5b1b9f4c8e9810b78559d7b NetAddr-IP-4.027.tar.gz" +md5sums="fc1e79db336d0acbe99dff559080c5d1 NetAddr-IP-4.028.tar.gz" diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD index 42643135c6..e1172bd7b2 100644 --- a/main/perl/APKBUILD +++ b/main/perl/APKBUILD @@ -1,7 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Contributor: Leonardo Arena <rnalrd@gmail.com> pkgname=perl pkgver=5.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Larry Wall's Practical Extraction and Report Language" url=http://www.perl.org license="Artistic GPL-2" @@ -9,8 +10,16 @@ source=http://www.perl.com/CPAN/src/perl-${pkgver}.tar.gz depends= subpackages="$pkgname-dev $pkgname-doc miniperl" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd $_builddir + sed -i -e 's/less -R/less/g' ./Configure + sed -i -e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' ./Configure +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir ./Configure -des \ -Dcccdlflags='-fPIC' \ -Dcccdlflags='-fPIC' \ diff --git a/main/php-apc/APKBUILD b/main/php-apc/APKBUILD index 260ae8e970..dc39400fbc 100644 --- a/main/php-apc/APKBUILD +++ b/main/php-apc/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=php-apc -pkgver=3.1.3_p1 +pkgver=3.1.4 _realver=3.1.3p1 -pkgrel=1 +pkgrel=0 pkgdesc="Alternative PHP Cache" url="http://pecl.php.net/package/APC" license="PHP" diff --git a/main/php/APKBUILD b/main/php/APKBUILD index d102fe061a..42d532ab25 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ pkgname=php pkgver=5.3.3 _suhosinver=${pkgver}-0.9.10 -pkgrel=0 +pkgrel=1 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" license="PHP-3" @@ -187,7 +187,7 @@ cli() { } pear() { - depends="php" + depends="php php-cli" mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/share mkdir -p "$subpkgdir"/etc/php diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD index 4077e8d59b..c919d05200 100644 --- a/main/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pidgin -pkgver=2.7.2 +pkgver=2.7.3 pkgrel=0 pkgdesc="graphical multi-protocol instant messaging client for X" url="http://pidgin.im/" @@ -10,7 +10,7 @@ makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev cyrus-sasl-dev ncurses-dev nss-dev" subpackages="$pkgname-dev $pkgname-doc finch libpurple" -source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 +source="http://sourceforge.net/projects/pidgin/files/Pidgin/pidgin-2.7.3.tar.bz2 " _builddir="$srcdir"/$pkgname-$pkgver @@ -59,4 +59,4 @@ libpurple() { mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ "$subpkgdir"/usr/share/ } -md5sums="c23d85bb6a197dd841d1b5585148327d pidgin-2.7.2.tar.bz2" +md5sums="e4bbadadae85e5e008690b52dd51f102 pidgin-2.7.3.tar.bz2" diff --git a/main/py-cairo/APKBUILD b/main/py-cairo/APKBUILD new file mode 100644 index 0000000000..b6f621d8a8 --- /dev/null +++ b/main/py-cairo/APKBUILD @@ -0,0 +1,35 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=py-cairo +pkgver=1.8.10 +pkgrel=0 +pkgdesc="Python bindings for the cairo graphics library" +url="http://cairographics.org/pycairo/" +license="GPL" +depends= +makedepends="python-dev cairo-dev" +install= +subpackages="$pkgname-dev" +source="http://cairographics.org/releases/py2cairo-$pkgver.tar.gz" + + +_builddir="$srcdir"/pycairo-$pkgver + +prepare() { + cd "$_builddir" +} + +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="87421a6a70304120555ba7ba238f3dc3 py2cairo-1.8.10.tar.gz" diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD new file mode 100644 index 0000000000..fe758d3c9a --- /dev/null +++ b/main/py-gobject/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=py-gobject +pkgver=2.20.0 +pkgrel=0 +pkgdesc="Python bindings for the GObject library" +url="http://www.pygtk.org/" +license="GPL" +depends= +makedepends="python-dev glib-dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-$pkgver.tar.bz2" + +_builddir="$srcdir"/pygobject-$pkgver +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="10e1fb79be3d698476a28b1e1b0c5640 pygobject-2.20.0.tar.bz2" diff --git a/main/py-gtk/APKBUILD b/main/py-gtk/APKBUILD new file mode 100644 index 0000000000..5725ea0b34 --- /dev/null +++ b/main/py-gtk/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=py-gtk +pkgver=2.17.0 +pkgrel=1 +pkgdesc="Python bindings for the GTK widget set" +url="http://www.pygtk.org/" +license="LGPL" +depends="py-cairo" +makedepends="libglade-dev py-cairo-dev py-gobject-dev python-dev" +source="http://ftp.gnome.org/pub/gnome/sources/pygtk/2.17/pygtk-$pkgver.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc $pkgname-demo" + +_builddir="$srcdir"/pygtk-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -m644 gtk/gtk-extrafuncs.defs ""$pkgdir"/usr/share/pygtk/2.0/defs/" || return 1 +} + +demo() { + pkgdesc="Demonstration of pygtk" + depends="py-gtk" + mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/pygtk/2.0 + mv "$pkgdir"/usr/bin/pygtk-demo "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/lib/pygtk/2.0/*demo* \ + "$subpkgdir"/usr/lib/pygtk/2.0/ +} +md5sums="43d704343d7ca04a6e4ddd4fa73a3c55 pygtk-2.17.0.tar.bz2" diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 4d3d7100bd..34fede20b1 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=0.12.4 +pkgver=0.12.5 pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" @@ -86,5 +86,5 @@ sparc() { _subsys sparc; } sparc64() { _subsys sparc64; } x86_64() { _subsys x86_64; } -md5sums="93e6b134dff89b2799f57b7d9e0e0fc5 qemu-0.12.4.tar.gz +md5sums="1d02ee0a04dfae2894340273372c1de4 qemu-0.12.5.tar.gz f63f7412f016d8ccddabfd02ea28e748 kqemu.patch" diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index 7c43bbcf02..e937b79f6d 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=snort -pkgver=2.8.6 +pkgver=2.8.6.1 pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" @@ -10,7 +10,7 @@ depends= makedepends="pcre-dev libpcap-dev libnet-dev autoconf automake libtool bison flex" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev" -source="http://ansel.dnsalias.com/alpine/snort-$pkgver.tar.gz +source="http://dev.alpinelinux.org/distfiles/snort-$pkgver.tar.gz snort.initd snort.confd " @@ -40,6 +40,6 @@ package() { install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort } -md5sums="b1c2d3ddb1c0a859a47c5a31d19e60ad snort-2.8.6.tar.gz +md5sums="b1119396a32e9df0d80404e4b6c49166 snort-2.8.6.1.tar.gz ffda56f7c20f5cea1c37c971e0f1d6c9 snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd" diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index 2f6fd09e5c..74e92d2ca6 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=sqlite -pkgver=3.7.0 +pkgver=3.7.0.1 pkgrel=0 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" @@ -44,5 +44,5 @@ package() { install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt } -md5sums="78e94ee3b0d501c4b8ceb5964a32eba3 sqlite-3.7.0.tar.gz +md5sums="d25d7551ba6bb310362cb0e7d4906f25 sqlite-3.7.0.1.tar.gz c1cdbc5544034d9012e421e75a5e4890 license.txt" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index e3e2d93462..9b3dbe4665 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.7.3 +pkgver=1.7.4_p2 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="c22115b47cb2591bceedb914b673f031 sudo-1.7.3.tar.gz" +md5sums="80f3a2506f0ec3e2d75e7d17d95f5341 sudo-1.7.4p2.tar.gz" diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 0a25cb7ce0..31a4bf90ed 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,6 +1,6 @@ # Maintainer:Carlo Landmeter pkgname=transmission -pkgver=2.03 +pkgver=2.04 pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" @@ -47,6 +47,6 @@ cli() { "$subpkgdir"/usr/bin/ } -md5sums="7296c85673ed767a35de3883cb27b545 transmission-2.03.tar.bz2 +md5sums="84fe15eb7e000fdc369def513299358b transmission-2.04.tar.bz2 f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD index 4dadb23092..e46ac9637f 100644 --- a/main/vala/APKBUILD +++ b/main/vala/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vala -pkgver=0.9.3 +pkgver=0.9.5 pkgrel=0 pkgdesc="Compiler for the GObject type system" url="http://live.gnome.org/Vala" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="23514f8cf312a1de8a5fd29b3246c698 vala-0.9.3.tar.gz" +md5sums="3e9769872ca928b1d3b07628ff01c179 vala-0.9.5.tar.gz" diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index 7473a911f5..c2e387c12a 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vsftpd -pkgver=2.2.2 -pkgrel=3 +pkgver=2.3.0 +pkgrel=0 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" license="GPL" @@ -20,6 +20,9 @@ build() { #Enable SSL support patch -p0 -i "$srcdir"/vsftpd-enable-ssl.patch || return 1 + # we dont have libnsl + sed -i -e '/-lnsl/d' vsf_findlibs.sh || return 1 + make || return 1 } @@ -34,7 +37,7 @@ package() { mkdir -p "$pkgdir"/usr/share/empty } -md5sums="6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz +md5sums="90ea878fcfba32f764cce4dc264a3d68 vsftpd-2.3.0.tar.gz f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch 1a56bcc7698dba6490f0007f37c75e9b vsftpd.initd 431dfe7403323e247a88b97beade5d78 vsftpd.confd" diff --git a/main/xdelta3/APKBUILD b/main/xdelta3/APKBUILD index b2e2d281ed..c53238980e 100644 --- a/main/xdelta3/APKBUILD +++ b/main/xdelta3/APKBUILD @@ -1,18 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdelta3 -pkgver=3.0y -pkgrel=1 +pkgver=3.0z +pkgrel=0 pkgdesc="A diff utility which works with binary files" url="http://xdelta.org/" license="GPL" depends= makedepends= source="http://xdelta.googlecode.com/files/${pkgname%3}$pkgver.tar.gz - $pkgname-xz.patch" + " prepare() { cd $srcdir/xdelta$pkgver - patch -p1 -i $srcdir/xdelta3-xz.patch || return 1 } build() { @@ -27,5 +26,4 @@ package() { # make xdelta3module.so || return 1 # install -m644 {xdelta3.py,xdelta3module.so} "$pkgdir"/usr/lib/python2.6/site-packages } -md5sums="8246e6ba89a5a6b9efc24f9552fcf940 xdelta3.0y.tar.gz -fb1e685d810a15f04b7bdbc9a3f3e635 xdelta3-xz.patch" +md5sums="2b5b3c33438cff581ce5c12d66c28b6c xdelta3.0z.tar.gz" diff --git a/main/xdelta3/xdelta3-xz.patch b/main/xdelta3/xdelta3-xz.patch deleted file mode 100644 index 3527406c16..0000000000 --- a/main/xdelta3/xdelta3-xz.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa a/xdelta3-main.h b/xdelta3-main.h ---- a/xdelta3-main.h 2009-01-30 05:59:02.000000000 +0100 -+++ b/xdelta3-main.h 2009-05-13 12:43:00.000000000 +0200 -@@ -355,6 +355,7 @@ - RD_NONEXTERNAL }, - { "bzip2", "-cf", "bzip2", "-dcf", "B", "BZh", 3, 0 }, - { "gzip", "-cf", "gzip", "-dcf", "G", "\037\213", 2, 0 }, -+ { "xz", "-cf", "xz", "-dcf", "Y", "\xfd\x37\x7a\x58\x5a\x00", 2, 0 }, - { "compress", "-cf", "uncompress", "-cf", "Z", "\037\235", 2, 0 }, - - /* TODO: add commandline support for magic-less formats */ - diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index d59e167d38..7d47760f81 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -12,8 +12,8 @@ _kpkgrel=$pkgrel pkgname=${_realname}-${_flavor} pkgver=${pkgver} -_realver=1.21 -_mypkgrel=0 +_realver=1.28 +_mypkgrel=1 pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="Iptables extensions kernel modules" url="http://xtables-addons.sourceforge.net/" @@ -22,7 +22,7 @@ depends="linux-${_flavor}=${_kernelver}" makedepends="linux-${_flavor}-dev=${_kernelver} iptables-dev pkgconfig" install= subpackages= -source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.bz2" +source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.xz" # override kernel's prepare() prepare() { @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" modules_install } -md5sums="b7aa7bddb29719fc92e020ef2eeb95fb xtables-addons-1.21.tar.bz2" +md5sums="b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz" diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD index 46ae1bb25c..00fb44151b 100644 --- a/main/xtables-addons/APKBUILD +++ b/main/xtables-addons/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xtables-addons -pkgver=1.21 -pkgrel=2 +pkgver=1.28 +pkgrel=0 pkgdesc="Netfilter userspace extensions for iptables" url="http://xtables-addons.sourceforge.net/" license="GPL" @@ -9,7 +9,7 @@ depends= makedepends="iptables-dev pkgconfig bash" install= subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz" build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,4 +26,4 @@ package() { make builddir= DESTDIR="$pkgdir" install } -md5sums="b7aa7bddb29719fc92e020ef2eeb95fb xtables-addons-1.21.tar.bz2" +md5sums="b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz" |