diff options
165 files changed, 11867 insertions, 9748 deletions
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD index 2c0c1e2e14f..23c52d909e6 100644 --- a/main/acf-provisioning/APKBUILD +++ b/main/acf-provisioning/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-provisioning -pkgver=0.0.10 +pkgver=0.1.0 pkgrel=0 pkgdesc="ACF for provisioning templated configs to devices" url="http://git.alpinelinux.org/cgit/acf-provisioning" @@ -11,11 +11,11 @@ depends="acf-core lua lua-sql-postgres postgresql-client lua-posixtz" makedepends="" install="$pkgname.post-upgrade" subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="e30ecbbd3ea641da8117cf3dceb6716d acf-provisioning-0.0.10.tar.bz2" +md5sums="1eba02fbfb0a6d1b659d894e03318e84 acf-provisioning-0.1.0.tar.bz2" diff --git a/main/acf-provisioning/acf-provisioning.post-upgrade b/main/acf-provisioning/acf-provisioning.post-upgrade index 53c8726cbf0..a87d9718284 100644 --- a/main/acf-provisioning/acf-provisioning.post-upgrade +++ b/main/acf-provisioning/acf-provisioning.post-upgrade @@ -48,4 +48,35 @@ psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id fi +# if current is older than 0.0.11 we update. +if [ "$(apk version -t $old 0.0.11)" = "<" ]; then + +psql -U postgres -c "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 450 SIP', '2')" provisioning +psql -U postgres -c "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 550/560 SIP', '3')" provisioning +psql -U postgres -c "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom VVX 1500', '6')" provisioning +psql -U postgres -c "UPDATE provisioning_classes SET label='Polycom SoundStation IP 5000/6000/7000 SIP', seq='5' WHERE label='Polycom SoundStation IP 6000 SIP'" provisioning +psql -U postgres -c "UPDATE provisioning_classes SET label='Polycom SoundPoint IP 320/321/330/331/335 SIP', seq='1' WHERE label='Polycom SoundPoint IP 321/331/335 SIP'" provisioning +psql -U postgres -c "UPDATE provisioning_classes SET label='Polycom SoundPoint IP 650/670 SIP', seq='4' WHERE label='Polycom SoundPoint IP 650 SIP'" provisioning +psql -U postgres -c "UPDATE provisioning_classes SET seq='7' WHERE label='Linksys Internet Phone Adapter PAP2T'" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 3'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 550/560 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 550/560 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 550/560 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 3'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 550/560 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 4'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 550/560 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 3'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 4'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 5'))" provisioning +psql -U postgres -c "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom VVX 1500'), (SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'))" provisioning +psql -U postgres -c "UPDATE param_groups_to_params SET value=null WHERE group_id=(SELECT group_id FROM provisioning_groups WHERE label='Standard Phone') AND param_id=(SELECT param_id FROM provisioning_params WHERE name='mailbox')" provisioning +psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='mailcallback'), null, true)" provisioning +psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'mailcallback', 'text', 'Voice Mailbox Callback', 'Extension or URL for mailbox message retrieval', '', '208', '', null)" provisioning + +fi + exit 0 diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index bc0bcf7210a..aceccdb0dc4 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base -pkgver=2.3.0_rc2 +pkgver=2.3.0_rc5 pkgrel=0 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index ba27b51bf07..a9d8cdd87d0 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.9.1 +pkgver=2.9.3 pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname @@ -35,4 +35,4 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="e7f6972962f8cb40ceaf86aef01e1947 alpine-conf-2.9.1.tar.bz2" +md5sums="5252c8ff669b91f0c7a5cbdf0b9b7552 alpine-conf-2.9.3.tar.bz2" diff --git a/testing/altermime/APKBUILD b/main/altermime/APKBUILD index 1e4667716b5..1e4667716b5 100644 --- a/testing/altermime/APKBUILD +++ b/main/altermime/APKBUILD diff --git a/testing/altermime/makefile-flags.patch b/main/altermime/makefile-flags.patch index 71a399051e7..71a399051e7 100644 --- a/testing/altermime/makefile-flags.patch +++ b/main/altermime/makefile-flags.patch diff --git a/main/atkmm/APKBUILD b/main/atkmm/APKBUILD index 79ff68ba7e6..eed7a7907c9 100644 --- a/main/atkmm/APKBUILD +++ b/main/atkmm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atkmm -pkgver=2.22.5 +pkgver=2.22.6 pkgrel=0 pkgdesc="C++ bindings for atk" url="http://gtkmm.sourceforge.net/" @@ -25,4 +25,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="d56fe2b29d4c88fa270918e5572fc8cf atkmm-2.22.5.tar.bz2" +md5sums="7c35324dd3c081a385deb7523ed6f287 atkmm-2.22.6.tar.bz2" diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD index 51759b5a803..e6a8606df16 100644 --- a/main/audacious-plugins/APKBUILD +++ b/main/audacious-plugins/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious-plugins -pkgver=2.5.4 +pkgver=3.0.4 pkgrel=0 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)" url="http://audacious-media-player.org/" @@ -15,7 +15,7 @@ makedepends="libmowgli-dev libguess-dev gtk+-dev dbus-glib-dev - audacious-dev + audacious-dev>=${pkgver%.*} libxml2-dev libcdio-dev @@ -84,4 +84,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="93e8d13f2a17d047a4c24e1e5605fbac audacious-plugins-2.5.4.tar.gz" +md5sums="f269ae195a7077ccefb28a44634c0785 audacious-plugins-3.0.4.tar.gz" diff --git a/main/audacious/APKBUILD b/main/audacious/APKBUILD index 02aae69200a..49f5f9aaf05 100644 --- a/main/audacious/APKBUILD +++ b/main/audacious/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious -pkgver=2.5.4 -pkgrel=1 +pkgver=3.0.4 +pkgrel=0 pkgdesc="playlist-oriented media player with multiple interfaces" url="http://audacious-media-player.org/" arch="all" @@ -22,4 +22,4 @@ using plugin atheme-buildsys ac_enable_opt chardet -md5sums="e4329571a1887fadfe4aac6f2b302871 audacious-2.5.4.tar.gz" +md5sums="f620bf4ae727a3cd3f3314878f57ae8f audacious-3.0.4.tar.gz" diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD new file mode 100644 index 00000000000..11b857f82ba --- /dev/null +++ b/main/axel/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: +pkgname=axel +pkgver=2.4 +pkgrel=0 +pkgdesc="multiple-connection concurrent downloader" +url="http://axel.alioth.debian.org/" +arch="all" +license="GPL" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-doc" +source="http://alioth.debian.org/frs/download.php/3015/axel-$pkgver.tar.gz" + +_builddir="$srcdir"/axel-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --etcdir=/etc \ + --mandir=/usr/share/man \ + --i18n=0 \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="a2a762fce0c96781965c8f9786a3d09d axel-2.4.tar.gz" diff --git a/main/bsnes/APKBUILD b/main/bsnes/APKBUILD index 7b4e8121f8e..0916f07e7c4 100644 --- a/main/bsnes/APKBUILD +++ b/main/bsnes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=bsnes -pkgver=0.78 +pkgver=0.83 _x=${pkgver%.*} _y=${pkgver#*.} _pkgver="v${_x}${_y}" @@ -40,6 +40,6 @@ package() { make DESTDIR="$pkgdir" prefix=/usr profile=performance install || return 1 } -md5sums="19c07dc9be18bf3314f4e7122c00f16e bsnes_v078-source.tar.bz2 -d5017142f2cbccac878bbfc799b3445f nall-strlcpy.patch +md5sums="a1f017f5276ec5be0bc553db2b7e2241 bsnes_v083-source.tar.bz2 +11d7129c769add65a4b03ef9193729f2 nall-strlcpy.patch 07caea846bf49ee6f5deaf999dffbd5f no-pulseaudio.patch" diff --git a/main/bsnes/nall-strlcpy.patch b/main/bsnes/nall-strlcpy.patch index dd4a005a634..fa0859d4485 100644 --- a/main/bsnes/nall-strlcpy.patch +++ b/main/bsnes/nall-strlcpy.patch @@ -1,31 +1,31 @@ ---- bsnes_v077-source/bsnes/snes/system/serialization.cpp -+++ bsnes_v077-source/bsnes/snes/system/serialization.cpp -@@ -7,7 +7,7 @@ - char profile[16], description[512]; - memset(&profile, 0, sizeof profile); - memset(&description, 0, sizeof description); -- strlcpy(profile, Info::Profile, sizeof profile); -+ nall::strlcpy(profile, Info::Profile, sizeof profile); - - s.integer(signature); - s.integer(version); ---- bsnes_v077-source/bsnes/ui/tools/state-manager.cpp -+++ bsnes_v077-source/bsnes/ui/tools/state-manager.cpp -@@ -130,7 +130,7 @@ - string StateManager::slotLoadDescription(unsigned i) { - if(slot[i].capacity() == 0) return "(empty)"; - char text[512]; -- strlcpy(text, (const char*)slot[i].data() + HeaderLength, 512); -+ nall::strlcpy(text, (const char*)slot[i].data() + HeaderLength, 512); +--- ./bsnes/ui/tools/state-manager.cpp.orig ++++ ./bsnes/ui/tools/state-manager.cpp +@@ -135,7 +135,7 @@ + string StateManager::slotLoadDescription(unsigned n) { + if(slot[n].capacity() == 0) return "(empty)"; + char text[DescriptionLength]; +- strlcpy(text, (const char*)slot[n].data() + HeaderLength, DescriptionLength); ++ nall::strlcpy(text, (const char*)slot[n].data() + HeaderLength, DescriptionLength); return text; } -@@ -138,7 +138,7 @@ +@@ -143,7 +143,7 @@ if(stateList.selected() == false) return; string text = descEdit.text(); if(slot[stateList.selection()].capacity() > 0) { -- strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, 512); -+ nall::strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, 512); +- strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, DescriptionLength); ++ nall::strlcpy((char*)slot[stateList.selection()].data() + HeaderLength, (const char*)text, DescriptionLength); } refresh(); } +--- ./bsnes/snes/system/serialization.cpp.orig ++++ ./bsnes/snes/system/serialization.cpp +@@ -7,7 +7,7 @@ + char description[512], profile[16]; + memset(&description, 0, sizeof description); + memset(&profile, 0, sizeof profile); +- strlcpy(profile, Info::Profile, sizeof profile); ++ nall::strlcpy(profile, Info::Profile, sizeof profile); + + s.integer(signature); + s.integer(version); diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index fe7ff3781f2..521694773e2 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.19.2 -pkgrel=1 +pkgrel=2 _bbsuidver=0.6 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net @@ -104,4 +104,4 @@ b239f0a6e6556a9df9beb7d8725907c4 busybox-1.19.2-buildsys.patch 4b291c97d371f0957d4c1698976e5569 busybox-1.19.2-tail.patch ddeac26c403f8518212637731b5ae26b busybox-1.19.2-tftp.patch 784383013b8f015fb0d214618c46b4b8 0001-loginutils-use-sha512.patch -4ec89e4b45bcf667974a2778a559196f busyboxconfig" +453614d903ed3f39aa0a4b78f94bc7a5 busyboxconfig" diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index 1136153d2a2..65bb6bf0aaa 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -998,7 +998,7 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_SYSLOGD_DUP=y -CONFIG_FEATURE_SYSLOGD_CFG=y +CONFIG_FEATURE_SYSLOGD_CFG=n CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/main/bzr/APKBUILD b/main/bzr/APKBUILD index 37ec6d5f1d1..b900228bb98 100644 --- a/main/bzr/APKBUILD +++ b/main/bzr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=bzr -pkgver=2.3.0 -pkgrel=1 +pkgver=2.4.1 +pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="http://bazaar.canonical.com/" arch="all" @@ -26,4 +26,4 @@ doc() { mv "$pkgdir"/usr/man "$subpkgdir"/usr/share/man } -md5sums="2d8bc55d43209189a209361178d9d372 bzr-2.3.0.tar.gz" +md5sums="61068bfc1f0c9fb8a4b92bca204e0df8 bzr-2.4.1.tar.gz" diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index 4d504bcb32a..a515a4023c4 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=clamav -pkgver=0.97.2 +pkgver=0.97.3 pkgrel=0 pkgusers=clamav pkggroups=clamav @@ -148,7 +148,7 @@ daemon() { "$subpkgdir"/etc/logrotate.d/clamd || return 1 } -md5sums="cb2d78b4790fdfca3b2390d7ce82f0b7 clamav-0.97.2.tar.gz +md5sums="5cf25ed7778fa0cb6b140ad8f009befb clamav-0.97.3.tar.gz d64432c463850663c5041c3097f3e903 clamd.initd 567bc32b657dd7031b9b7beaa946203a clamd.confd f4d1f415322905128dc27135566ad136 freshclam.initd diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD index 323a429fcaf..f07b85e2f7c 100644 --- a/main/cracklib/APKBUILD +++ b/main/cracklib/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=cracklib -pkgver=2.8.16 -pkgrel=2 +pkgver=2.8.18 +pkgrel=0 pkgdesc="A library used to enforce strong passwords" url="http://sourceforge.net/projects/cracklib" arch="all" @@ -12,12 +12,10 @@ makedepends="" install= subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - cracklib-nls.patch " prepare() { cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i "$srcdir"/cracklib-nls.patch } build() { @@ -41,5 +39,4 @@ package() { } -md5sums="3bfb22db8fcffd019463ee415a1b25b7 cracklib-2.8.16.tar.gz -239b1b7b59bee4dee7577aa9df18ba46 cracklib-nls.patch" +md5sums="79053ad8bc714a44cd660cb12116211b cracklib-2.8.18.tar.gz" diff --git a/main/cracklib/cracklib-nls.patch b/main/cracklib/cracklib-nls.patch deleted file mode 100644 index 3792b741c4d..00000000000 --- a/main/cracklib/cracklib-nls.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./util/check.c.orig -+++ ./util/check.c -@@ -22,7 +22,9 @@ - int i; - - setlocale(LC_ALL, ""); -+#if defined(ENABLE_NLS) - textdomain(PACKAGE); -+#endif - - while (fgets(buf, sizeof(buf), stdin) != NULL) { - while (((i = strlen(buf)) > 0) && (i > 0)) { diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index 8a0e2dbc613..e599859184b 100644 --- a/main/cups/APKBUILD +++ b/main/cups/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cups pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" arch="all" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 0bc20dda36b..dd357f7a2cc 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -16,8 +16,8 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=$pkgver # when chaning _dahdiver we *must* bump _mypkgrel -_dahdiver=2.5.0.1 -_mypkgrel=1 +_dahdiver=2.5.0.2 +_mypkgrel=0 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -37,6 +37,7 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna zaphfc-dahdi-flortz.diff zaphfc-dahdi-2.4.0.patch zaphfc-dahdi-2.5.0.patch + constify.patch " prepare() { @@ -54,13 +55,13 @@ prepare() { build() { cd "$srcdir/$_realname-$_dahdiver" export GCC_SPECS=/usr/share/gcc/hardenednopie.specs - make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" CONSTIFY_PLUGIN= \ + make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ || return 1 } package() { cd "$srcdir/$_realname-$_dahdiver" - make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" CONSTIFY_PLUGIN= \ + make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ DESTDIR="$pkgdir" install-modules || return 1 rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \ "$pkgdir"/usr/include @@ -77,11 +78,12 @@ dev() { ln -s /usr/include "$dir"/include } -md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz +md5sums="037afa01dfde872c6b4864699483e199 dahdi-linux-2.5.0.2.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch 9088ee5cd24f94b7f90c24e5ed6071e0 dahdi-2.5.0-bri-fixes.patch c6308ea8aaafba0a9d7f9825d7c9dcf8 dahdi-zaphfc.patch 035a6d91b2fb56a9b76a60a2e494fe9e zaphfc-dahdi-flortz.diff 0fdcd8c8c93bc1fe33c0af12b6cc6b05 zaphfc-dahdi-2.4.0.patch -9ed23321512274c6c5c5b76af0411e38 zaphfc-dahdi-2.5.0.patch" +9ed23321512274c6c5c5b76af0411e38 zaphfc-dahdi-2.5.0.patch +15fd0337d9e592f2f1829770c2e69c86 constify.patch" diff --git a/main/dahdi-linux-grsec/constify.patch b/main/dahdi-linux-grsec/constify.patch new file mode 100644 index 00000000000..6741522f234 --- /dev/null +++ b/main/dahdi-linux-grsec/constify.patch @@ -0,0 +1,22 @@ +--- ./drivers/dahdi/voicebus/voicebus.h.orig ++++ ./drivers/dahdi/voicebus/voicebus.h +@@ -89,7 +89,7 @@ + void (*handle_receive)(struct voicebus *vb, struct list_head *buffers); + void (*handle_transmit)(struct voicebus *vb, struct list_head *buffers); + void (*handle_error)(struct voicebus *vb); +-}; ++} __no_const; + + /** + * struct voicebus_descriptor_list - A single descriptor list. +--- ./drivers/dahdi/wctc4xxp/base.c.orig ++++ ./drivers/dahdi/wctc4xxp/base.c +@@ -3193,7 +3193,7 @@ + return ret; + } + +-static void wctc4xxp_setup_file_operations(struct file_operations *fops) ++static void wctc4xxp_setup_file_operations(file_operations_no_const *fops) + { + fops->owner = THIS_MODULE; + fops->read = wctc4xxp_read; diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index 34885215ebc..5315d0dc708 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -15,8 +15,8 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=$pkgver # when bumping _dahdiver we *must* bump _mypkgrel -_dahdiver=2.5.0.1 -_mypkgrel=2 +_dahdiver=2.5.0.2 +_mypkgrel=3 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -76,7 +76,7 @@ dev() { ln -s /usr/include "$dir"/include } -md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz +md5sums="037afa01dfde872c6b4864699483e199 dahdi-linux-2.5.0.2.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch 9088ee5cd24f94b7f90c24e5ed6071e0 dahdi-2.5.0-bri-fixes.patch diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD index 86296c19389..05950dcd885 100644 --- a/main/dahdi-linux/APKBUILD +++ b/main/dahdi-linux/APKBUILD @@ -2,19 +2,18 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-linux -pkgver=2.5.0.1 +pkgver=2.5.0.2 pkgrel=0 pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers" url="http://www.asterisk.org" arch="noarch" license="GPL" depends= -# we need wget and tar because make install downloads firmware and uses fancy -# options for tar and wget. -makedepends="wget tar" +makedepends= install= subpackages="$pkgname-dev" -source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname-$pkgver.tar.gz" +source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname-$pkgver.tar.gz + wget-tar.patch" # We online install the firmwares in this package since those are common for all # kernel flavors. We also install the headers for the -dev package. @@ -22,10 +21,10 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname- # The kernel drivers themselves are built from separate build recipe. prepare() { cd "$srcdir"/$pkgname-$pkgver - for i in ../*.patch ../*.diff; do - [ -f "$i" ] || continue - msg "Applying $i" - patch -p1 < $i || return 1; + for i in $source; do + case $i in + *.patch|*.diff) patch -p1 -i "$srcdir"/$i || return 1;; + esac done } @@ -35,8 +34,9 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \ + make -j1 DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \ install-include install-firmware } -md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz" +md5sums="037afa01dfde872c6b4864699483e199 dahdi-linux-2.5.0.2.tar.gz +d72ac3aab69c427d69f657287c5d8475 wget-tar.patch" diff --git a/main/dahdi-linux/wget-tar.patch b/main/dahdi-linux/wget-tar.patch new file mode 100644 index 00000000000..ca3ebfa35d7 --- /dev/null +++ b/main/dahdi-linux/wget-tar.patch @@ -0,0 +1,29 @@ +--- ./drivers/dahdi/firmware/Makefile.orig ++++ ./drivers/dahdi/firmware/Makefile +@@ -60,7 +60,7 @@ + + # If "fetch" is used, --continue is not a valid option. + ifeq ($(WGET),wget) +-WGET_ARGS:=--continue ++WGET_ARGS:=-c + endif + + all: $(FIRMWARE) +@@ -82,7 +82,7 @@ + echo "Attempting to download $@"; \ + if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; \ + if test ! -f $@; then exit 1; fi; \ +- (cat $@ | gzip -d | tar --no-same-owner -xf -) \ ++ (cat $@ | gzip -d | tar -xf -) \ + fi + + firmware-loaders: $(FWLOADERS) +@@ -91,7 +91,7 @@ + dahdi-fwload-vpmadt032-$(VPMADT032_VERSION).tar.gz: + @if test ! -f $@; then echo "Attempting to download $@"; $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; \ + if test ! -f $@; then exit 1; fi; \ +- (cd ../../..; cat drivers/dahdi/firmware/$@ | gzip -d | tar --no-same-owner -xf -) ++ (cd ../../..; cat drivers/dahdi/firmware/$@ | gzip -d | tar -xf -) + + # Create object files suitable for linking against + object-build: $(FIRMWARE) $(OBJECT_FILES) diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD index 4a2ad979b5f..90ccce3b29c 100644 --- a/main/epdfview/APKBUILD +++ b/main/epdfview/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=epdfview pkgver=0.1.8 -pkgrel=0 +pkgrel=1 pkgdesc="A free lightweight PDF document viewer." url="http://www.emma-soft.com/projects/epdfview/" arch="all" diff --git a/main/evince/APKBUILD b/main/evince/APKBUILD index 6a68f7ecacc..d1ca0eab10a 100644 --- a/main/evince/APKBUILD +++ b/main/evince/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=evince pkgver=2.32.0 -pkgrel=5 +pkgrel=6 pkgdesc="simple document viewer for GTK+" url="http://projects.gnome.org/evince/" arch="all" diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index 6ab928871c4..547bc5c9165 100644 --- a/main/fakeroot/APKBUILD +++ b/main/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot -pkgver=1.17 +pkgver=1.18.1 pkgrel=0 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch="all" @@ -9,11 +9,15 @@ url="http://packages.debian.org/fakeroot" depends= subpackages="$pkgname-doc" source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2 - busybox-compat.patch" + busybox-getopt.patch" prepare() { cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../busybox-compat.patch + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -28,5 +32,5 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="1adc603cc18eedee11d9889798c863db fakeroot_1.17.orig.tar.bz2 -ea7b7e3065090d72804cdf4719dd5832 busybox-compat.patch" +md5sums="8eedda3dcb71b6ab6f62297b82ae5ac6 fakeroot_1.18.1.orig.tar.bz2 +bdbf1db14f2cfdff0f5b4c35da78b9fe busybox-getopt.patch" diff --git a/main/fakeroot/busybox-compat.patch b/main/fakeroot/busybox-compat.patch deleted file mode 100644 index 1d07d0d31a4..00000000000 --- a/main/fakeroot/busybox-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- fakeroot-1.10.1.orig/scripts/fakeroot.in Wed Nov 5 19:48:00 2008 -+++ fakeroot-1.10.1/scripts/fakeroot.in Wed Nov 5 19:49:12 2008 -@@ -28,7 +28,7 @@ - - libfound=no - --GETOPTEST=`getopt --version` -+GETOPTEST=`getopt --version 2>/dev/null` - case $GETOPTEST in - getopt*) # GNU getopt - TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` -@@ -133,9 +133,9 @@ - PID=`echo $KEY_PID|cut -d: -f2` - - if [ "$WAITINTRAP" -eq 0 ]; then -- trap "kill -s @signal@ $PID" EXIT INT -+ trap "kill -@signal@ $PID" EXIT INT - else -- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT -+ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -@signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT - fi - - if test -z "$FAKEROOTKEY" || test -z "$PID"; then diff --git a/main/fakeroot/busybox-getopt.patch b/main/fakeroot/busybox-getopt.patch new file mode 100644 index 00000000000..94029bf2480 --- /dev/null +++ b/main/fakeroot/busybox-getopt.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in +index 324a9dc..8d4235d 100755 +--- a/scripts/fakeroot.in ++++ b/scripts/fakeroot.in +@@ -43,7 +43,7 @@ export FAKED_MODE + + libfound=no + +-GETOPTEST=`getopt --version` ++GETOPTEST=`getopt --version 2>/dev/null` + case $GETOPTEST in + getopt*) # GNU getopt + FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"` diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 2a508796bd1..bae5f5f985a 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg pkgver=0.8.5 -pkgrel=0 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD index 955a3909940..89111de6e22 100644 --- a/main/fftw/APKBUILD +++ b/main/fftw/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=fftw -pkgver=3.2.2 -pkgrel=1 +pkgver=3.3 +pkgrel=0 pkgdesc="fastest fourier transform in the west" url="http://www.fftw.org/" license="GPL" @@ -35,4 +35,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="b616e5c91218cc778b5aa735fefb61ae fftw-3.2.2.tar.gz" +md5sums="0728ab3ec0ebb06631ab3b80a5c3d130 fftw-3.3.tar.gz" diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index bcfa444fdca..1a2e3a67873 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=7.0.1 _pkgver=$pkgver _xulver=7.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="firefox web browser" url="http://www.firefox.com" arch="all" diff --git a/main/freeglut/APKBUILD b/main/freeglut/APKBUILD index 45e109fc97a..1cb5547bfed 100644 --- a/main/freeglut/APKBUILD +++ b/main/freeglut/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=freeglut pkgver=2.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="http://freeglut.sourceforge.net/" arch="all" diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD index 0475ff86dca..dc53764eb6a 100644 --- a/main/freetds/APKBUILD +++ b/main/freetds/APKBUILD @@ -1,33 +1,46 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=freetds -pkgver=0.82 -pkgrel=9 +pkgver=0.91 +pkgrel=0 pkgdesc="Tabular Datastream Library" url="http://www.freetds.org/" arch="all" license="GPL" depends= -makedepends="unixodbc-dev readline-dev libiconv-dev libtool" +makedepends="unixodbc-dev readline-dev libiconv-dev libtool autoconf automake" install= subpackages="$pkgname-doc $pkgname-dev" -source="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/$pkgname-$pkgver.tar.gz" +source="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/$pkgname-$pkgver.tar.gz + freetds-libiconv.patch" +_builddir="$srcdir/$pkgname-$pkgver" -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + aclocal -I m4 && autoconf && automake +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --enable-msdblib + --enable-msdblib \ + || return 1 make || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="3df6b2e83fd420e90f1becbd1162990a freetds-0.82.tar.gz" +md5sums="b14db5823980a32f0643d1a84d3ec3ad freetds-0.91.tar.gz +d2c26724048dd5c73af7f1c48c8ddf29 freetds-libiconv.patch" diff --git a/main/freetds/freetds-libiconv.patch b/main/freetds/freetds-libiconv.patch new file mode 100644 index 00000000000..f13bc242e3e --- /dev/null +++ b/main/freetds/freetds-libiconv.patch @@ -0,0 +1,20 @@ +--- ./src/dblib/Makefile.am.orig ++++ ./src/dblib/Makefile.am +@@ -20,5 +20,5 @@ + SYMBOLS = -export-symbols-regex '^(db|bcp_|tdsdump_open|tdsdbopen|.*_xact|close_commit|open_commit|.?asprintf).*' + endif + libsybdb_la_LDFLAGS= -version-info 5:0:0 $(SYMBOLS) $(FREETDS_SYMBOLIC) +-libsybdb_la_LIBADD= ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC) ++libsybdb_la_LIBADD= ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LTLIBICONV) $(FREETDS_LIBGCC) + +--- ./src/tds/Makefile.am.orig ++++ ./src/tds/Makefile.am +@@ -19,7 +19,7 @@ + bulk.c win_mutex.c \ + $(AUTH_FILES) + libtds_la_LDFLAGS= +-libtds_la_LIBADD= ++libtds_la_LIBADD= $(LTLIBICONV) + + noinst_HEADERS = tds_willconvert.h encodings.h num_limits.h tds_types.h + EXTRA_DIST = tds_willconvert.h encodings.h num_limits.h tds_types.h \ diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD index 5d492b4e7ff..ce9657e38a0 100644 --- a/main/fuse/APKBUILD +++ b/main/fuse/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fuse -pkgver=2.8.5 -pkgrel=2 +pkgver=2.8.6 +pkgrel=0 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." url="http://fuse.sourceforge.net/" arch="all" @@ -12,7 +12,6 @@ makedepends="pkgconfig libiconv-dev gettext-dev install= subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fuse-iconv.patch fuse.initd" @@ -20,8 +19,6 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/fuse-iconv.patch || return 1 - aclocal -I m4 && libtoolize && autoconf && automake } build() { @@ -61,6 +58,5 @@ _EOF_ } -md5sums="8aa2fd689de00b73963620483084ae3b fuse-2.8.5.tar.gz -1583e4e6f2213290ba47055c41114371 fuse-iconv.patch +md5sums="eaa32c8cef56a981656a786f258a002a fuse-2.8.6.tar.gz 5983726cfabf0830dffbbbf9a3abcddc fuse.initd" diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 54507d5593a..dc4cc85b38f 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.7 +pkgver=1.7.7.1 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -52,7 +52,7 @@ perl() { } -md5sums="5d645884e688921e773186783b65ce33 git-1.7.7.tar.gz +md5sums="7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" diff --git a/main/glade/APKBUILD b/main/glade/APKBUILD index e30addc1cfc..4c59e8181d7 100644 --- a/main/glade/APKBUILD +++ b/main/glade/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glade -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.2 +pkgrel=0 pkgdesc="User Interface Designer for GTK+ and GNOME" url="http://glade.gnome.org/" arch="all" @@ -32,4 +32,4 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="70c61582bdc6e9a852b29f3d172ddd4e glade-3.10.0.tar.bz2" +md5sums="ca6cc56c3de0b46488ae422d93a36d79 glade-3.10.2.tar.bz2" diff --git a/main/glew/APKBUILD b/main/glew/APKBUILD index e8288f6fe2c..0e66f4bb595 100644 --- a/main/glew/APKBUILD +++ b/main/glew/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glew pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD index 7ad9b71a683..1d7d55009f6 100644 --- a/main/glib-networking/APKBUILD +++ b/main/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glib-networking -pkgver=2.30.0 +pkgver=2.30.1 _maj=${pkgver%%.*} _min=${pkgver#${_maj}.} _min=${_min%%.*} @@ -13,10 +13,11 @@ arch="all" license="LGPLv2+" depends="ca-certificates" depends_dev="glib-dev gnutls-dev libproxy-dev intltool" -makedepends="$depends_dev bash" +makedepends="$depends_dev bash autoconf automake libtool" install= -subpackages= -source="http://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.bz2" +subpackages="$pkgname-lang" +source="http://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.bz2 + proxy-test.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -27,6 +28,8 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + aclocal && libtoolize && autoconf && automake || return 1 + } build() { @@ -45,4 +48,5 @@ package() { "$pkgdir"/usr/lib/gio/modules/*.la } -md5sums="9f85aef5907f92b6cce10a12aa0a40ae glib-networking-2.30.0.tar.bz2" +md5sums="0b88f3d83586c706e5dbafe93494251c glib-networking-2.30.1.tar.bz2 +2aed5bdc525e68d2f0b70b76f3d6f8d6 proxy-test.patch" diff --git a/main/glib-networking/proxy-test.patch b/main/glib-networking/proxy-test.patch new file mode 100644 index 00000000000..2cab5d9f65d --- /dev/null +++ b/main/glib-networking/proxy-test.patch @@ -0,0 +1,13 @@ +--- ./Makefile.am.orig ++++ ./Makefile.am +@@ -11,9 +11,9 @@ + + if HAVE_GNOME_PROXY + SUBDIRS += proxy/gnome ++SUBDIRS += proxy/tests + endif + +-SUBDIRS += proxy/tests + + if HAVE_GNUTLS + SUBDIRS += tls/gnutls diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index a37cd825ee2..5f62c1b0ec3 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly pkgver=0.10.18 -pkgrel=2 +pkgrel=3 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" url="http://gstreamer.freedesktop.org/" arch="all" diff --git a/main/gtkglext/APKBUILD b/main/gtkglext/APKBUILD index 9682b6ee891..1b494b6fc00 100644 --- a/main/gtkglext/APKBUILD +++ b/main/gtkglext/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=gtkglext pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="GTK+ OpenGL Extension" url="http://projects.gnome.org/gtkglext/" arch="all" diff --git a/main/icedtea-web/APKBUILD b/main/icedtea-web/APKBUILD index 3a9898816d9..fe6f3695109 100644 --- a/main/icedtea-web/APKBUILD +++ b/main/icedtea-web/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=icedtea-web -pkgver=1.0.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="web integration packages for icedtea" url="http://icedtea.classpath.org/wiki/IcedTea-Web" @@ -48,12 +48,12 @@ package() { mozilla() { mkdir -p "$subpkgdir"/usr/lib/mozilla/plugins - mkdir -p "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/jre/lib/$CPU - mv "$pkgdir"/usr/lib/jvm/java-1.6-openjdk/jre/lib/$CPU/IcedTeaPlugin.so \ - "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/jre/lib/$CPU - ln -sf /usr/lib/jvm/java-1.6-openjdk/jre/lib/$CPU/IcedTeaPlugin.so \ + mkdir -p "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/lib + mv "$pkgdir"/usr/lib/jvm/java-1.6-openjdk/lib/IcedTeaPlugin.so \ + "$subpkgdir"/usr/lib/jvm/java-1.6-openjdk/lib + ln -sf /usr/lib/jvm/java-1.6-openjdk/lib/IcedTeaPlugin.so \ "$subpkgdir"/usr/lib/mozilla/plugins/libjavaplugin.so return 0 } -md5sums="4b5d80f4b82e53f4947e6782a0472d54 icedtea-web-1.0.2.tar.gz" +md5sums="0e2e653c7436d81edcbc1d4255571ab6 icedtea-web-1.1.3.tar.gz" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 79369806236..f3fa6b8188c 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.7.2.9 +pkgver=6.7.3.2 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -57,4 +57,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/ } -md5sums="ffe750155f7f583bf76a6d9fb10e54b6 ImageMagick-6.7.2-9.tar.gz" +md5sums="11118b01e163c4ea8fcca1af85af714f ImageMagick-6.7.3-2.tar.gz" diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD index a4d1e95892d..1b257737c58 100644 --- a/main/indent/APKBUILD +++ b/main/indent/APKBUILD @@ -1,16 +1,16 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=indent -pkgver=2.2.10 -pkgrel=4 +pkgver=2.2.11 +pkgrel=0 pkgdesc="indenting utility" url="http://www.gnu.org/software/indent/" license="GPL" depends= makedepends="gettext-dev" install= -subpackages="$pkgname-doc" -source="http://astromirror.uchicago.edu/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-doc $pkgname-lang" +source="http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz" arch="all" _builddir="$srcdir"/$pkgname-$pkgver @@ -26,13 +26,14 @@ build() { --without-included-gettext \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 + --infodir=/usr/share/info \ + --without-texinfo + make SUBDIRS="intl po src" || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install } -md5sums="be35ea62705733859fbf8caf816d8959 indent-2.2.10.tar.gz" +md5sums="98beafca62472805a3739d3867d5d70f indent-2.2.11.tar.gz" diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD index e05bf26e9ad..f20dd42989f 100644 --- a/main/inkscape/APKBUILD +++ b/main/inkscape/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=2 +pkgrel=3 pkgdesc="A vector-based drawing program - svg compliant" url="http://inkscape.sourceforge.net/" arch="all" diff --git a/testing/joe/APKBUILD b/main/joe/APKBUILD index 6ee1013bd9b..6ee1013bd9b 100644 --- a/testing/joe/APKBUILD +++ b/main/joe/APKBUILD diff --git a/main/json-glib/APKBUILD b/main/json-glib/APKBUILD index 2a137e47a5c..1d1b3c1dea1 100644 --- a/main/json-glib/APKBUILD +++ b/main/json-glib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=json-glib -pkgver=0.14.0 -pkgrel=1 +pkgver=0.14.2 +pkgrel=0 pkgdesc="JSON library built on GLib" arch="all" url="http://live.gnome.org/JsonGlib" @@ -24,4 +24,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="6ba14cc2cc9582250451ff645c20a779 json-glib-0.14.0.tar.bz2" +md5sums="5716a181a2b85268f53a1fb0c8024c4a json-glib-0.14.2.tar.bz2" diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD index b74a586fbc2..2b9bab956bb 100644 --- a/main/lftp/APKBUILD +++ b/main/lftp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=lftp -pkgver=4.3.2 +pkgver=4.3.3 pkgrel=0 pkgdesc="LFTP is sophisticated ftp/http client" url="http://lftp.yar.ru/" @@ -33,4 +33,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="18f5c5b351cfad0a0ab069592effd664 lftp-4.3.2.tar.bz2" +md5sums="91757a201c1030714ac1996f27437cc7 lftp-4.3.3.tar.bz2" diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index cbf5aa3392d..4b6536332ed 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32 _ver=${pkgver/_/-} -pkgrel=4 +pkgrel=5 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -41,6 +41,7 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 uclibcconfig.arm uclibcconfig.powerpc sha512-crypt.patch + uclibc-eventfd.patch uclibc-utils.trigger " @@ -150,4 +151,5 @@ beeafc978b9ad3ea963a4760a4334f03 uclibcconfig.i486 8f6e60a43d02b84e3acfea53be9a8d01 uclibcconfig.arm f02d8174ff7ea74942428bbbaf46abae uclibcconfig.powerpc 7bf1af84106de9e05160ed6d4853c54f sha512-crypt.patch +26dd7611fda4d29f3dc4a7cf24916931 uclibc-eventfd.patch f3be4f2bc54d7561d252937e10abf0d2 uclibc-utils.trigger" diff --git a/main/libc0.9.32/uclibc-eventfd.patch b/main/libc0.9.32/uclibc-eventfd.patch new file mode 100644 index 00000000000..1525366c34e --- /dev/null +++ b/main/libc0.9.32/uclibc-eventfd.patch @@ -0,0 +1,141 @@ +From: jc@eclis.ch +To: uclibc@uclibc.org +Subject: [PATCH 1/1] Add eventfd support. +Date: Mon, 24 Oct 2011 19:07:43 +0200 +Message-Id: <1319476064-32442-1-git-send-email-jc@eclis.ch> +X-Mailer: git-send-email 1.7.2.5 +X-BeenThere: uclibc@uclibc.org +X-Mailman-Version: 2.1.14 +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 +Errors-To: uclibc-bounces@uclibc.org +Sender: uclibc-bounces@uclibc.org + +From: Jean-Christian de Rivaz <jc@eclis.ch> + +Hello, + +I whould like to share this simple patch that add the eventfd call to +uClibc. Please review so it can be accepted to be merged. + +Jean-Christian + +Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch> +--- + libc/sysdeps/linux/common/Makefile.in | 3 +- + libc/sysdeps/linux/common/eventfd.c | 18 +++++++++++ + libc/sysdeps/linux/common/sys/eventfd.h | 48 +++++++++++++++++++++++++++++++ + 3 files changed, 68 insertions(+), 1 deletions(-) + create mode 100644 libc/sysdeps/linux/common/eventfd.c + create mode 100644 libc/sysdeps/linux/common/sys/eventfd.h + +diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in +index 8f936ff..63f3f6f 100644 +--- a/libc/sysdeps/linux/common/Makefile.in ++++ b/libc/sysdeps/linux/common/Makefile.in +@@ -24,7 +24,8 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += capget.c capset.c inotify.c ioperm.c iopl.c \ + remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \ + sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \ + splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \ +- sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c ++ sync_file_range.c sysctl.c sysinfo.c eventfd.c timerfd.c uselib.c \ ++ vhangup.c + # NPTL needs these internally: madvise.c + CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c + ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) +diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c +new file mode 100644 +index 0000000..cc3f3f0 +--- /dev/null ++++ b/libc/sysdeps/linux/common/eventfd.c +@@ -0,0 +1,18 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * eventfd() for uClibc ++ * ++ * Copyright (C) 2011 Jean-Christian de Rivaz <jc@eclis.ch> ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include <sys/syscall.h> ++#include <sys/eventfd.h> ++ ++/* ++ * eventfd() ++ */ ++#ifdef __NR_eventfd ++_syscall2(int, eventfd, int, count, int, flags) ++#endif +diff --git a/libc/sysdeps/linux/common/sys/eventfd.h b/libc/sysdeps/linux/common/sys/eventfd.h +new file mode 100644 +index 0000000..311f803 +--- /dev/null ++++ b/libc/sysdeps/linux/common/sys/eventfd.h +@@ -0,0 +1,48 @@ ++/* Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#ifndef _SYS_EVENTFD_H ++#define _SYS_EVENTFD_H 1 ++ ++#include <stdint.h> ++ ++ ++/* Type for event counter. */ ++typedef uint64_t eventfd_t; ++ ++/* Flags for signalfd. */ ++enum ++ { ++ EFD_SEMAPHORE = 1, ++#define EFD_SEMAPHORE EFD_SEMAPHORE ++ EFD_CLOEXEC = 02000000, ++#define EFD_CLOEXEC EFD_CLOEXEC ++ EFD_NONBLOCK = 04000 ++#define EFD_NONBLOCK EFD_NONBLOCK ++ }; ++ ++ ++__BEGIN_DECLS ++ ++/* Return file descriptor for generic event channel. Set initial ++ value to COUNT. */ ++extern int eventfd (int __count, int __flags) __THROW; ++ ++__END_DECLS ++ ++#endif /* sys/eventfd.h */ +-- +1.7.2.5 + +_______________________________________________ +uClibc mailing list +uClibc@uclibc.org +http://lists.busybox.net/mailman/listinfo/uclibc diff --git a/main/libcanberra/APKBUILD b/main/libcanberra/APKBUILD index a08be00c90f..8bbdce4208f 100644 --- a/main/libcanberra/APKBUILD +++ b/main/libcanberra/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libcanberra -pkgver=0.26 -pkgrel=3 +pkgver=0.28 +pkgrel=0 pkgdesc="simple audio library for GTK applications" url="http://0pointer.de/lennart/projects/libcanberra/" license="LGPL" @@ -36,4 +36,4 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="ee2c66ada7c851a4e7b6eb1682285a24 libcanberra-0.26.tar.gz" +md5sums="c198b4811598c4c161ff505e4531b02c libcanberra-0.28.tar.gz" diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD index 147a466c313..6d566100c8b 100644 --- a/main/libsoup/APKBUILD +++ b/main/libsoup/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsoup -pkgver=2.36.0 +pkgver=2.36.1 pkgrel=0 pkgdesc="Gnome HTTP Library" url="http://www.gnome.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la } -md5sums="7350d5578458bea3607cdf179ec6c579 libsoup-2.36.0.tar.bz2" +md5sums="9c03fc033da61deaf5b403e9e9c884b8 libsoup-2.36.1.tar.bz2" diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index e501b10fe08..b0b4d5f3b62 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfcegui4 pkgver=4.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Basic GUI functions for Xfce" url="http://www.xfce.org/" arch="all" license="GPL2" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends= makedepends="gtk+-dev xfconf-dev libxfce4util-dev startup-notification-dev libglade-dev" diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD index 26e9e331684..deec18669e7 100644 --- a/main/libxfont/APKBUILD +++ b/main/libxfont/APKBUILD @@ -1,18 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfont pkgver=1.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="X11 font rasterisation library" url="http://xorg.freedesktop.org/" arch="all" license="custom" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig libfontenc-dev freetype-dev fontsproto xproto xtrans - zlib-dev" -source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2" - +install= depends_dev="xproto fontsproto libfontenc-dev freetype-dev" +makedepends="$depends_dev xtrans zlib-dev" +source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2" build() { cd "$srcdir"/libXfont-$pkgver diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index dbb94e2a682..a4919bdbbf6 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=3.0.7 +pkgver=3.0.8 _kernver=3.0 -pkgrel=1 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2 - grsecurity-2.2.2-3.0.7-201110200052.patch + grsecurity-2.2.2-3.0.8-201110250925.patch grsec-timblogiw-noconst.patch 0004-arp-flush-arp-cache-on-device-change.patch @@ -138,9 +138,9 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -451412dc3b25c60fed80ddd5c49cb855 patch-3.0.7.bz2 -c83f7f0b4e400948fd30725bee596613 grsecurity-2.2.2-3.0.7-201110200052.patch +49618d8c7a71549c8870eb709c7d3f81 patch-3.0.8.bz2 +5015a2afce7d3665bf74e0896529fb90 grsecurity-2.2.2-3.0.8-201110250925.patch c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -bcb5aaabe38627ec887406774d8aeb42 kernelconfig.x86 -9add73a4ee0b1f15b4bf3e3311c3d140 kernelconfig.x86_64" +0134b22fc2c95106803f4043cffed087 kernelconfig.x86 +d97d1808eebdfb97734dccfbcaea35f2 kernelconfig.x86_64" diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.7-201110200052.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.8-201110250925.patch index de327946061..6dd81e431ed 100644 --- a/main/linux-grsec/grsecurity-2.2.2-3.0.7-201110200052.patch +++ b/main/linux-grsec/grsecurity-2.2.2-3.0.8-201110250925.patch @@ -1,328 +1,6 @@ -diff -urNp linux-3.0.7/Documentation/dontdiff linux-3.0.7/Documentation/dontdiff ---- linux-3.0.7/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/Documentation/dontdiff 2011-10-07 19:07:23.000000000 -0400 -@@ -5,6 +5,7 @@ - *.cis - *.cpio - *.csp -+*.dbg - *.dsp - *.dvi - *.elf -@@ -48,9 +49,11 @@ - *.tab.h - *.tex - *.ver -+*.vim - *.xml - *.xz - *_MODULES -+*_reg_safe.h - *_vga16.c - *~ - \#*# -@@ -70,6 +73,7 @@ Kerntypes - Module.markers - Module.symvers - PENDING -+PERF* - SCCS - System.map* - TAGS -@@ -98,6 +102,8 @@ bzImage* - capability_names.h - capflags.c - classlist.h* -+clut_vga16.c -+common-cmds.h - comp*.log - compile.h* - conf -@@ -126,12 +132,14 @@ fore200e_pca_fw.c* - gconf - gconf.glade.h - gen-devlist -+gen-kdb_cmds.c - gen_crc32table - gen_init_cpio - generated - genheaders - genksyms - *_gray256.c -+hash - hpet_example - hugepage-mmap - hugepage-shm -@@ -146,7 +154,6 @@ int32.c - int4.c - int8.c - kallsyms --kconfig - keywords.c - ksym.c* - ksym.h* -@@ -154,7 +161,6 @@ kxgettext - lkc_defs.h - lex.c - lex.*.c --linux - logo_*.c - logo_*_clut224.c - logo_*_mono.c -@@ -166,7 +172,6 @@ machtypes.h - map - map_hugetlb - maui_boot.h --media - mconf - miboot* - mk_elfconfig -@@ -174,6 +179,7 @@ mkboot - mkbugboot - mkcpustr - mkdep -+mkpiggy - mkprep - mkregtable - mktables -@@ -209,6 +215,7 @@ r300_reg_safe.h - r420_reg_safe.h - r600_reg_safe.h - recordmcount -+regdb.c - relocs - rlim_names.h - rn50_reg_safe.h -@@ -219,6 +226,7 @@ setup - setup.bin - setup.elf - sImage -+slabinfo - sm_tbl* - split-include - syscalltab.h -@@ -246,7 +254,9 @@ vmlinux - vmlinux-* - vmlinux.aout - vmlinux.bin.all -+vmlinux.bin.bz2 - vmlinux.lds -+vmlinux.relocs - vmlinuz - voffset.h - vsyscall.lds -@@ -254,6 +264,7 @@ vsyscall_32.lds - wanxlfw.inc - uImage - unifdef -+utsrelease.h - wakeup.bin - wakeup.elf - wakeup.lds -diff -urNp linux-3.0.7/Documentation/kernel-parameters.txt linux-3.0.7/Documentation/kernel-parameters.txt ---- linux-3.0.7/Documentation/kernel-parameters.txt 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/Documentation/kernel-parameters.txt 2011-08-23 21:47:55.000000000 -0400 -@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes - the specified number of seconds. This is to be used if - your oopses keep scrolling off the screen. - -+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain -+ virtualization environments that don't cope well with the -+ expand down segment used by UDEREF on X86-32 or the frequent -+ page table updates on X86-64. -+ -+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already. -+ - pcbit= [HW,ISDN] - - pcd. [PARIDE] -diff -urNp linux-3.0.7/Makefile linux-3.0.7/Makefile ---- linux-3.0.7/Makefile 2011-10-17 23:17:08.000000000 -0400 -+++ linux-3.0.7/Makefile 2011-10-17 23:17:19.000000000 -0400 -@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" - - HOSTCC = gcc - HOSTCXX = g++ --HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer --HOSTCXXFLAGS = -O2 -+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks -+HOSTCFLAGS += $(call cc-option, -Wno-empty-body) -+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks - - # Decide whether to build built-in, modular, or both. - # Normally, just do built-in. -@@ -365,10 +366,12 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h - KBUILD_CPPFLAGS := -D__KERNEL__ - - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -+ -W -Wno-unused-parameter -Wno-missing-field-initializers \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ - -fno-delete-null-pointer-checks -+KBUILD_CFLAGS += $(call cc-option, -Wno-empty-body) - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := - KBUILD_AFLAGS := -D__ASSEMBLY__ -@@ -407,8 +410,8 @@ export RCS_TAR_IGNORE := --exclude SCCS - # Rules shared between *config targets and build targets - - # Basic helpers built in scripts/ --PHONY += scripts_basic --scripts_basic: -+PHONY += scripts_basic gcc-plugins -+scripts_basic: gcc-plugins - $(Q)$(MAKE) $(build)=scripts/basic - $(Q)rm -f .tmp_quiet_recordmcount - -@@ -564,6 +567,36 @@ else - KBUILD_CFLAGS += -O2 - endif - -+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y) -+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN -+ifdef CONFIG_PAX_MEMORY_STACKLEAK -+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100 -+endif -+ifdef CONFIG_KALLOCSTAT_PLUGIN -+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so -+endif -+ifdef CONFIG_PAX_KERNEXEC_PLUGIN -+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so -+endif -+ifdef CONFIG_CHECKER_PLUGIN -+ifeq ($(call cc-ifversion, -ge, 0406, y), y) -+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN -+endif -+endif -+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN) -+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN -+gcc-plugins: -+ $(Q)$(MAKE) $(build)=tools/gcc -+else -+gcc-plugins: -+ifeq ($(call cc-ifversion, -ge, 0405, y), y) -+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev.)) -+else -+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least" -+endif -+ $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure" -+endif -+ - include $(srctree)/arch/$(SRCARCH)/Makefile - - ifneq ($(CONFIG_FRAME_WARN),0) -@@ -708,7 +741,7 @@ export mod_strip_cmd - - - ifeq ($(KBUILD_EXTMOD),) --core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ -+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/ - - vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ - $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -@@ -932,6 +965,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai - - # The actual objects are generated when descending, - # make sure no implicit rule kicks in -+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS) - $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ; - - # Handle descending into subdirectories listed in $(vmlinux-dirs) -@@ -941,7 +975,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) - # Error messages still appears in the original language - - PHONY += $(vmlinux-dirs) --$(vmlinux-dirs): prepare scripts -+$(vmlinux-dirs): gcc-plugins prepare scripts - $(Q)$(MAKE) $(build)=$@ - - # Store (new) KERNELRELASE string in include/config/kernel.release -@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE - $(Q)$(MAKE) $(build)=. missing-syscalls - - # All the preparing.. -+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS)) - prepare: prepare0 - - # Generate some files -@@ -1087,6 +1122,7 @@ all: modules - # using awk while concatenating to the final file. - - PHONY += modules -+modules: KBUILD_CFLAGS += $(GCC_PLUGINS) - modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin - $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order - @$(kecho) ' Building modules, stage 2.'; -@@ -1102,7 +1138,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu - - # Target to prepare building external modules - PHONY += modules_prepare --modules_prepare: prepare scripts -+modules_prepare: gcc-plugins prepare scripts - - # Target to install modules - PHONY += modules_install -@@ -1198,7 +1234,7 @@ distclean: mrproper - @find $(srctree) $(RCS_FIND_IGNORE) \ - \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ - -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -- -o -name '.*.rej' -o -size 0 \ -+ -o -name '.*.rej' -o -name '*.so' -o -size 0 \ - -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ - -type f -print | xargs rm -f - -@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules - $(module-dirs): crmodverdir $(objtree)/Module.symvers - $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) - -+modules: KBUILD_CFLAGS += $(GCC_PLUGINS) - modules: $(module-dirs) - @$(kecho) ' Building modules, stage 2.'; - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1485,17 +1522,19 @@ else - target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) - endif - --%.s: %.c prepare scripts FORCE -+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS) -+%.s: %.c gcc-plugins prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) - %.i: %.c prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) --%.o: %.c prepare scripts FORCE -+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS) -+%.o: %.c gcc-plugins prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) - %.lst: %.c prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) --%.s: %.S prepare scripts FORCE -+%.s: %.S gcc-plugins prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) --%.o: %.S prepare scripts FORCE -+%.o: %.S gcc-plugins prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) - %.symtypes: %.c prepare scripts FORCE - $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) -@@ -1505,11 +1544,13 @@ endif - $(cmd_crmodverdir) - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ - $(build)=$(build-dir) --%/: prepare scripts FORCE -+%/: KBUILD_CFLAGS += $(GCC_PLUGINS) -+%/: gcc-plugins prepare scripts FORCE - $(cmd_crmodverdir) - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ - $(build)=$(build-dir) --%.ko: prepare scripts FORCE -+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS) -+%.ko: gcc-plugins prepare scripts FORCE - $(cmd_crmodverdir) - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ - $(build)=$(build-dir) $(@:.ko=.o) -diff -urNp linux-3.0.7/arch/alpha/include/asm/elf.h linux-3.0.7/arch/alpha/include/asm/elf.h ---- linux-3.0.7/arch/alpha/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/alpha/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/alpha/include/asm/elf.h linux-3.0.8/arch/alpha/include/asm/elf.h +--- linux-3.0.8/arch/alpha/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/alpha/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -337,9 +15,9 @@ diff -urNp linux-3.0.7/arch/alpha/include/asm/elf.h linux-3.0.7/arch/alpha/inclu /* $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-3.0.7/arch/alpha/include/asm/pgtable.h linux-3.0.7/arch/alpha/include/asm/pgtable.h ---- linux-3.0.7/arch/alpha/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/alpha/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/alpha/include/asm/pgtable.h linux-3.0.8/arch/alpha/include/asm/pgtable.h +--- linux-3.0.8/arch/alpha/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/alpha/include/asm/pgtable.h 2011-08-23 21:47:55.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) @@ -358,9 +36,9 @@ diff -urNp linux-3.0.7/arch/alpha/include/asm/pgtable.h linux-3.0.7/arch/alpha/i #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-3.0.7/arch/alpha/kernel/module.c linux-3.0.7/arch/alpha/kernel/module.c ---- linux-3.0.7/arch/alpha/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/alpha/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/alpha/kernel/module.c linux-3.0.8/arch/alpha/kernel/module.c +--- linux-3.0.8/arch/alpha/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/alpha/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -370,9 +48,9 @@ diff -urNp linux-3.0.7/arch/alpha/kernel/module.c linux-3.0.7/arch/alpha/kernel/ got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-3.0.7/arch/alpha/kernel/osf_sys.c linux-3.0.7/arch/alpha/kernel/osf_sys.c ---- linux-3.0.7/arch/alpha/kernel/osf_sys.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/alpha/kernel/osf_sys.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/alpha/kernel/osf_sys.c linux-3.0.8/arch/alpha/kernel/osf_sys.c +--- linux-3.0.8/arch/alpha/kernel/osf_sys.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/alpha/kernel/osf_sys.c 2011-08-23 21:47:55.000000000 -0400 @@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -404,9 +82,9 @@ diff -urNp linux-3.0.7/arch/alpha/kernel/osf_sys.c linux-3.0.7/arch/alpha/kernel if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-3.0.7/arch/alpha/mm/fault.c linux-3.0.7/arch/alpha/mm/fault.c ---- linux-3.0.7/arch/alpha/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/alpha/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/alpha/mm/fault.c linux-3.0.8/arch/alpha/mm/fault.c +--- linux-3.0.8/arch/alpha/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/alpha/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -563,9 +241,9 @@ diff -urNp linux-3.0.7/arch/alpha/mm/fault.c linux-3.0.7/arch/alpha/mm/fault.c } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-3.0.7/arch/arm/include/asm/elf.h linux-3.0.7/arch/arm/include/asm/elf.h ---- linux-3.0.7/arch/arm/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/include/asm/elf.h linux-3.0.8/arch/arm/include/asm/elf.h +--- linux-3.0.8/arch/arm/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -116,7 +116,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. */ @@ -593,9 +271,9 @@ diff -urNp linux-3.0.7/arch/arm/include/asm/elf.h linux-3.0.7/arch/arm/include/a extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES -diff -urNp linux-3.0.7/arch/arm/include/asm/kmap_types.h linux-3.0.7/arch/arm/include/asm/kmap_types.h ---- linux-3.0.7/arch/arm/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/include/asm/kmap_types.h linux-3.0.8/arch/arm/include/asm/kmap_types.h +--- linux-3.0.8/arch/arm/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, @@ -604,9 +282,9 @@ diff -urNp linux-3.0.7/arch/arm/include/asm/kmap_types.h linux-3.0.7/arch/arm/in KM_TYPE_NR }; -diff -urNp linux-3.0.7/arch/arm/include/asm/uaccess.h linux-3.0.7/arch/arm/include/asm/uaccess.h ---- linux-3.0.7/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/include/asm/uaccess.h linux-3.0.8/arch/arm/include/asm/uaccess.h +--- linux-3.0.8/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 @@ -22,6 +22,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -662,9 +340,9 @@ diff -urNp linux-3.0.7/arch/arm/include/asm/uaccess.h linux-3.0.7/arch/arm/inclu if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-3.0.7/arch/arm/kernel/armksyms.c linux-3.0.7/arch/arm/kernel/armksyms.c ---- linux-3.0.7/arch/arm/kernel/armksyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/kernel/armksyms.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/kernel/armksyms.c linux-3.0.8/arch/arm/kernel/armksyms.c +--- linux-3.0.8/arch/arm/kernel/armksyms.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/kernel/armksyms.c 2011-08-23 21:47:55.000000000 -0400 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user); #ifdef CONFIG_MMU EXPORT_SYMBOL(copy_page); @@ -676,9 +354,9 @@ diff -urNp linux-3.0.7/arch/arm/kernel/armksyms.c linux-3.0.7/arch/arm/kernel/ar EXPORT_SYMBOL(__clear_user); EXPORT_SYMBOL(__get_user_1); -diff -urNp linux-3.0.7/arch/arm/kernel/process.c linux-3.0.7/arch/arm/kernel/process.c ---- linux-3.0.7/arch/arm/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/kernel/process.c linux-3.0.8/arch/arm/kernel/process.c +--- linux-3.0.8/arch/arm/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 @@ -28,7 +28,6 @@ #include <linux/tick.h> #include <linux/utsname.h> @@ -700,9 +378,9 @@ diff -urNp linux-3.0.7/arch/arm/kernel/process.c linux-3.0.7/arch/arm/kernel/pro #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the -diff -urNp linux-3.0.7/arch/arm/kernel/traps.c linux-3.0.7/arch/arm/kernel/traps.c ---- linux-3.0.7/arch/arm/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/kernel/traps.c linux-3.0.8/arch/arm/kernel/traps.c +--- linux-3.0.8/arch/arm/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 @@ -257,6 +257,8 @@ static int __die(const char *str, int er static DEFINE_SPINLOCK(die_lock); @@ -722,9 +400,9 @@ diff -urNp linux-3.0.7/arch/arm/kernel/traps.c linux-3.0.7/arch/arm/kernel/traps if (ret != NOTIFY_STOP) do_exit(SIGSEGV); } -diff -urNp linux-3.0.7/arch/arm/lib/copy_from_user.S linux-3.0.7/arch/arm/lib/copy_from_user.S ---- linux-3.0.7/arch/arm/lib/copy_from_user.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/lib/copy_from_user.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/lib/copy_from_user.S linux-3.0.8/arch/arm/lib/copy_from_user.S +--- linux-3.0.8/arch/arm/lib/copy_from_user.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/lib/copy_from_user.S 2011-08-23 21:47:55.000000000 -0400 @@ -16,7 +16,7 @@ /* * Prototype: @@ -748,9 +426,9 @@ diff -urNp linux-3.0.7/arch/arm/lib/copy_from_user.S linux-3.0.7/arch/arm/lib/co .pushsection .fixup,"ax" .align 0 -diff -urNp linux-3.0.7/arch/arm/lib/copy_to_user.S linux-3.0.7/arch/arm/lib/copy_to_user.S ---- linux-3.0.7/arch/arm/lib/copy_to_user.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/lib/copy_to_user.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/lib/copy_to_user.S linux-3.0.8/arch/arm/lib/copy_to_user.S +--- linux-3.0.8/arch/arm/lib/copy_to_user.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/lib/copy_to_user.S 2011-08-23 21:47:55.000000000 -0400 @@ -16,7 +16,7 @@ /* * Prototype: @@ -774,9 +452,9 @@ diff -urNp linux-3.0.7/arch/arm/lib/copy_to_user.S linux-3.0.7/arch/arm/lib/copy ENDPROC(__copy_to_user_std) .pushsection .fixup,"ax" -diff -urNp linux-3.0.7/arch/arm/lib/uaccess.S linux-3.0.7/arch/arm/lib/uaccess.S ---- linux-3.0.7/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/lib/uaccess.S linux-3.0.8/arch/arm/lib/uaccess.S +--- linux-3.0.8/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400 @@ -20,7 +20,7 @@ #define PAGE_SHIFT 12 @@ -830,9 +508,9 @@ diff -urNp linux-3.0.7/arch/arm/lib/uaccess.S linux-3.0.7/arch/arm/lib/uaccess.S .pushsection .fixup,"ax" .align 0 -diff -urNp linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c ---- linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c +--- linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c 2011-08-23 21:47:55.000000000 -0400 @@ -103,7 +103,7 @@ out: } @@ -842,9 +520,9 @@ diff -urNp linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.7/arch/arm/l { /* * This test is stubbed out of the main function above to keep -diff -urNp linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c ---- linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c +--- linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c 2011-08-23 21:48:14.000000000 -0400 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev return sprintf(buf, "0x%X\n", mbox_value); } @@ -854,9 +532,9 @@ diff -urNp linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.7/arch/arm/ma static int mbox_show(struct seq_file *s, void *data) { -diff -urNp linux-3.0.7/arch/arm/mm/fault.c linux-3.0.7/arch/arm/mm/fault.c ---- linux-3.0.7/arch/arm/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/mm/fault.c linux-3.0.8/arch/arm/mm/fault.c +--- linux-3.0.8/arch/arm/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -905,9 +583,9 @@ diff -urNp linux-3.0.7/arch/arm/mm/fault.c linux-3.0.7/arch/arm/mm/fault.c /* * First Level Translation Fault Handler * -diff -urNp linux-3.0.7/arch/arm/mm/mmap.c linux-3.0.7/arch/arm/mm/mmap.c ---- linux-3.0.7/arch/arm/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/arm/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/arm/mm/mmap.c linux-3.0.8/arch/arm/mm/mmap.c +--- linux-3.0.8/arch/arm/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/arm/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -957,9 +635,9 @@ diff -urNp linux-3.0.7/arch/arm/mm/mmap.c linux-3.0.7/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-3.0.7/arch/avr32/include/asm/elf.h linux-3.0.7/arch/avr32/include/asm/elf.h ---- linux-3.0.7/arch/avr32/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/avr32/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/avr32/include/asm/elf.h linux-3.0.8/arch/avr32/include/asm/elf.h +--- linux-3.0.8/arch/avr32/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/avr32/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -84,8 +84,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. */ @@ -976,9 +654,9 @@ diff -urNp linux-3.0.7/arch/avr32/include/asm/elf.h linux-3.0.7/arch/avr32/inclu /* 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-3.0.7/arch/avr32/include/asm/kmap_types.h linux-3.0.7/arch/avr32/include/asm/kmap_types.h ---- linux-3.0.7/arch/avr32/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/avr32/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/avr32/include/asm/kmap_types.h linux-3.0.8/arch/avr32/include/asm/kmap_types.h +--- linux-3.0.8/arch/avr32/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/avr32/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -989,9 +667,9 @@ diff -urNp linux-3.0.7/arch/avr32/include/asm/kmap_types.h linux-3.0.7/arch/avr3 }; #undef D -diff -urNp linux-3.0.7/arch/avr32/mm/fault.c linux-3.0.7/arch/avr32/mm/fault.c ---- linux-3.0.7/arch/avr32/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/avr32/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/avr32/mm/fault.c linux-3.0.8/arch/avr32/mm/fault.c +--- linux-3.0.8/arch/avr32/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/avr32/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -1033,9 +711,9 @@ diff -urNp linux-3.0.7/arch/avr32/mm/fault.c linux-3.0.7/arch/avr32/mm/fault.c if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-3.0.7/arch/frv/include/asm/kmap_types.h linux-3.0.7/arch/frv/include/asm/kmap_types.h ---- linux-3.0.7/arch/frv/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/frv/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/frv/include/asm/kmap_types.h linux-3.0.8/arch/frv/include/asm/kmap_types.h +--- linux-3.0.8/arch/frv/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/frv/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -1044,9 +722,9 @@ diff -urNp linux-3.0.7/arch/frv/include/asm/kmap_types.h linux-3.0.7/arch/frv/in KM_TYPE_NR }; -diff -urNp linux-3.0.7/arch/frv/mm/elf-fdpic.c linux-3.0.7/arch/frv/mm/elf-fdpic.c ---- linux-3.0.7/arch/frv/mm/elf-fdpic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/frv/mm/elf-fdpic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/frv/mm/elf-fdpic.c linux-3.0.8/arch/frv/mm/elf-fdpic.c +--- linux-3.0.8/arch/frv/mm/elf-fdpic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/frv/mm/elf-fdpic.c 2011-08-23 21:47:55.000000000 -0400 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr = PAGE_ALIGN(addr); @@ -1075,9 +753,9 @@ diff -urNp linux-3.0.7/arch/frv/mm/elf-fdpic.c linux-3.0.7/arch/frv/mm/elf-fdpic goto success; addr = vma->vm_end; } -diff -urNp linux-3.0.7/arch/ia64/include/asm/elf.h linux-3.0.7/arch/ia64/include/asm/elf.h ---- linux-3.0.7/arch/ia64/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/include/asm/elf.h linux-3.0.8/arch/ia64/include/asm/elf.h +--- linux-3.0.8/arch/ia64/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -1092,9 +770,9 @@ diff -urNp linux-3.0.7/arch/ia64/include/asm/elf.h linux-3.0.7/arch/ia64/include #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-3.0.7/arch/ia64/include/asm/pgtable.h linux-3.0.7/arch/ia64/include/asm/pgtable.h ---- linux-3.0.7/arch/ia64/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/include/asm/pgtable.h linux-3.0.8/arch/ia64/include/asm/pgtable.h +--- linux-3.0.8/arch/ia64/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 @@ -12,7 +12,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -1122,9 +800,9 @@ diff -urNp linux-3.0.7/arch/ia64/include/asm/pgtable.h linux-3.0.7/arch/ia64/inc #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-3.0.7/arch/ia64/include/asm/spinlock.h linux-3.0.7/arch/ia64/include/asm/spinlock.h ---- linux-3.0.7/arch/ia64/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/include/asm/spinlock.h linux-3.0.8/arch/ia64/include/asm/spinlock.h +--- linux-3.0.8/arch/ia64/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; @@ -1134,9 +812,9 @@ diff -urNp linux-3.0.7/arch/ia64/include/asm/spinlock.h linux-3.0.7/arch/ia64/in } static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock) -diff -urNp linux-3.0.7/arch/ia64/include/asm/uaccess.h linux-3.0.7/arch/ia64/include/asm/uaccess.h ---- linux-3.0.7/arch/ia64/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/include/asm/uaccess.h linux-3.0.8/arch/ia64/include/asm/uaccess.h +--- linux-3.0.8/arch/ia64/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -1155,9 +833,9 @@ diff -urNp linux-3.0.7/arch/ia64/include/asm/uaccess.h linux-3.0.7/arch/ia64/inc __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-3.0.7/arch/ia64/kernel/module.c linux-3.0.7/arch/ia64/kernel/module.c ---- linux-3.0.7/arch/ia64/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/kernel/module.c linux-3.0.8/arch/ia64/kernel/module.c +--- linux-3.0.8/arch/ia64/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1246,9 +924,9 @@ diff -urNp linux-3.0.7/arch/ia64/kernel/module.c linux-3.0.7/arch/ia64/kernel/mo mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-3.0.7/arch/ia64/kernel/sys_ia64.c linux-3.0.7/arch/ia64/kernel/sys_ia64.c ---- linux-3.0.7/arch/ia64/kernel/sys_ia64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/kernel/sys_ia64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/kernel/sys_ia64.c linux-3.0.8/arch/ia64/kernel/sys_ia64.c +--- linux-3.0.8/arch/ia64/kernel/sys_ia64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/kernel/sys_ia64.c 2011-08-23 21:47:55.000000000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1281,9 +959,9 @@ diff -urNp linux-3.0.7/arch/ia64/kernel/sys_ia64.c linux-3.0.7/arch/ia64/kernel/ /* Remember the address where we stopped this search: */ mm->free_area_cache = addr + len; return addr; -diff -urNp linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S ---- linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S +--- linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1293,9 +971,9 @@ diff -urNp linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S linux-3.0.7/arch/ia64/kern /* * ensure percpu data fits * into percpu page size -diff -urNp linux-3.0.7/arch/ia64/mm/fault.c linux-3.0.7/arch/ia64/mm/fault.c ---- linux-3.0.7/arch/ia64/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/mm/fault.c linux-3.0.8/arch/ia64/mm/fault.c +--- linux-3.0.8/arch/ia64/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1345,9 +1023,9 @@ diff -urNp linux-3.0.7/arch/ia64/mm/fault.c linux-3.0.7/arch/ia64/mm/fault.c /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the -diff -urNp linux-3.0.7/arch/ia64/mm/hugetlbpage.c linux-3.0.7/arch/ia64/mm/hugetlbpage.c ---- linux-3.0.7/arch/ia64/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/mm/hugetlbpage.c linux-3.0.8/arch/ia64/mm/hugetlbpage.c +--- linux-3.0.8/arch/ia64/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1357,9 +1035,9 @@ diff -urNp linux-3.0.7/arch/ia64/mm/hugetlbpage.c linux-3.0.7/arch/ia64/mm/huget return addr; addr = ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-3.0.7/arch/ia64/mm/init.c linux-3.0.7/arch/ia64/mm/init.c ---- linux-3.0.7/arch/ia64/mm/init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/ia64/mm/init.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/ia64/mm/init.c linux-3.0.8/arch/ia64/mm/init.c +--- linux-3.0.8/arch/ia64/mm/init.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/ia64/mm/init.c 2011-08-23 21:47:55.000000000 -0400 @@ -120,6 +120,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -1380,9 +1058,9 @@ diff -urNp linux-3.0.7/arch/ia64/mm/init.c linux-3.0.7/arch/ia64/mm/init.c 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-3.0.7/arch/m32r/lib/usercopy.c linux-3.0.7/arch/m32r/lib/usercopy.c ---- linux-3.0.7/arch/m32r/lib/usercopy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/m32r/lib/usercopy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/m32r/lib/usercopy.c linux-3.0.8/arch/m32r/lib/usercopy.c +--- linux-3.0.8/arch/m32r/lib/usercopy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/m32r/lib/usercopy.c 2011-08-23 21:47:55.000000000 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1403,9 +1081,9 @@ diff -urNp linux-3.0.7/arch/m32r/lib/usercopy.c linux-3.0.7/arch/m32r/lib/userco prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-3.0.7/arch/mips/include/asm/elf.h linux-3.0.7/arch/mips/include/asm/elf.h ---- linux-3.0.7/arch/mips/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/include/asm/elf.h linux-3.0.8/arch/mips/include/asm/elf.h +--- linux-3.0.8/arch/mips/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1427,9 +1105,9 @@ diff -urNp linux-3.0.7/arch/mips/include/asm/elf.h linux-3.0.7/arch/mips/include -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ -diff -urNp linux-3.0.7/arch/mips/include/asm/page.h linux-3.0.7/arch/mips/include/asm/page.h ---- linux-3.0.7/arch/mips/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/include/asm/page.h linux-3.0.8/arch/mips/include/asm/page.h +--- linux-3.0.8/arch/mips/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/include/asm/page.h 2011-08-23 21:47:55.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; @@ -1439,9 +1117,9 @@ diff -urNp linux-3.0.7/arch/mips/include/asm/page.h linux-3.0.7/arch/mips/includ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-3.0.7/arch/mips/include/asm/system.h linux-3.0.7/arch/mips/include/asm/system.h ---- linux-3.0.7/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/include/asm/system.h linux-3.0.8/arch/mips/include/asm/system.h +--- linux-3.0.8/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1450,9 +1128,9 @@ diff -urNp linux-3.0.7/arch/mips/include/asm/system.h linux-3.0.7/arch/mips/incl +#define arch_align_stack(x) ((x) & ~0xfUL) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c ---- linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c +--- linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c 2011-08-23 21:47:55.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) @@ -1467,9 +1145,9 @@ diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c linux-3.0.7/arch/mips/ke #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c ---- linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c +--- linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c 2011-08-23 21:47:55.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) @@ -1484,9 +1162,9 @@ diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c linux-3.0.7/arch/mips/ke #include <asm/processor.h> /* -diff -urNp linux-3.0.7/arch/mips/kernel/process.c linux-3.0.7/arch/mips/kernel/process.c ---- linux-3.0.7/arch/mips/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/kernel/process.c linux-3.0.8/arch/mips/kernel/process.c +--- linux-3.0.8/arch/mips/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1503,9 +1181,9 @@ diff -urNp linux-3.0.7/arch/mips/kernel/process.c linux-3.0.7/arch/mips/kernel/p - - return sp & ALMASK; -} -diff -urNp linux-3.0.7/arch/mips/mm/fault.c linux-3.0.7/arch/mips/mm/fault.c ---- linux-3.0.7/arch/mips/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/mm/fault.c linux-3.0.8/arch/mips/mm/fault.c +--- linux-3.0.8/arch/mips/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -28,6 +28,23 @@ #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> @@ -1530,9 +1208,9 @@ diff -urNp linux-3.0.7/arch/mips/mm/fault.c linux-3.0.7/arch/mips/mm/fault.c /* * 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-3.0.7/arch/mips/mm/mmap.c linux-3.0.7/arch/mips/mm/mmap.c ---- linux-3.0.7/arch/mips/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/mips/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/mips/mm/mmap.c linux-3.0.8/arch/mips/mm/mmap.c +--- linux-3.0.8/arch/mips/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/mips/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 @@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1594,9 +1272,9 @@ diff -urNp linux-3.0.7/arch/mips/mm/mmap.c linux-3.0.7/arch/mips/mm/mmap.c - - return ret; -} -diff -urNp linux-3.0.7/arch/parisc/include/asm/elf.h linux-3.0.7/arch/parisc/include/asm/elf.h ---- linux-3.0.7/arch/parisc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/include/asm/elf.h linux-3.0.8/arch/parisc/include/asm/elf.h +--- linux-3.0.8/arch/parisc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1611,9 +1289,9 @@ diff -urNp linux-3.0.7/arch/parisc/include/asm/elf.h linux-3.0.7/arch/parisc/inc /* 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-3.0.7/arch/parisc/include/asm/pgtable.h linux-3.0.7/arch/parisc/include/asm/pgtable.h ---- linux-3.0.7/arch/parisc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/include/asm/pgtable.h linux-3.0.8/arch/parisc/include/asm/pgtable.h +--- linux-3.0.8/arch/parisc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 @@ -210,6 +210,17 @@ struct vm_area_struct; #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1632,9 +1310,9 @@ diff -urNp linux-3.0.7/arch/parisc/include/asm/pgtable.h linux-3.0.7/arch/parisc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC) #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX) -diff -urNp linux-3.0.7/arch/parisc/kernel/module.c linux-3.0.7/arch/parisc/kernel/module.c ---- linux-3.0.7/arch/parisc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/kernel/module.c linux-3.0.8/arch/parisc/kernel/module.c +--- linux-3.0.8/arch/parisc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -98,16 +98,38 @@ /* three functions to determine where in the module core @@ -1735,9 +1413,9 @@ diff -urNp linux-3.0.7/arch/parisc/kernel/module.c linux-3.0.7/arch/parisc/kerne 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-3.0.7/arch/parisc/kernel/sys_parisc.c linux-3.0.7/arch/parisc/kernel/sys_parisc.c ---- linux-3.0.7/arch/parisc/kernel/sys_parisc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/kernel/sys_parisc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/kernel/sys_parisc.c linux-3.0.8/arch/parisc/kernel/sys_parisc.c +--- linux-3.0.8/arch/parisc/kernel/sys_parisc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/kernel/sys_parisc.c 2011-08-23 21:47:55.000000000 -0400 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1765,9 +1443,9 @@ diff -urNp linux-3.0.7/arch/parisc/kernel/sys_parisc.c linux-3.0.7/arch/parisc/k if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-3.0.7/arch/parisc/kernel/traps.c linux-3.0.7/arch/parisc/kernel/traps.c ---- linux-3.0.7/arch/parisc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/kernel/traps.c linux-3.0.8/arch/parisc/kernel/traps.c +--- linux-3.0.8/arch/parisc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1779,9 +1457,9 @@ diff -urNp linux-3.0.7/arch/parisc/kernel/traps.c linux-3.0.7/arch/parisc/kernel fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-3.0.7/arch/parisc/mm/fault.c linux-3.0.7/arch/parisc/mm/fault.c ---- linux-3.0.7/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/parisc/mm/fault.c linux-3.0.8/arch/parisc/mm/fault.c +--- linux-3.0.8/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1951,9 +1629,9 @@ diff -urNp linux-3.0.7/arch/parisc/mm/fault.c linux-3.0.7/arch/parisc/mm/fault.c /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-3.0.7/arch/powerpc/include/asm/elf.h linux-3.0.7/arch/powerpc/include/asm/elf.h ---- linux-3.0.7/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/elf.h linux-3.0.8/arch/powerpc/include/asm/elf.h +--- linux-3.0.8/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -178,8 +178,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. */ @@ -1986,9 +1664,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/elf.h linux-3.0.7/arch/powerpc/i #endif /* __KERNEL__ */ /* -diff -urNp linux-3.0.7/arch/powerpc/include/asm/kmap_types.h linux-3.0.7/arch/powerpc/include/asm/kmap_types.h ---- linux-3.0.7/arch/powerpc/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/kmap_types.h linux-3.0.8/arch/powerpc/include/asm/kmap_types.h +--- linux-3.0.8/arch/powerpc/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, @@ -1997,9 +1675,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/kmap_types.h linux-3.0.7/arch/po KM_TYPE_NR }; -diff -urNp linux-3.0.7/arch/powerpc/include/asm/mman.h linux-3.0.7/arch/powerpc/include/asm/mman.h ---- linux-3.0.7/arch/powerpc/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/mman.h linux-3.0.8/arch/powerpc/include/asm/mman.h +--- linux-3.0.8/arch/powerpc/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm } #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot) @@ -2009,9 +1687,33 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/mman.h linux-3.0.7/arch/powerpc/ { return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0); } -diff -urNp linux-3.0.7/arch/powerpc/include/asm/page.h linux-3.0.7/arch/powerpc/include/asm/page.h ---- linux-3.0.7/arch/powerpc/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/page_64.h linux-3.0.8/arch/powerpc/include/asm/page_64.h +--- linux-3.0.8/arch/powerpc/include/asm/page_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/page_64.h 2011-08-23 21:47:55.000000000 -0400 +@@ -155,15 +155,18 @@ do { \ + * stack by default, so in the absence of a PT_GNU_STACK program header + * we turn execute permission off. + */ +-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ +- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) ++#define VM_STACK_DEFAULT_FLAGS32 \ ++ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ ++ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + + #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + ++#ifndef CONFIG_PAX_PAGEEXEC + #define VM_STACK_DEFAULT_FLAGS \ + (is_32bit_task() ? \ + VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) ++#endif + + #include <asm-generic/getorder.h> + +diff -urNp linux-3.0.8/arch/powerpc/include/asm/page.h linux-3.0.8/arch/powerpc/include/asm/page.h +--- linux-3.0.8/arch/powerpc/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -2034,33 +1736,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/page.h linux-3.0.7/arch/powerpc/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-3.0.7/arch/powerpc/include/asm/page_64.h linux-3.0.7/arch/powerpc/include/asm/page_64.h ---- linux-3.0.7/arch/powerpc/include/asm/page_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/page_64.h 2011-08-23 21:47:55.000000000 -0400 -@@ -155,15 +155,18 @@ do { \ - * stack by default, so in the absence of a PT_GNU_STACK program header - * we turn execute permission off. - */ --#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ -- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -+#define VM_STACK_DEFAULT_FLAGS32 \ -+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ -+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - - #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -+#ifndef CONFIG_PAX_PAGEEXEC - #define VM_STACK_DEFAULT_FLAGS \ - (is_32bit_task() ? \ - VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) -+#endif - - #include <asm-generic/getorder.h> - -diff -urNp linux-3.0.7/arch/powerpc/include/asm/pgtable.h linux-3.0.7/arch/powerpc/include/asm/pgtable.h ---- linux-3.0.7/arch/powerpc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/pgtable.h linux-3.0.8/arch/powerpc/include/asm/pgtable.h +--- linux-3.0.8/arch/powerpc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -2069,9 +1747,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/pgtable.h linux-3.0.7/arch/power #ifndef __ASSEMBLY__ #include <asm/processor.h> /* For TASK_SIZE */ #include <asm/mmu.h> -diff -urNp linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h ---- linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h +--- linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h 2011-08-23 21:47:55.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2080,9 +1758,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h linux-3.0.7/arch/po #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-3.0.7/arch/powerpc/include/asm/reg.h linux-3.0.7/arch/powerpc/include/asm/reg.h ---- linux-3.0.7/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/reg.h linux-3.0.8/arch/powerpc/include/asm/reg.h +--- linux-3.0.8/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400 @@ -209,6 +209,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2091,9 +1769,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/reg.h linux-3.0.7/arch/powerpc/i #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-3.0.7/arch/powerpc/include/asm/system.h linux-3.0.7/arch/powerpc/include/asm/system.h ---- linux-3.0.7/arch/powerpc/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/system.h linux-3.0.8/arch/powerpc/include/asm/system.h +--- linux-3.0.8/arch/powerpc/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #endif @@ -2103,9 +1781,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/system.h linux-3.0.7/arch/powerp /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-3.0.7/arch/powerpc/include/asm/uaccess.h linux-3.0.7/arch/powerpc/include/asm/uaccess.h ---- linux-3.0.7/arch/powerpc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/include/asm/uaccess.h linux-3.0.8/arch/powerpc/include/asm/uaccess.h +--- linux-3.0.8/arch/powerpc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2283,9 +1961,9 @@ diff -urNp linux-3.0.7/arch/powerpc/include/asm/uaccess.h linux-3.0.7/arch/power 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-3.0.7/arch/powerpc/kernel/exceptions-64e.S linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S ---- linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S +--- linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S 2011-08-23 21:47:55.000000000 -0400 @@ -567,6 +567,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2304,9 +1982,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S linux-3.0.7/arch/pow addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S ---- linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S +--- linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S 2011-08-23 21:47:55.000000000 -0400 @@ -956,10 +956,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2319,9 +1997,41 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S linux-3.0.7/arch/pow mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-3.0.7/arch/powerpc/kernel/module.c linux-3.0.7/arch/powerpc/kernel/module.c ---- linux-3.0.7/arch/powerpc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/module_32.c linux-3.0.8/arch/powerpc/kernel/module_32.c +--- linux-3.0.8/arch/powerpc/kernel/module_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/module_32.c 2011-08-23 21:47:55.000000000 -0400 +@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr + me->arch.core_plt_section = i; + } + if (!me->arch.core_plt_section || !me->arch.init_plt_section) { +- printk("Module doesn't contain .plt or .init.plt sections.\n"); ++ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name); + return -ENOEXEC; + } + +@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati + + DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location); + /* Init, or core PLT? */ +- if (location >= mod->module_core +- && location < mod->module_core + mod->core_size) ++ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) || ++ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw)) + entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr; +- else ++ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) || ++ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw)) + entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr; ++ else { ++ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name); ++ return ~0UL; ++ } + + /* Find this entry, or if that fails, the next avail. entry */ + while (entry->jump[0]) { +diff -urNp linux-3.0.8/arch/powerpc/kernel/module.c linux-3.0.8/arch/powerpc/kernel/module.c +--- linux-3.0.8/arch/powerpc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2361,41 +2071,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/module.c linux-3.0.7/arch/powerpc/ker static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-3.0.7/arch/powerpc/kernel/module_32.c linux-3.0.7/arch/powerpc/kernel/module_32.c ---- linux-3.0.7/arch/powerpc/kernel/module_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/module_32.c 2011-08-23 21:47:55.000000000 -0400 -@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr - me->arch.core_plt_section = i; - } - if (!me->arch.core_plt_section || !me->arch.init_plt_section) { -- printk("Module doesn't contain .plt or .init.plt sections.\n"); -+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name); - return -ENOEXEC; - } - -@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati - - DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location); - /* Init, or core PLT? */ -- if (location >= mod->module_core -- && location < mod->module_core + mod->core_size) -+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) || -+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw)) - entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr; -- else -+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) || -+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw)) - entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr; -+ else { -+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name); -+ return ~0UL; -+ } - - /* Find this entry, or if that fails, the next avail. entry */ - while (entry->jump[0]) { -diff -urNp linux-3.0.7/arch/powerpc/kernel/process.c linux-3.0.7/arch/powerpc/kernel/process.c ---- linux-3.0.7/arch/powerpc/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/process.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/process.c linux-3.0.8/arch/powerpc/kernel/process.c +--- linux-3.0.8/arch/powerpc/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/process.c 2011-08-23 21:48:14.000000000 -0400 @@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2488,9 +2166,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/process.c linux-3.0.7/arch/powerpc/ke - - return ret; -} -diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_32.c linux-3.0.7/arch/powerpc/kernel/signal_32.c ---- linux-3.0.7/arch/powerpc/kernel/signal_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/signal_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_32.c linux-3.0.8/arch/powerpc/kernel/signal_32.c +--- linux-3.0.8/arch/powerpc/kernel/signal_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/signal_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2500,9 +2178,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_32.c linux-3.0.7/arch/powerpc/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_64.c linux-3.0.7/arch/powerpc/kernel/signal_64.c ---- linux-3.0.7/arch/powerpc/kernel/signal_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/signal_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_64.c linux-3.0.8/arch/powerpc/kernel/signal_64.c +--- linux-3.0.8/arch/powerpc/kernel/signal_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/signal_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2512,9 +2190,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_64.c linux-3.0.7/arch/powerpc/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-3.0.7/arch/powerpc/kernel/traps.c linux-3.0.7/arch/powerpc/kernel/traps.c ---- linux-3.0.7/arch/powerpc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/traps.c linux-3.0.8/arch/powerpc/kernel/traps.c +--- linux-3.0.8/arch/powerpc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void) static inline void pmac_backlight_unblank(void) { } #endif @@ -2533,9 +2211,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/traps.c linux-3.0.7/arch/powerpc/kern oops_exit(); do_exit(err); -diff -urNp linux-3.0.7/arch/powerpc/kernel/vdso.c linux-3.0.7/arch/powerpc/kernel/vdso.c ---- linux-3.0.7/arch/powerpc/kernel/vdso.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/kernel/vdso.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/kernel/vdso.c linux-3.0.8/arch/powerpc/kernel/vdso.c +--- linux-3.0.8/arch/powerpc/kernel/vdso.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/kernel/vdso.c 2011-08-23 21:47:55.000000000 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2562,9 +2240,9 @@ diff -urNp linux-3.0.7/arch/powerpc/kernel/vdso.c linux-3.0.7/arch/powerpc/kerne if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-3.0.7/arch/powerpc/lib/usercopy_64.c linux-3.0.7/arch/powerpc/lib/usercopy_64.c ---- linux-3.0.7/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/lib/usercopy_64.c linux-3.0.8/arch/powerpc/lib/usercopy_64.c +--- linux-3.0.8/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2596,9 +2274,9 @@ diff -urNp linux-3.0.7/arch/powerpc/lib/usercopy_64.c linux-3.0.7/arch/powerpc/l -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-3.0.7/arch/powerpc/mm/fault.c linux-3.0.7/arch/powerpc/mm/fault.c ---- linux-3.0.7/arch/powerpc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/mm/fault.c linux-3.0.8/arch/powerpc/mm/fault.c +--- linux-3.0.8/arch/powerpc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 @@ -32,6 +32,10 @@ #include <linux/perf_event.h> #include <linux/magic.h> @@ -2703,9 +2381,9 @@ diff -urNp linux-3.0.7/arch/powerpc/mm/fault.c linux-3.0.7/arch/powerpc/mm/fault _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-3.0.7/arch/powerpc/mm/mmap_64.c linux-3.0.7/arch/powerpc/mm/mmap_64.c ---- linux-3.0.7/arch/powerpc/mm/mmap_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/mm/mmap_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/mm/mmap_64.c linux-3.0.8/arch/powerpc/mm/mmap_64.c +--- linux-3.0.8/arch/powerpc/mm/mmap_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/mm/mmap_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2729,9 +2407,9 @@ diff -urNp linux-3.0.7/arch/powerpc/mm/mmap_64.c linux-3.0.7/arch/powerpc/mm/mma mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.7/arch/powerpc/mm/slice.c linux-3.0.7/arch/powerpc/mm/slice.c ---- linux-3.0.7/arch/powerpc/mm/slice.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/powerpc/mm/slice.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/powerpc/mm/slice.c linux-3.0.8/arch/powerpc/mm/slice.c +--- linux-3.0.8/arch/powerpc/mm/slice.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/powerpc/mm/slice.c 2011-08-23 21:47:55.000000000 -0400 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -2798,9 +2476,9 @@ diff -urNp linux-3.0.7/arch/powerpc/mm/slice.c linux-3.0.7/arch/powerpc/mm/slice /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-3.0.7/arch/s390/include/asm/elf.h linux-3.0.7/arch/s390/include/asm/elf.h ---- linux-3.0.7/arch/s390/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/include/asm/elf.h linux-3.0.8/arch/s390/include/asm/elf.h +--- linux-3.0.8/arch/s390/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; 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. */ @@ -2826,9 +2504,9 @@ diff -urNp linux-3.0.7/arch/s390/include/asm/elf.h linux-3.0.7/arch/s390/include -#define arch_randomize_brk arch_randomize_brk - #endif -diff -urNp linux-3.0.7/arch/s390/include/asm/system.h linux-3.0.7/arch/s390/include/asm/system.h ---- linux-3.0.7/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/include/asm/system.h linux-3.0.8/arch/s390/include/asm/system.h +--- linux-3.0.8/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); @@ -2838,9 +2516,9 @@ diff -urNp linux-3.0.7/arch/s390/include/asm/system.h linux-3.0.7/arch/s390/incl static inline int tprot(unsigned long addr) { -diff -urNp linux-3.0.7/arch/s390/include/asm/uaccess.h linux-3.0.7/arch/s390/include/asm/uaccess.h ---- linux-3.0.7/arch/s390/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/include/asm/uaccess.h linux-3.0.8/arch/s390/include/asm/uaccess.h +--- linux-3.0.8/arch/s390/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 @@ -235,6 +235,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2873,9 +2551,9 @@ diff -urNp linux-3.0.7/arch/s390/include/asm/uaccess.h linux-3.0.7/arch/s390/inc if (unlikely(sz != -1 && sz < n)) { copy_from_user_overflow(); return n; -diff -urNp linux-3.0.7/arch/s390/kernel/module.c linux-3.0.7/arch/s390/kernel/module.c ---- linux-3.0.7/arch/s390/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/kernel/module.c linux-3.0.8/arch/s390/kernel/module.c +--- linux-3.0.8/arch/s390/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2947,9 +2625,9 @@ diff -urNp linux-3.0.7/arch/s390/kernel/module.c linux-3.0.7/arch/s390/kernel/mo rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-3.0.7/arch/s390/kernel/process.c linux-3.0.7/arch/s390/kernel/process.c ---- linux-3.0.7/arch/s390/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/kernel/process.c linux-3.0.8/arch/s390/kernel/process.c +--- linux-3.0.8/arch/s390/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru } return 0; @@ -2990,9 +2668,9 @@ diff -urNp linux-3.0.7/arch/s390/kernel/process.c linux-3.0.7/arch/s390/kernel/p - return base; - return ret; -} -diff -urNp linux-3.0.7/arch/s390/kernel/setup.c linux-3.0.7/arch/s390/kernel/setup.c ---- linux-3.0.7/arch/s390/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/kernel/setup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/kernel/setup.c linux-3.0.8/arch/s390/kernel/setup.c +--- linux-3.0.8/arch/s390/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/kernel/setup.c 2011-08-23 21:47:55.000000000 -0400 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char * } early_param("mem", early_parse_mem); @@ -3002,9 +2680,9 @@ diff -urNp linux-3.0.7/arch/s390/kernel/setup.c linux-3.0.7/arch/s390/kernel/set EXPORT_SYMBOL_GPL(user_mode); static int set_amode_and_uaccess(unsigned long user_amode, -diff -urNp linux-3.0.7/arch/s390/mm/mmap.c linux-3.0.7/arch/s390/mm/mmap.c ---- linux-3.0.7/arch/s390/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/s390/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/s390/mm/mmap.c linux-3.0.8/arch/s390/mm/mmap.c +--- linux-3.0.8/arch/s390/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/s390/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3051,9 +2729,9 @@ diff -urNp linux-3.0.7/arch/s390/mm/mmap.c linux-3.0.7/arch/s390/mm/mmap.c mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.7/arch/score/include/asm/system.h linux-3.0.7/arch/score/include/asm/system.h ---- linux-3.0.7/arch/score/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/score/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/score/include/asm/system.h linux-3.0.8/arch/score/include/asm/system.h +--- linux-3.0.8/arch/score/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/score/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) @@ -3063,9 +2741,9 @@ diff -urNp linux-3.0.7/arch/score/include/asm/system.h linux-3.0.7/arch/score/in #define mb() barrier() #define rmb() barrier() -diff -urNp linux-3.0.7/arch/score/kernel/process.c linux-3.0.7/arch/score/kernel/process.c ---- linux-3.0.7/arch/score/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/score/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/score/kernel/process.c linux-3.0.8/arch/score/kernel/process.c +--- linux-3.0.8/arch/score/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/score/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru return task_pt_regs(task)->cp0_epc; @@ -3075,9 +2753,9 @@ diff -urNp linux-3.0.7/arch/score/kernel/process.c linux-3.0.7/arch/score/kernel -{ - return sp; -} -diff -urNp linux-3.0.7/arch/sh/mm/mmap.c linux-3.0.7/arch/sh/mm/mmap.c ---- linux-3.0.7/arch/sh/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sh/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sh/mm/mmap.c linux-3.0.8/arch/sh/mm/mmap.c +--- linux-3.0.8/arch/sh/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sh/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr = PAGE_ALIGN(addr); @@ -3152,21 +2830,9 @@ diff -urNp linux-3.0.7/arch/sh/mm/mmap.c linux-3.0.7/arch/sh/mm/mmap.c bottomup: /* -diff -urNp linux-3.0.7/arch/sparc/Makefile linux-3.0.7/arch/sparc/Makefile ---- linux-3.0.7/arch/sparc/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/Makefile 2011-08-23 21:48:14.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 - VMLINUX_INIT := $(head-y) $(init-y) --VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ -+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/ - VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) - VMLINUX_MAIN += $(drivers-y) $(net-y) - -diff -urNp linux-3.0.7/arch/sparc/include/asm/atomic_64.h linux-3.0.7/arch/sparc/include/asm/atomic_64.h ---- linux-3.0.7/arch/sparc/include/asm/atomic_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/atomic_64.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/atomic_64.h linux-3.0.8/arch/sparc/include/asm/atomic_64.h +--- linux-3.0.8/arch/sparc/include/asm/atomic_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/atomic_64.h 2011-08-23 21:48:14.000000000 -0400 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3359,9 +3025,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/atomic_64.h linux-3.0.7/arch/sparc } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-3.0.7/arch/sparc/include/asm/cache.h linux-3.0.7/arch/sparc/include/asm/cache.h ---- linux-3.0.7/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/cache.h linux-3.0.8/arch/sparc/include/asm/cache.h +--- linux-3.0.8/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 @@ -10,7 +10,7 @@ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) @@ -3371,9 +3037,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/cache.h linux-3.0.7/arch/sparc/inc #ifdef CONFIG_SPARC32 #define SMP_CACHE_BYTES_SHIFT 5 -diff -urNp linux-3.0.7/arch/sparc/include/asm/elf_32.h linux-3.0.7/arch/sparc/include/asm/elf_32.h ---- linux-3.0.7/arch/sparc/include/asm/elf_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/elf_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_32.h linux-3.0.8/arch/sparc/include/asm/elf_32.h +--- linux-3.0.8/arch/sparc/include/asm/elf_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/elf_32.h 2011-08-23 21:47:55.000000000 -0400 @@ -114,6 +114,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3388,9 +3054,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/elf_32.h linux-3.0.7/arch/sparc/in /* 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-3.0.7/arch/sparc/include/asm/elf_64.h linux-3.0.7/arch/sparc/include/asm/elf_64.h ---- linux-3.0.7/arch/sparc/include/asm/elf_64.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/elf_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_64.h linux-3.0.8/arch/sparc/include/asm/elf_64.h +--- linux-3.0.8/arch/sparc/include/asm/elf_64.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/elf_64.h 2011-08-23 21:47:55.000000000 -0400 @@ -180,6 +180,13 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3405,9 +3071,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/elf_64.h linux-3.0.7/arch/sparc/in extern unsigned long sparc64_elf_hwcap; #define ELF_HWCAP sparc64_elf_hwcap -diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtable_32.h linux-3.0.7/arch/sparc/include/asm/pgtable_32.h ---- linux-3.0.7/arch/sparc/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtable_32.h linux-3.0.8/arch/sparc/include/asm/pgtable_32.h +--- linux-3.0.8/arch/sparc/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3439,9 +3105,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtable_32.h linux-3.0.7/arch/spar extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h ---- linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h +--- linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h 2011-08-23 21:47:55.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3456,9 +3122,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.7/arch/sparc/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-3.0.7/arch/sparc/include/asm/spinlock_64.h linux-3.0.7/arch/sparc/include/asm/spinlock_64.h ---- linux-3.0.7/arch/sparc/include/asm/spinlock_64.h 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/spinlock_64.h 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/spinlock_64.h linux-3.0.8/arch/sparc/include/asm/spinlock_64.h +--- linux-3.0.8/arch/sparc/include/asm/spinlock_64.h 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/spinlock_64.h 2011-10-16 21:55:27.000000000 -0400 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags( /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ @@ -3556,9 +3222,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/spinlock_64.h linux-3.0.7/arch/spa { unsigned long mask, tmp1, tmp2, result; -diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_32.h linux-3.0.7/arch/sparc/include/asm/thread_info_32.h ---- linux-3.0.7/arch/sparc/include/asm/thread_info_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/thread_info_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_32.h linux-3.0.8/arch/sparc/include/asm/thread_info_32.h +--- linux-3.0.8/arch/sparc/include/asm/thread_info_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/thread_info_32.h 2011-08-23 21:47:55.000000000 -0400 @@ -50,6 +50,8 @@ struct thread_info { unsigned long w_saved; @@ -3568,9 +3234,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_32.h linux-3.0.7/arch/ }; /* -diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_64.h linux-3.0.7/arch/sparc/include/asm/thread_info_64.h ---- linux-3.0.7/arch/sparc/include/asm/thread_info_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/thread_info_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_64.h linux-3.0.8/arch/sparc/include/asm/thread_info_64.h +--- linux-3.0.8/arch/sparc/include/asm/thread_info_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/thread_info_64.h 2011-08-23 21:47:55.000000000 -0400 @@ -63,6 +63,8 @@ struct thread_info { struct pt_regs *kern_una_regs; unsigned int kern_una_insn; @@ -3580,26 +3246,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_64.h linux-3.0.7/arch/ unsigned long fpregs[0] __attribute__ ((aligned(64))); }; -diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess.h linux-3.0.7/arch/sparc/include/asm/uaccess.h ---- linux-3.0.7/arch/sparc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/uaccess.h 2011-08-23 21:47:55.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-3.0.7/arch/sparc/include/asm/uaccess_32.h linux-3.0.7/arch/sparc/include/asm/uaccess_32.h ---- linux-3.0.7/arch/sparc/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/uaccess_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_32.h linux-3.0.8/arch/sparc/include/asm/uaccess_32.h +--- linux-3.0.8/arch/sparc/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/uaccess_32.h 2011-08-23 21:47:55.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) @@ -3651,9 +3300,9 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess_32.h linux-3.0.7/arch/spar return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess_64.h linux-3.0.7/arch/sparc/include/asm/uaccess_64.h ---- linux-3.0.7/arch/sparc/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/include/asm/uaccess_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_64.h linux-3.0.8/arch/sparc/include/asm/uaccess_64.h +--- linux-3.0.8/arch/sparc/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/uaccess_64.h 2011-08-23 21:47:55.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3696,9 +3345,26 @@ diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess_64.h linux-3.0.7/arch/spar if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-3.0.7/arch/sparc/kernel/Makefile linux-3.0.7/arch/sparc/kernel/Makefile ---- linux-3.0.7/arch/sparc/kernel/Makefile 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/Makefile 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess.h linux-3.0.8/arch/sparc/include/asm/uaccess.h +--- linux-3.0.8/arch/sparc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/include/asm/uaccess.h 2011-08-23 21:47:55.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-3.0.8/arch/sparc/kernel/Makefile linux-3.0.8/arch/sparc/kernel/Makefile +--- linux-3.0.8/arch/sparc/kernel/Makefile 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/Makefile 2011-10-16 21:55:27.000000000 -0400 @@ -3,7 +3,7 @@ # @@ -3708,9 +3374,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/Makefile linux-3.0.7/arch/sparc/kernel/ extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-3.0.7/arch/sparc/kernel/process_32.c linux-3.0.7/arch/sparc/kernel/process_32.c ---- linux-3.0.7/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/process_32.c linux-3.0.8/arch/sparc/kernel/process_32.c +--- linux-3.0.8/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -3746,9 +3412,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/process_32.c linux-3.0.7/arch/sparc/ker fp = rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-3.0.7/arch/sparc/kernel/process_64.c linux-3.0.7/arch/sparc/kernel/process_64.c ---- linux-3.0.7/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/process_64.c linux-3.0.8/arch/sparc/kernel/process_64.c +--- linux-3.0.8/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -3784,9 +3450,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/process_64.c linux-3.0.7/arch/sparc/ker (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c ---- linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c +--- linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3805,9 +3471,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c linux-3.0.7/arch/sparc/k return addr; addr = vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c ---- linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c +--- linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -3955,9 +3621,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c linux-3.0.7/arch/sparc/k mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.7/arch/sparc/kernel/traps_32.c linux-3.0.7/arch/sparc/kernel/traps_32.c ---- linux-3.0.7/arch/sparc/kernel/traps_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/traps_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/traps_32.c linux-3.0.8/arch/sparc/kernel/traps_32.c +--- linux-3.0.8/arch/sparc/kernel/traps_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/traps_32.c 2011-08-23 21:48:14.000000000 -0400 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t") #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t") @@ -3987,9 +3653,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/traps_32.c linux-3.0.7/arch/sparc/kerne do_exit(SIGSEGV); } -diff -urNp linux-3.0.7/arch/sparc/kernel/traps_64.c linux-3.0.7/arch/sparc/kernel/traps_64.c ---- linux-3.0.7/arch/sparc/kernel/traps_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/traps_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/traps_64.c linux-3.0.8/arch/sparc/kernel/traps_64.c +--- linux-3.0.8/arch/sparc/kernel/traps_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/traps_64.c 2011-08-23 21:48:14.000000000 -0400 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -4127,9 +3793,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/traps_64.c linux-3.0.7/arch/sparc/kerne do_exit(SIGSEGV); } EXPORT_SYMBOL(die_if_kernel); -diff -urNp linux-3.0.7/arch/sparc/kernel/unaligned_64.c linux-3.0.7/arch/sparc/kernel/unaligned_64.c ---- linux-3.0.7/arch/sparc/kernel/unaligned_64.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/arch/sparc/kernel/unaligned_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/kernel/unaligned_64.c linux-3.0.8/arch/sparc/kernel/unaligned_64.c +--- linux-3.0.8/arch/sparc/kernel/unaligned_64.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/arch/sparc/kernel/unaligned_64.c 2011-08-23 21:48:14.000000000 -0400 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); @@ -4139,21 +3805,9 @@ diff -urNp linux-3.0.7/arch/sparc/kernel/unaligned_64.c linux-3.0.7/arch/sparc/k regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-3.0.7/arch/sparc/lib/Makefile linux-3.0.7/arch/sparc/lib/Makefile ---- linux-3.0.7/arch/sparc/lib/Makefile 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/arch/sparc/lib/Makefile 2011-08-23 21:47:55.000000000 -0400 -@@ -2,7 +2,7 @@ - # - - asflags-y := -ansi -DST_DIV0=0x02 --ccflags-y := -Werror -+#ccflags-y := -Werror - - lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o - lib-$(CONFIG_SPARC32) += memcpy.o memset.o -diff -urNp linux-3.0.7/arch/sparc/lib/atomic_64.S linux-3.0.7/arch/sparc/lib/atomic_64.S ---- linux-3.0.7/arch/sparc/lib/atomic_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/lib/atomic_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/lib/atomic_64.S linux-3.0.8/arch/sparc/lib/atomic_64.S +--- linux-3.0.8/arch/sparc/lib/atomic_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/lib/atomic_64.S 2011-08-23 21:47:55.000000000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4388,9 +4042,9 @@ diff -urNp linux-3.0.7/arch/sparc/lib/atomic_64.S linux-3.0.7/arch/sparc/lib/ato casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -diff -urNp linux-3.0.7/arch/sparc/lib/ksyms.c linux-3.0.7/arch/sparc/lib/ksyms.c ---- linux-3.0.7/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/lib/ksyms.c linux-3.0.8/arch/sparc/lib/ksyms.c +--- linux-3.0.8/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -4410,21 +4064,33 @@ diff -urNp linux-3.0.7/arch/sparc/lib/ksyms.c linux-3.0.7/arch/sparc/lib/ksyms.c EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ -diff -urNp linux-3.0.7/arch/sparc/mm/Makefile linux-3.0.7/arch/sparc/mm/Makefile ---- linux-3.0.7/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/lib/Makefile linux-3.0.8/arch/sparc/lib/Makefile +--- linux-3.0.8/arch/sparc/lib/Makefile 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/arch/sparc/lib/Makefile 2011-08-23 21:47:55.000000000 -0400 @@ -2,7 +2,7 @@ # - asflags-y := -ansi + asflags-y := -ansi -DST_DIV0=0x02 -ccflags-y := -Werror +#ccflags-y := -Werror - obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o - obj-y += fault_$(BITS).o -diff -urNp linux-3.0.7/arch/sparc/mm/fault_32.c linux-3.0.7/arch/sparc/mm/fault_32.c ---- linux-3.0.7/arch/sparc/mm/fault_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/fault_32.c 2011-08-23 21:47:55.000000000 -0400 + lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o + lib-$(CONFIG_SPARC32) += memcpy.o memset.o +diff -urNp linux-3.0.8/arch/sparc/Makefile linux-3.0.8/arch/sparc/Makefile +--- linux-3.0.8/arch/sparc/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/Makefile 2011-08-23 21:48:14.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 + VMLINUX_INIT := $(head-y) $(init-y) +-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ ++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/ + VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) + VMLINUX_MAIN += $(drivers-y) $(net-y) + +diff -urNp linux-3.0.8/arch/sparc/mm/fault_32.c linux-3.0.8/arch/sparc/mm/fault_32.c +--- linux-3.0.8/arch/sparc/mm/fault_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/fault_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -22,6 +22,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4729,9 +4395,9 @@ diff -urNp linux-3.0.7/arch/sparc/mm/fault_32.c linux-3.0.7/arch/sparc/mm/fault_ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-3.0.7/arch/sparc/mm/fault_64.c linux-3.0.7/arch/sparc/mm/fault_64.c ---- linux-3.0.7/arch/sparc/mm/fault_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/fault_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/mm/fault_64.c linux-3.0.8/arch/sparc/mm/fault_64.c +--- linux-3.0.8/arch/sparc/mm/fault_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/fault_64.c 2011-08-23 21:48:14.000000000 -0400 @@ -21,6 +21,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -5239,9 +4905,9 @@ diff -urNp linux-3.0.7/arch/sparc/mm/fault_64.c linux-3.0.7/arch/sparc/mm/fault_ /* 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-3.0.7/arch/sparc/mm/hugetlbpage.c linux-3.0.7/arch/sparc/mm/hugetlbpage.c ---- linux-3.0.7/arch/sparc/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/mm/hugetlbpage.c linux-3.0.8/arch/sparc/mm/hugetlbpage.c +--- linux-3.0.8/arch/sparc/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 @@ -68,7 +68,7 @@ full_search: } return -ENOMEM; @@ -5301,9 +4967,9 @@ diff -urNp linux-3.0.7/arch/sparc/mm/hugetlbpage.c linux-3.0.7/arch/sparc/mm/hug return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-3.0.7/arch/sparc/mm/init_32.c linux-3.0.7/arch/sparc/mm/init_32.c ---- linux-3.0.7/arch/sparc/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/mm/init_32.c linux-3.0.8/arch/sparc/mm/init_32.c +--- linux-3.0.8/arch/sparc/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -316,6 +316,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5338,9 +5004,21 @@ diff -urNp linux-3.0.7/arch/sparc/mm/init_32.c linux-3.0.7/arch/sparc/mm/init_32 protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-3.0.7/arch/sparc/mm/srmmu.c linux-3.0.7/arch/sparc/mm/srmmu.c ---- linux-3.0.7/arch/sparc/mm/srmmu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/sparc/mm/srmmu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/sparc/mm/Makefile linux-3.0.8/arch/sparc/mm/Makefile +--- linux-3.0.8/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400 +@@ -2,7 +2,7 @@ + # + + asflags-y := -ansi +-ccflags-y := -Werror ++#ccflags-y := -Werror + + obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o + obj-y += fault_$(BITS).o +diff -urNp linux-3.0.8/arch/sparc/mm/srmmu.c linux-3.0.8/arch/sparc/mm/srmmu.c +--- linux-3.0.8/arch/sparc/mm/srmmu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/sparc/mm/srmmu.c 2011-08-23 21:47:55.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)); @@ -5355,9 +5033,9 @@ diff -urNp linux-3.0.7/arch/sparc/mm/srmmu.c linux-3.0.7/arch/sparc/mm/srmmu.c BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-3.0.7/arch/um/include/asm/kmap_types.h linux-3.0.7/arch/um/include/asm/kmap_types.h ---- linux-3.0.7/arch/um/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/um/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/um/include/asm/kmap_types.h linux-3.0.8/arch/um/include/asm/kmap_types.h +--- linux-3.0.8/arch/um/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5366,9 +5044,9 @@ diff -urNp linux-3.0.7/arch/um/include/asm/kmap_types.h linux-3.0.7/arch/um/incl KM_TYPE_NR }; -diff -urNp linux-3.0.7/arch/um/include/asm/page.h linux-3.0.7/arch/um/include/asm/page.h ---- linux-3.0.7/arch/um/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/um/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/um/include/asm/page.h linux-3.0.8/arch/um/include/asm/page.h +--- linux-3.0.8/arch/um/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5379,9 +5057,9 @@ diff -urNp linux-3.0.7/arch/um/include/asm/page.h linux-3.0.7/arch/um/include/as #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-3.0.7/arch/um/kernel/process.c linux-3.0.7/arch/um/kernel/process.c ---- linux-3.0.7/arch/um/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/um/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/um/kernel/process.c linux-3.0.8/arch/um/kernel/process.c +--- linux-3.0.8/arch/um/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 @@ -404,22 +404,6 @@ int singlestepping(void * t) return 2; } @@ -5405,9 +5083,35 @@ diff -urNp linux-3.0.7/arch/um/kernel/process.c linux-3.0.7/arch/um/kernel/proce unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-3.0.7/arch/um/sys-i386/syscalls.c linux-3.0.7/arch/um/sys-i386/syscalls.c ---- linux-3.0.7/arch/um/sys-i386/syscalls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/um/sys-i386/syscalls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/um/Makefile linux-3.0.8/arch/um/Makefile +--- linux-3.0.8/arch/um/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/Makefile 2011-10-20 04:46:01.000000000 -0400 +@@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE + $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \ + $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 + ++ifdef CONSTIFY_PLUGIN ++USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify ++endif ++ + include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) + + #This will adjust *FLAGS accordingly to the platform. +diff -urNp linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h +--- linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h 2011-10-20 04:46:01.000000000 -0400 +@@ -17,7 +17,7 @@ + # define AT_VECTOR_SIZE_ARCH 1 + #endif + +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) ((x) & ~0xfUL) + + void default_idle(void); + +diff -urNp linux-3.0.8/arch/um/sys-i386/syscalls.c linux-3.0.8/arch/um/sys-i386/syscalls.c +--- linux-3.0.8/arch/um/sys-i386/syscalls.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/sys-i386/syscalls.c 2011-08-23 21:47:55.000000000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5430,172 +5134,21 @@ diff -urNp linux-3.0.7/arch/um/sys-i386/syscalls.c linux-3.0.7/arch/um/sys-i386/ /* * The prototype on i386 is: * -diff -urNp linux-3.0.7/arch/x86/Kconfig linux-3.0.7/arch/x86/Kconfig ---- linux-3.0.7/arch/x86/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/Kconfig 2011-09-17 00:58:36.000000000 -0400 -@@ -229,7 +229,7 @@ config X86_HT - - config X86_32_LAZY_GS - def_bool y -- depends on X86_32 && !CC_STACKPROTECTOR -+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF - - config ARCH_HWEIGHT_CFLAGS - string -@@ -1018,7 +1018,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 -@@ -1055,7 +1055,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. -@@ -1109,7 +1109,7 @@ config PAGE_OFFSET - hex - default 0xB0000000 if VMSPLIT_3G_OPT - default 0x80000000 if VMSPLIT_2G -- default 0x78000000 if VMSPLIT_2G_OPT -+ default 0x70000000 if VMSPLIT_2G_OPT - default 0x40000000 if VMSPLIT_1G - default 0xC0000000 - depends on X86_32 -@@ -1483,6 +1483,7 @@ config SECCOMP - - config CC_STACKPROTECTOR - bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" -+ depends on X86_64 || !PAX_MEMORY_UDEREF - ---help--- - This option turns on the -fstack-protector GCC feature. This - feature puts, at the beginning of functions, a canary value on -@@ -1540,6 +1541,7 @@ config KEXEC_JUMP - config PHYSICAL_START - hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) - default "0x1000000" -+ range 0x400000 0x40000000 - ---help--- - This gives the physical address where the kernel is loaded. - -@@ -1603,6 +1605,7 @@ config X86_NEED_RELOCS - config PHYSICAL_ALIGN - hex "Alignment value to which kernel should be aligned" if X86_32 - default "0x1000000" -+ range 0x400000 0x1000000 if PAX_KERNEXEC - range 0x2000 0x1000000 - ---help--- - This value puts the alignment restrictions on physical address -@@ -1634,9 +1637,10 @@ config HOTPLUG_CPU - Say N if you want to disable CPU hotplug. - - config COMPAT_VDSO -- def_bool y -+ def_bool n - prompt "Compat VDSO support" - depends on X86_32 || IA32_EMULATION -+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF - ---help--- - Map the 32-bit VDSO to the predictable old-style address too. - -diff -urNp linux-3.0.7/arch/x86/Kconfig.cpu linux-3.0.7/arch/x86/Kconfig.cpu ---- linux-3.0.7/arch/x86/Kconfig.cpu 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/Kconfig.cpu 2011-08-23 21:47:55.000000000 -0400 -@@ -338,7 +338,7 @@ config X86_PPRO_FENCE - - config X86_F00F_BUG - def_bool y -- depends on M586MMX || M586TSC || M586 || M486 || M386 -+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC - - config X86_INVD_BUG - def_bool y -@@ -362,7 +362,7 @@ config X86_POPAD_OK - - config X86_ALIGNMENT_16 - def_bool y -- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 -+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 - - config X86_INTEL_USERCOPY - def_bool y -@@ -408,7 +408,7 @@ config X86_CMPXCHG64 - # generates cmov. - config X86_CMOV - def_bool y -- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) -+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) - - config X86_MINIMUM_CPU_FAMILY - int -diff -urNp linux-3.0.7/arch/x86/Kconfig.debug linux-3.0.7/arch/x86/Kconfig.debug ---- linux-3.0.7/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400 -@@ -81,7 +81,7 @@ config X86_PTDUMP - config DEBUG_RODATA - bool "Write protect kernel read-only data structures" - default y -- depends on DEBUG_KERNEL -+ depends on DEBUG_KERNEL && BROKEN - ---help--- - Mark the kernel read-only data as write-protected in the pagetables, - in order to catch accidental (and incorrect) writes to such const -@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST +diff -urNp linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h +--- linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h 2011-10-20 04:46:01.000000000 -0400 +@@ -17,7 +17,7 @@ + # define AT_VECTOR_SIZE_ARCH 1 + #endif - config DEBUG_SET_MODULE_RONX - bool "Set loadable kernel module data as NX and text as RO" -- depends on MODULES -+ depends on MODULES && BROKEN - ---help--- - This option helps catch unintended modifications to loadable - kernel module's text and read-only data. It also prevents execution -diff -urNp linux-3.0.7/arch/x86/Makefile linux-3.0.7/arch/x86/Makefile ---- linux-3.0.7/arch/x86/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/Makefile 2011-08-23 21:48:14.000000000 -0400 -@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y) - else - BITS := 64 - UTS_MACHINE := x86_64 -+ biarch := $(call cc-option,-m64) - CHECKFLAGS += -D__x86_64__ -m64 +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) ((x) & ~0xfUL) - KBUILD_AFLAGS += -m64 -@@ -195,3 +196,12 @@ define archhelp - echo ' FDARGS="..." arguments for the booted kernel' - echo ' FDINITRD=file initrd for the booted kernel' - endef -+ -+define OLD_LD -+ -+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils. -+*** Please upgrade your binutils to 2.18 or newer -+endef -+ -+archprepare: -+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-3.0.7/arch/x86/boot/Makefile linux-3.0.7/arch/x86/boot/Makefile ---- linux-3.0.7/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400 -@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os - $(call cc-option, -fno-stack-protector) \ - $(call cc-option, -mpreferred-stack-boundary=2) - KBUILD_CFLAGS += $(call cc-option, -m32) -+ifdef CONSTIFY_PLUGIN -+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify -+endif - KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ - GCOV_PROFILE := n + void default_idle(void); -diff -urNp linux-3.0.7/arch/x86/boot/bitops.h linux-3.0.7/arch/x86/boot/bitops.h ---- linux-3.0.7/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/bitops.h linux-3.0.8/arch/x86/boot/bitops.h +--- linux-3.0.8/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -5614,9 +5167,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/bitops.h linux-3.0.7/arch/x86/boot/bitops.h } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-3.0.7/arch/x86/boot/boot.h linux-3.0.7/arch/x86/boot/boot.h ---- linux-3.0.7/arch/x86/boot/boot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/boot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/boot.h linux-3.0.8/arch/x86/boot/boot.h +--- linux-3.0.8/arch/x86/boot/boot.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/boot.h 2011-08-23 21:47:55.000000000 -0400 @@ -85,7 +85,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5635,22 +5188,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/boot.h linux-3.0.7/arch/x86/boot/boot.h : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-3.0.7/arch/x86/boot/compressed/Makefile linux-3.0.7/arch/x86/boot/compressed/Makefile ---- linux-3.0.7/arch/x86/boot/compressed/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/compressed/Makefile 2011-08-23 21:47:55.000000000 -0400 -@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal - KBUILD_CFLAGS += $(cflags-y) - KBUILD_CFLAGS += $(call cc-option,-ffreestanding) - KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) -+ifdef CONSTIFY_PLUGIN -+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify -+endif - - KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ - GCOV_PROFILE := n -diff -urNp linux-3.0.7/arch/x86/boot/compressed/head_32.S linux-3.0.7/arch/x86/boot/compressed/head_32.S ---- linux-3.0.7/arch/x86/boot/compressed/head_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/compressed/head_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_32.S linux-3.0.8/arch/x86/boot/compressed/head_32.S +--- linux-3.0.8/arch/x86/boot/compressed/head_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/compressed/head_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5679,9 +5219,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/compressed/head_32.S linux-3.0.7/arch/x86/b addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-3.0.7/arch/x86/boot/compressed/head_64.S linux-3.0.7/arch/x86/boot/compressed/head_64.S ---- linux-3.0.7/arch/x86/boot/compressed/head_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/compressed/head_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_64.S linux-3.0.8/arch/x86/boot/compressed/head_64.S +--- linux-3.0.8/arch/x86/boot/compressed/head_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/compressed/head_64.S 2011-08-23 21:47:55.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5700,9 +5240,22 @@ diff -urNp linux-3.0.7/arch/x86/boot/compressed/head_64.S linux-3.0.7/arch/x86/b #endif /* Target address to relocate to for decompression */ -diff -urNp linux-3.0.7/arch/x86/boot/compressed/misc.c linux-3.0.7/arch/x86/boot/compressed/misc.c ---- linux-3.0.7/arch/x86/boot/compressed/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/compressed/misc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/compressed/Makefile linux-3.0.8/arch/x86/boot/compressed/Makefile +--- linux-3.0.8/arch/x86/boot/compressed/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/compressed/Makefile 2011-08-23 21:47:55.000000000 -0400 +@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal + KBUILD_CFLAGS += $(cflags-y) + KBUILD_CFLAGS += $(call cc-option,-ffreestanding) + KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) ++ifdef CONSTIFY_PLUGIN ++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify ++endif + + KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE := n +diff -urNp linux-3.0.8/arch/x86/boot/compressed/misc.c linux-3.0.8/arch/x86/boot/compressed/misc.c +--- linux-3.0.8/arch/x86/boot/compressed/misc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/compressed/misc.c 2011-08-23 21:47:55.000000000 -0400 @@ -310,7 +310,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5721,9 +5274,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/compressed/misc.c linux-3.0.7/arch/x86/boot error("Wrong destination address"); #endif -diff -urNp linux-3.0.7/arch/x86/boot/compressed/relocs.c linux-3.0.7/arch/x86/boot/compressed/relocs.c ---- linux-3.0.7/arch/x86/boot/compressed/relocs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/compressed/relocs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/compressed/relocs.c linux-3.0.8/arch/x86/boot/compressed/relocs.c +--- linux-3.0.8/arch/x86/boot/compressed/relocs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/compressed/relocs.c 2011-08-23 21:47:55.000000000 -0400 @@ -13,8 +13,11 @@ static void die(char *fmt, ...); @@ -5916,9 +5469,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/compressed/relocs.c linux-3.0.7/arch/x86/bo read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-3.0.7/arch/x86/boot/cpucheck.c linux-3.0.7/arch/x86/boot/cpucheck.c ---- linux-3.0.7/arch/x86/boot/cpucheck.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/cpucheck.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/cpucheck.c linux-3.0.8/arch/x86/boot/cpucheck.c +--- linux-3.0.8/arch/x86/boot/cpucheck.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/cpucheck.c 2011-08-23 21:47:55.000000000 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -6014,9 +5567,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/cpucheck.c linux-3.0.7/arch/x86/boot/cpuche err = check_flags(); } -diff -urNp linux-3.0.7/arch/x86/boot/header.S linux-3.0.7/arch/x86/boot/header.S ---- linux-3.0.7/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/header.S linux-3.0.8/arch/x86/boot/header.S +--- linux-3.0.8/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -6026,9 +5579,22 @@ diff -urNp linux-3.0.7/arch/x86/boot/header.S linux-3.0.7/arch/x86/boot/header.S #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-3.0.7/arch/x86/boot/memory.c linux-3.0.7/arch/x86/boot/memory.c ---- linux-3.0.7/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/Makefile linux-3.0.8/arch/x86/boot/Makefile +--- linux-3.0.8/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400 +@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os + $(call cc-option, -fno-stack-protector) \ + $(call cc-option, -mpreferred-stack-boundary=2) + KBUILD_CFLAGS += $(call cc-option, -m32) ++ifdef CONSTIFY_PLUGIN ++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify ++endif + KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE := n + +diff -urNp linux-3.0.8/arch/x86/boot/memory.c linux-3.0.8/arch/x86/boot/memory.c +--- linux-3.0.8/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -6038,20 +5604,9 @@ diff -urNp linux-3.0.7/arch/x86/boot/memory.c linux-3.0.7/arch/x86/boot/memory.c struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-3.0.7/arch/x86/boot/video-vesa.c linux-3.0.7/arch/x86/boot/video-vesa.c ---- linux-3.0.7/arch/x86/boot/video-vesa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/video-vesa.c 2011-08-23 21:47:55.000000000 -0400 -@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) - - boot_params.screen_info.vesapm_seg = oreg.es; - boot_params.screen_info.vesapm_off = oreg.di; -+ boot_params.screen_info.vesapm_size = oreg.cx; - } - - /* -diff -urNp linux-3.0.7/arch/x86/boot/video.c linux-3.0.7/arch/x86/boot/video.c ---- linux-3.0.7/arch/x86/boot/video.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/boot/video.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/video.c linux-3.0.8/arch/x86/boot/video.c +--- linux-3.0.8/arch/x86/boot/video.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/video.c 2011-08-23 21:47:55.000000000 -0400 @@ -96,7 +96,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -6061,9 +5616,20 @@ diff -urNp linux-3.0.7/arch/x86/boot/video.c linux-3.0.7/arch/x86/boot/video.c int key; unsigned int v; -diff -urNp linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S ---- linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/boot/video-vesa.c linux-3.0.8/arch/x86/boot/video-vesa.c +--- linux-3.0.8/arch/x86/boot/video-vesa.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/boot/video-vesa.c 2011-08-23 21:47:55.000000000 -0400 +@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) + + boot_params.screen_info.vesapm_seg = oreg.es; + boot_params.screen_info.vesapm_off = oreg.di; ++ boot_params.screen_info.vesapm_size = oreg.cx; + } + + /* +diff -urNp linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S +--- linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -8,6 +8,8 @@ * including this sentence is retained in full. */ @@ -6082,9 +5648,9 @@ diff -urNp linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.7/arch/x86/ #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \ movq r1,r2; \ movq r3,r4; \ -diff -urNp linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S ---- linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S +--- linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -1,3 +1,5 @@ +#include <asm/alternative-asm.h> + @@ -6113,9 +5679,9 @@ diff -urNp linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.7/arch/ mov %rsi,%rdx + pax_force_retaddr ret -diff -urNp linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S ---- linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S +--- linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -21,6 +21,7 @@ .text @@ -6138,9 +5704,9 @@ diff -urNp linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.7/arch/ movq $1,%rax + pax_force_retaddr ret -diff -urNp linux-3.0.7/arch/x86/ia32/ia32_aout.c linux-3.0.7/arch/x86/ia32/ia32_aout.c ---- linux-3.0.7/arch/x86/ia32/ia32_aout.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/ia32/ia32_aout.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/ia32/ia32_aout.c linux-3.0.8/arch/x86/ia32/ia32_aout.c +--- linux-3.0.8/arch/x86/ia32/ia32_aout.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/ia32/ia32_aout.c 2011-08-23 21:48:14.000000000 -0400 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -6150,88 +5716,9 @@ diff -urNp linux-3.0.7/arch/x86/ia32/ia32_aout.c linux-3.0.7/arch/x86/ia32/ia32_ fs = get_fs(); set_fs(KERNEL_DS); has_dumped = 1; -diff -urNp linux-3.0.7/arch/x86/ia32/ia32_signal.c linux-3.0.7/arch/x86/ia32/ia32_signal.c ---- linux-3.0.7/arch/x86/ia32/ia32_signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/ia32/ia32_signal.c 2011-10-06 04:17:55.000000000 -0400 -@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const - } - seg = get_fs(); - set_fs(KERNEL_DS); -- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp); -+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp); - set_fs(seg); - if (ret >= 0 && uoss_ptr) { - if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t))) -@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct - */ - static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, - size_t frame_size, -- void **fpstate) -+ void __user **fpstate) - { - unsigned long sp; - -@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct - - if (used_math()) { - sp = sp - sig_xstate_ia32_size; -- *fpstate = (struct _fpstate_ia32 *) sp; -+ *fpstate = (struct _fpstate_ia32 __user *) sp; - if (save_i387_xstate_ia32(*fpstate) < 0) - return (void __user *) -1L; - } -@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct - sp -= frame_size; - /* Align the stack pointer according to the i386 ABI, - * i.e. so that on function entry ((sp + 4) & 15) == 0. */ -- sp = ((sp + 4) & -16ul) - 4; -+ sp = ((sp - 12) & -16ul) - 4; - return (void __user *) sp; - } - -@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s - * These are actually not used anymore, but left because some - * gdb versions depend on them as a marker. - */ -- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); -+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode); - } put_user_catch(err); - - if (err) -@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct - 0xb8, - __NR_ia32_rt_sigreturn, - 0x80cd, -- 0, -+ 0 - }; - - frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct - - if (ka->sa.sa_flags & SA_RESTORER) - restorer = ka->sa.sa_restorer; -+ else if (current->mm->context.vdso) -+ /* Return stub is in 32bit vsyscall page */ -+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); - else -- restorer = VDSO32_SYMBOL(current->mm->context.vdso, -- rt_sigreturn); -+ restorer = &frame->retcode; - put_user_ex(ptr_to_compat(restorer), &frame->pretcode); - - /* - * Not actually used anymore, but left because some gdb - * versions need it. - */ -- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); -+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode); - } put_user_catch(err); - - if (err) -diff -urNp linux-3.0.7/arch/x86/ia32/ia32entry.S linux-3.0.7/arch/x86/ia32/ia32entry.S ---- linux-3.0.7/arch/x86/ia32/ia32entry.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/ia32/ia32entry.S 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/ia32/ia32entry.S linux-3.0.8/arch/x86/ia32/ia32entry.S +--- linux-3.0.8/arch/x86/ia32/ia32entry.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/ia32/ia32entry.S 2011-10-11 10:44:33.000000000 -0400 @@ -13,7 +13,9 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -6418,9 +5905,88 @@ diff -urNp linux-3.0.7/arch/x86/ia32/ia32entry.S linux-3.0.7/arch/x86/ia32/ia32e ret CFI_ENDPROC -diff -urNp linux-3.0.7/arch/x86/ia32/sys_ia32.c linux-3.0.7/arch/x86/ia32/sys_ia32.c ---- linux-3.0.7/arch/x86/ia32/sys_ia32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/ia32/sys_ia32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/ia32/ia32_signal.c linux-3.0.8/arch/x86/ia32/ia32_signal.c +--- linux-3.0.8/arch/x86/ia32/ia32_signal.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/ia32/ia32_signal.c 2011-10-06 04:17:55.000000000 -0400 +@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const + } + seg = get_fs(); + set_fs(KERNEL_DS); +- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp); ++ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp); + set_fs(seg); + if (ret >= 0 && uoss_ptr) { + if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t))) +@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct + */ + static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, + size_t frame_size, +- void **fpstate) ++ void __user **fpstate) + { + unsigned long sp; + +@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct + + if (used_math()) { + sp = sp - sig_xstate_ia32_size; +- *fpstate = (struct _fpstate_ia32 *) sp; ++ *fpstate = (struct _fpstate_ia32 __user *) sp; + if (save_i387_xstate_ia32(*fpstate) < 0) + return (void __user *) -1L; + } +@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct + sp -= frame_size; + /* Align the stack pointer according to the i386 ABI, + * i.e. so that on function entry ((sp + 4) & 15) == 0. */ +- sp = ((sp + 4) & -16ul) - 4; ++ sp = ((sp - 12) & -16ul) - 4; + return (void __user *) sp; + } + +@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s + * These are actually not used anymore, but left because some + * gdb versions depend on them as a marker. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode); + } put_user_catch(err); + + if (err) +@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct + 0xb8, + __NR_ia32_rt_sigreturn, + 0x80cd, +- 0, ++ 0 + }; + + frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); +@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct + + if (ka->sa.sa_flags & SA_RESTORER) + restorer = ka->sa.sa_restorer; ++ else if (current->mm->context.vdso) ++ /* Return stub is in 32bit vsyscall page */ ++ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + else +- restorer = VDSO32_SYMBOL(current->mm->context.vdso, +- rt_sigreturn); ++ restorer = &frame->retcode; + put_user_ex(ptr_to_compat(restorer), &frame->pretcode); + + /* + * Not actually used anymore, but left because some gdb + * versions need it. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode); + } put_user_catch(err); + + if (err) +diff -urNp linux-3.0.8/arch/x86/ia32/sys_ia32.c linux-3.0.8/arch/x86/ia32/sys_ia32.c +--- linux-3.0.8/arch/x86/ia32/sys_ia32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/ia32/sys_ia32.c 2011-10-06 04:17:55.000000000 -0400 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign */ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat) @@ -6488,9 +6054,9 @@ diff -urNp linux-3.0.7/arch/x86/ia32/sys_ia32.c linux-3.0.7/arch/x86/ia32/sys_ia count); set_fs(old_fs); -diff -urNp linux-3.0.7/arch/x86/include/asm/alternative-asm.h linux-3.0.7/arch/x86/include/asm/alternative-asm.h ---- linux-3.0.7/arch/x86/include/asm/alternative-asm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/alternative-asm.h 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/alternative-asm.h linux-3.0.8/arch/x86/include/asm/alternative-asm.h +--- linux-3.0.8/arch/x86/include/asm/alternative-asm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/alternative-asm.h 2011-10-07 19:07:23.000000000 -0400 @@ -15,6 +15,20 @@ .endm #endif @@ -6512,9 +6078,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/alternative-asm.h linux-3.0.7/arch/x .macro altinstruction_entry orig alt feature orig_len alt_len .align 8 .quad \orig -diff -urNp linux-3.0.7/arch/x86/include/asm/alternative.h linux-3.0.7/arch/x86/include/asm/alternative.h ---- linux-3.0.7/arch/x86/include/asm/alternative.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/alternative.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/alternative.h linux-3.0.8/arch/x86/include/asm/alternative.h +--- linux-3.0.8/arch/x86/include/asm/alternative.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/alternative.h 2011-08-23 21:47:55.000000000 -0400 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ @@ -6524,9 +6090,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/alternative.h linux-3.0.7/arch/x86/i "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-3.0.7/arch/x86/include/asm/apic.h linux-3.0.7/arch/x86/include/asm/apic.h ---- linux-3.0.7/arch/x86/include/asm/apic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/apic.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/apic.h linux-3.0.8/arch/x86/include/asm/apic.h +--- linux-3.0.8/arch/x86/include/asm/apic.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/apic.h 2011-08-23 21:48:14.000000000 -0400 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo #ifdef CONFIG_X86_LOCAL_APIC @@ -6536,9 +6102,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/apic.h linux-3.0.7/arch/x86/include/ extern int local_apic_timer_c2_ok; extern int disable_apic; -diff -urNp linux-3.0.7/arch/x86/include/asm/apm.h linux-3.0.7/arch/x86/include/asm/apm.h ---- linux-3.0.7/arch/x86/include/asm/apm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/apm.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/apm.h linux-3.0.8/arch/x86/include/asm/apm.h +--- linux-3.0.8/arch/x86/include/asm/apm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/apm.h 2011-08-23 21:47:55.000000000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -6557,424 +6123,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/apm.h linux-3.0.7/arch/x86/include/a "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-3.0.7/arch/x86/include/asm/atomic.h linux-3.0.7/arch/x86/include/asm/atomic.h ---- linux-3.0.7/arch/x86/include/asm/atomic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/atomic.h 2011-08-23 21:47:55.000000000 -0400 -@@ -22,7 +22,18 @@ - */ - static inline int atomic_read(const atomic_t *v) - { -- return (*(volatile int *)&(v)->counter); -+ return (*(volatile const int *)&(v)->counter); -+} -+ -+/** -+ * atomic_read_unchecked - read atomic variable -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically reads the value of @v. -+ */ -+static inline int atomic_read_unchecked(const atomic_unchecked_t *v) -+{ -+ return (*(volatile const int *)&(v)->counter); - } - - /** -@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t * - } - - /** -+ * atomic_set_unchecked - set atomic variable -+ * @v: pointer of type atomic_unchecked_t -+ * @i: required value -+ * -+ * Atomically sets the value of @v to @i. -+ */ -+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) -+{ -+ v->counter = i; -+} -+ -+/** - * atomic_add - add integer to atomic variable - * @i: integer value to add - * @v: pointer of type atomic_t -@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t * - */ - static inline void atomic_add(int i, atomic_t *v) - { -- asm volatile(LOCK_PREFIX "addl %1,%0" -+ asm volatile(LOCK_PREFIX "addl %1,%0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "subl %1,%0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+m" (v->counter) -+ : "ir" (i)); -+} -+ -+/** -+ * atomic_add_unchecked - add integer to atomic variable -+ * @i: integer value to add -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically adds @i to @v. -+ */ -+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v) -+{ -+ asm volatile(LOCK_PREFIX "addl %1,%0\n" - : "+m" (v->counter) - : "ir" (i)); - } -@@ -60,7 +105,29 @@ static inline void atomic_add(int i, ato - */ - static inline void atomic_sub(int i, atomic_t *v) - { -- asm volatile(LOCK_PREFIX "subl %1,%0" -+ asm volatile(LOCK_PREFIX "subl %1,%0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "addl %1,%0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+m" (v->counter) -+ : "ir" (i)); -+} -+ -+/** -+ * atomic_sub_unchecked - subtract integer from atomic variable -+ * @i: integer value to subtract -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically subtracts @i from @v. -+ */ -+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v) -+{ -+ asm volatile(LOCK_PREFIX "subl %1,%0\n" - : "+m" (v->counter) - : "ir" (i)); - } -@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in - { - unsigned char c; - -- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1" -+ asm volatile(LOCK_PREFIX "subl %2,%0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "addl %2,%0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sete %1\n" - : "+m" (v->counter), "=qm" (c) - : "ir" (i) : "memory"); - return c; -@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(in - */ - static inline void atomic_inc(atomic_t *v) - { -- asm volatile(LOCK_PREFIX "incl %0" -+ asm volatile(LOCK_PREFIX "incl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "decl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+m" (v->counter)); -+} -+ -+/** -+ * atomic_inc_unchecked - increment atomic variable -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically increments @v by 1. -+ */ -+static inline void atomic_inc_unchecked(atomic_unchecked_t *v) -+{ -+ asm volatile(LOCK_PREFIX "incl %0\n" - : "+m" (v->counter)); - } - -@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t * - */ - static inline void atomic_dec(atomic_t *v) - { -- asm volatile(LOCK_PREFIX "decl %0" -+ asm volatile(LOCK_PREFIX "decl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "incl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+m" (v->counter)); -+} -+ -+/** -+ * atomic_dec_unchecked - decrement atomic variable -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically decrements @v by 1. -+ */ -+static inline void atomic_dec_unchecked(atomic_unchecked_t *v) -+{ -+ asm volatile(LOCK_PREFIX "decl %0\n" - : "+m" (v->counter)); - } - -@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at - { - unsigned char c; - -- asm volatile(LOCK_PREFIX "decl %0; sete %1" -+ asm volatile(LOCK_PREFIX "decl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "incl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sete %1\n" - : "+m" (v->counter), "=qm" (c) - : : "memory"); - return c != 0; -@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(at - { - unsigned char c; - -- asm volatile(LOCK_PREFIX "incl %0; sete %1" -+ asm volatile(LOCK_PREFIX "incl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "decl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sete %1\n" -+ : "+m" (v->counter), "=qm" (c) -+ : : "memory"); -+ return c != 0; -+} -+ -+/** -+ * atomic_inc_and_test_unchecked - increment and test -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically increments @v by 1 -+ * and returns true if the result is zero, or false for all -+ * other cases. -+ */ -+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) -+{ -+ unsigned char c; -+ -+ asm volatile(LOCK_PREFIX "incl %0\n" -+ "sete %1\n" - : "+m" (v->counter), "=qm" (c) - : : "memory"); - return c != 0; -@@ -157,7 +310,16 @@ static inline int atomic_add_negative(in - { - unsigned char c; - -- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1" -+ asm volatile(LOCK_PREFIX "addl %2,%0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ LOCK_PREFIX "subl %2,%0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sets %1\n" - : "+m" (v->counter), "=qm" (c) - : "ir" (i) : "memory"); - return c; -@@ -180,6 +342,46 @@ static inline int atomic_add_return(int - #endif - /* Modern 486+ processor */ - __i = i; -+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ "movl %0, %1\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+r" (i), "+m" (v->counter) -+ : : "memory"); -+ return i + __i; -+ -+#ifdef CONFIG_M386 -+no_xadd: /* Legacy 386 processor */ -+ local_irq_save(flags); -+ __i = atomic_read(v); -+ atomic_set(v, i + __i); -+ local_irq_restore(flags); -+ return i + __i; -+#endif -+} -+ -+/** -+ * atomic_add_return_unchecked - add integer and return -+ * @v: pointer of type atomic_unchecked_t -+ * @i: integer value to add -+ * -+ * Atomically adds @i to @v and returns @i + @v -+ */ -+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v) -+{ -+ int __i; -+#ifdef CONFIG_M386 -+ unsigned long flags; -+ if (unlikely(boot_cpu_data.x86 <= 3)) -+ goto no_xadd; -+#endif -+ /* Modern 486+ processor */ -+ __i = i; - asm volatile(LOCK_PREFIX "xaddl %0, %1" - : "+r" (i), "+m" (v->counter) - : : "memory"); -@@ -208,6 +410,10 @@ static inline int atomic_sub_return(int - } - - #define atomic_inc_return(v) (atomic_add_return(1, v)) -+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) -+{ -+ return atomic_add_return_unchecked(1, v); -+} - #define atomic_dec_return(v) (atomic_sub_return(1, v)) - - static inline int atomic_cmpxchg(atomic_t *v, int old, int new) -@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_ - return cmpxchg(&v->counter, old, new); - } - -+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new) -+{ -+ return cmpxchg(&v->counter, old, new); -+} -+ - static inline int atomic_xchg(atomic_t *v, int new) - { - return xchg(&v->counter, new); - } - -+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) -+{ -+ return xchg(&v->counter, new); -+} -+ - /** - * atomic_add_unless - add unless the number is already a given value - * @v: pointer of type atomic_t -@@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t * - */ - static inline int atomic_add_unless(atomic_t *v, int a, int u) - { -- int c, old; -+ int c, old, new; - c = atomic_read(v); - for (;;) { -- if (unlikely(c == (u))) -+ if (unlikely(c == u)) - break; -- old = atomic_cmpxchg((v), c, c + (a)); -+ -+ asm volatile("addl %2,%0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ "subl %2,%0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "=r" (new) -+ : "0" (c), "ir" (a)); -+ -+ old = atomic_cmpxchg(v, c, new); - if (likely(old == c)) - break; - c = old; - } -- return c != (u); -+ return c != u; - } - - #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) - -+/** -+ * atomic_inc_not_zero_hint - increment if not null -+ * @v: pointer of type atomic_t -+ * @hint: probable value of the atomic before the increment -+ * -+ * This version of atomic_inc_not_zero() gives a hint of probable -+ * value of the atomic. This helps processor to not read the memory -+ * before doing the atomic read/modify/write cycle, lowering -+ * number of bus transactions on some arches. -+ * -+ * Returns: 0 if increment was not done, 1 otherwise. -+ */ -+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint -+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint) -+{ -+ int val, c = hint, new; -+ -+ /* sanity test, should be removed by compiler if hint is a constant */ -+ if (!hint) -+ return atomic_inc_not_zero(v); -+ -+ do { -+ asm volatile("incl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ "decl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "=r" (new) -+ : "0" (c)); -+ -+ val = atomic_cmpxchg(v, c, new); -+ if (val == c) -+ return 1; -+ c = val; -+ } while (c); -+ -+ return 0; -+} -+ - /* - * atomic_dec_if_positive - decrement by 1 if old value positive - * @v: pointer of type atomic_t -diff -urNp linux-3.0.7/arch/x86/include/asm/atomic64_32.h linux-3.0.7/arch/x86/include/asm/atomic64_32.h ---- linux-3.0.7/arch/x86/include/asm/atomic64_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/atomic64_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_32.h linux-3.0.8/arch/x86/include/asm/atomic64_32.h +--- linux-3.0.8/arch/x86/include/asm/atomic64_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/atomic64_32.h 2011-08-23 21:47:55.000000000 -0400 @@ -12,6 +12,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -7124,9 +6275,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/atomic64_32.h linux-3.0.7/arch/x86/i * atomic64_sub - subtract the atomic64 variable * @i: integer value to subtract * @v: pointer to type atomic64_t -diff -urNp linux-3.0.7/arch/x86/include/asm/atomic64_64.h linux-3.0.7/arch/x86/include/asm/atomic64_64.h ---- linux-3.0.7/arch/x86/include/asm/atomic64_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/atomic64_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_64.h linux-3.0.8/arch/x86/include/asm/atomic64_64.h +--- linux-3.0.8/arch/x86/include/asm/atomic64_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/atomic64_64.h 2011-08-23 21:47:55.000000000 -0400 @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) @@ -7448,9 +6599,424 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/atomic64_64.h linux-3.0.7/arch/x86/i } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-3.0.7/arch/x86/include/asm/bitops.h linux-3.0.7/arch/x86/include/asm/bitops.h ---- linux-3.0.7/arch/x86/include/asm/bitops.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/bitops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/atomic.h linux-3.0.8/arch/x86/include/asm/atomic.h +--- linux-3.0.8/arch/x86/include/asm/atomic.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/atomic.h 2011-08-23 21:47:55.000000000 -0400 +@@ -22,7 +22,18 @@ + */ + static inline int atomic_read(const atomic_t *v) + { +- return (*(volatile int *)&(v)->counter); ++ return (*(volatile const int *)&(v)->counter); ++} ++ ++/** ++ * atomic_read_unchecked - read atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically reads the value of @v. ++ */ ++static inline int atomic_read_unchecked(const atomic_unchecked_t *v) ++{ ++ return (*(volatile const int *)&(v)->counter); + } + + /** +@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t * + } + + /** ++ * atomic_set_unchecked - set atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * @i: required value ++ * ++ * Atomically sets the value of @v to @i. ++ */ ++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) ++{ ++ v->counter = i; ++} ++ ++/** + * atomic_add - add integer to atomic variable + * @i: integer value to add + * @v: pointer of type atomic_t +@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t * + */ + static inline void atomic_add(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "addl %1,%0" ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter) ++ : "ir" (i)); ++} ++ ++/** ++ * atomic_add_unchecked - add integer to atomic variable ++ * @i: integer value to add ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically adds @i to @v. ++ */ ++static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" + : "+m" (v->counter) + : "ir" (i)); + } +@@ -60,7 +105,29 @@ static inline void atomic_add(int i, ato + */ + static inline void atomic_sub(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "subl %1,%0" ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter) ++ : "ir" (i)); ++} ++ ++/** ++ * atomic_sub_unchecked - subtract integer from atomic variable ++ * @i: integer value to subtract ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically subtracts @i from @v. ++ */ ++static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" + : "+m" (v->counter) + : "ir" (i)); + } +@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in + { + unsigned char c; + +- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1" ++ asm volatile(LOCK_PREFIX "subl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (v->counter), "=qm" (c) + : "ir" (i) : "memory"); + return c; +@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(in + */ + static inline void atomic_inc(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "incl %0" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_inc_unchecked - increment atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1. ++ */ ++static inline void atomic_inc_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "incl %0\n" + : "+m" (v->counter)); + } + +@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t * + */ + static inline void atomic_dec(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "decl %0" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decl %0\n" + : "+m" (v->counter)); + } + +@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at + { + unsigned char c; + +- asm volatile(LOCK_PREFIX "decl %0; sete %1" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (v->counter), "=qm" (c) + : : "memory"); + return c != 0; +@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(at + { + unsigned char c; + +- asm volatile(LOCK_PREFIX "incl %0; sete %1" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" ++ : "+m" (v->counter), "=qm" (c) ++ : : "memory"); ++ return c != 0; ++} ++ ++/** ++ * atomic_inc_and_test_unchecked - increment and test ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1 ++ * and returns true if the result is zero, or false for all ++ * other cases. ++ */ ++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) ++{ ++ unsigned char c; ++ ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ "sete %1\n" + : "+m" (v->counter), "=qm" (c) + : : "memory"); + return c != 0; +@@ -157,7 +310,16 @@ static inline int atomic_add_negative(in + { + unsigned char c; + +- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1" ++ asm volatile(LOCK_PREFIX "addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "+m" (v->counter), "=qm" (c) + : "ir" (i) : "memory"); + return c; +@@ -180,6 +342,46 @@ static inline int atomic_add_return(int + #endif + /* Modern 486+ processor */ + __i = i; ++ asm volatile(LOCK_PREFIX "xaddl %0, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "movl %0, %1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+r" (i), "+m" (v->counter) ++ : : "memory"); ++ return i + __i; ++ ++#ifdef CONFIG_M386 ++no_xadd: /* Legacy 386 processor */ ++ local_irq_save(flags); ++ __i = atomic_read(v); ++ atomic_set(v, i + __i); ++ local_irq_restore(flags); ++ return i + __i; ++#endif ++} ++ ++/** ++ * atomic_add_return_unchecked - add integer and return ++ * @v: pointer of type atomic_unchecked_t ++ * @i: integer value to add ++ * ++ * Atomically adds @i to @v and returns @i + @v ++ */ ++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v) ++{ ++ int __i; ++#ifdef CONFIG_M386 ++ unsigned long flags; ++ if (unlikely(boot_cpu_data.x86 <= 3)) ++ goto no_xadd; ++#endif ++ /* Modern 486+ processor */ ++ __i = i; + asm volatile(LOCK_PREFIX "xaddl %0, %1" + : "+r" (i), "+m" (v->counter) + : : "memory"); +@@ -208,6 +410,10 @@ static inline int atomic_sub_return(int + } + + #define atomic_inc_return(v) (atomic_add_return(1, v)) ++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) ++{ ++ return atomic_add_return_unchecked(1, v); ++} + #define atomic_dec_return(v) (atomic_sub_return(1, v)) + + static inline int atomic_cmpxchg(atomic_t *v, int old, int new) +@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_ + return cmpxchg(&v->counter, old, new); + } + ++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} ++ + static inline int atomic_xchg(atomic_t *v, int new) + { + return xchg(&v->counter, new); + } + ++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) ++{ ++ return xchg(&v->counter, new); ++} ++ + /** + * atomic_add_unless - add unless the number is already a given value + * @v: pointer of type atomic_t +@@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t * + */ + static inline int atomic_add_unless(atomic_t *v, int a, int u) + { +- int c, old; ++ int c, old, new; + c = atomic_read(v); + for (;;) { +- if (unlikely(c == (u))) ++ if (unlikely(c == u)) + break; +- old = atomic_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=r" (new) ++ : "0" (c), "ir" (a)); ++ ++ old = atomic_cmpxchg(v, c, new); + if (likely(old == c)) + break; + c = old; + } +- return c != (u); ++ return c != u; + } + + #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) + ++/** ++ * atomic_inc_not_zero_hint - increment if not null ++ * @v: pointer of type atomic_t ++ * @hint: probable value of the atomic before the increment ++ * ++ * This version of atomic_inc_not_zero() gives a hint of probable ++ * value of the atomic. This helps processor to not read the memory ++ * before doing the atomic read/modify/write cycle, lowering ++ * number of bus transactions on some arches. ++ * ++ * Returns: 0 if increment was not done, 1 otherwise. ++ */ ++#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint ++static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint) ++{ ++ int val, c = hint, new; ++ ++ /* sanity test, should be removed by compiler if hint is a constant */ ++ if (!hint) ++ return atomic_inc_not_zero(v); ++ ++ do { ++ asm volatile("incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=r" (new) ++ : "0" (c)); ++ ++ val = atomic_cmpxchg(v, c, new); ++ if (val == c) ++ return 1; ++ c = val; ++ } while (c); ++ ++ return 0; ++} ++ + /* + * atomic_dec_if_positive - decrement by 1 if old value positive + * @v: pointer of type atomic_t +diff -urNp linux-3.0.8/arch/x86/include/asm/bitops.h linux-3.0.8/arch/x86/include/asm/bitops.h +--- linux-3.0.8/arch/x86/include/asm/bitops.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/bitops.h 2011-08-23 21:47:55.000000000 -0400 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -7460,9 +7026,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/bitops.h linux-3.0.7/arch/x86/includ #define CONST_MASK(nr) (1 << ((nr) & 7)) /** -diff -urNp linux-3.0.7/arch/x86/include/asm/boot.h linux-3.0.7/arch/x86/include/asm/boot.h ---- linux-3.0.7/arch/x86/include/asm/boot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/boot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/boot.h linux-3.0.8/arch/x86/include/asm/boot.h +--- linux-3.0.8/arch/x86/include/asm/boot.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/boot.h 2011-08-23 21:47:55.000000000 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -7480,9 +7046,21 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/boot.h linux-3.0.7/arch/x86/include/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-3.0.7/arch/x86/include/asm/cache.h linux-3.0.7/arch/x86/include/asm/cache.h ---- linux-3.0.7/arch/x86/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/cacheflush.h linux-3.0.8/arch/x86/include/asm/cacheflush.h +--- linux-3.0.8/arch/x86/include/asm/cacheflush.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/cacheflush.h 2011-08-23 21:47:55.000000000 -0400 +@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem + unsigned long pg_flags = pg->flags & _PGMT_MASK; + + if (pg_flags == _PGMT_DEFAULT) +- return -1; ++ return ~0UL; + else if (pg_flags == _PGMT_WC) + return _PAGE_CACHE_WC; + else if (pg_flags == _PGMT_UC_MINUS) +diff -urNp linux-3.0.8/arch/x86/include/asm/cache.h linux-3.0.8/arch/x86/include/asm/cache.h +--- linux-3.0.8/arch/x86/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 @@ -5,12 +5,13 @@ /* L1 cache line size */ @@ -7499,21 +7077,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/cache.h linux-3.0.7/arch/x86/include #ifdef CONFIG_X86_VSMP #ifdef CONFIG_SMP -diff -urNp linux-3.0.7/arch/x86/include/asm/cacheflush.h linux-3.0.7/arch/x86/include/asm/cacheflush.h ---- linux-3.0.7/arch/x86/include/asm/cacheflush.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/cacheflush.h 2011-08-23 21:47:55.000000000 -0400 -@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem - unsigned long pg_flags = pg->flags & _PGMT_MASK; - - if (pg_flags == _PGMT_DEFAULT) -- return -1; -+ return ~0UL; - else if (pg_flags == _PGMT_WC) - return _PAGE_CACHE_WC; - else if (pg_flags == _PGMT_UC_MINUS) -diff -urNp linux-3.0.7/arch/x86/include/asm/checksum_32.h linux-3.0.7/arch/x86/include/asm/checksum_32.h ---- linux-3.0.7/arch/x86/include/asm/checksum_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/checksum_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/checksum_32.h linux-3.0.8/arch/x86/include/asm/checksum_32.h +--- linux-3.0.8/arch/x86/include/asm/checksum_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/checksum_32.h 2011-08-23 21:47:55.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -7547,9 +7113,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/checksum_32.h linux-3.0.7/arch/x86/i len, sum, NULL, err_ptr); if (len) -diff -urNp linux-3.0.7/arch/x86/include/asm/cpufeature.h linux-3.0.7/arch/x86/include/asm/cpufeature.h ---- linux-3.0.7/arch/x86/include/asm/cpufeature.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/cpufeature.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/cpufeature.h linux-3.0.8/arch/x86/include/asm/cpufeature.h +--- linux-3.0.8/arch/x86/include/asm/cpufeature.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/cpufeature.h 2011-08-23 21:47:55.000000000 -0400 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ @@ -7559,9 +7125,25 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/cpufeature.h linux-3.0.7/arch/x86/in "3: movb $1,%0\n" "4:\n" ".previous\n" -diff -urNp linux-3.0.7/arch/x86/include/asm/desc.h linux-3.0.7/arch/x86/include/asm/desc.h ---- linux-3.0.7/arch/x86/include/asm/desc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/desc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/desc_defs.h linux-3.0.8/arch/x86/include/asm/desc_defs.h +--- linux-3.0.8/arch/x86/include/asm/desc_defs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/desc_defs.h 2011-08-23 21:47:55.000000000 -0400 +@@ -31,6 +31,12 @@ struct desc_struct { + unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; + unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; + }; ++ struct { ++ u16 offset_low; ++ u16 seg; ++ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; ++ unsigned offset_high: 16; ++ } gate; + }; + } __attribute__((packed)); + +diff -urNp linux-3.0.8/arch/x86/include/asm/desc.h linux-3.0.8/arch/x86/include/asm/desc.h +--- linux-3.0.8/arch/x86/include/asm/desc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/desc.h 2011-08-23 21:47:55.000000000 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -7740,25 +7322,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/desc.h linux-3.0.7/arch/x86/include/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/desc_defs.h linux-3.0.7/arch/x86/include/asm/desc_defs.h ---- linux-3.0.7/arch/x86/include/asm/desc_defs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/desc_defs.h 2011-08-23 21:47:55.000000000 -0400 -@@ -31,6 +31,12 @@ struct desc_struct { - unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; - unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; - }; -+ struct { -+ u16 offset_low; -+ u16 seg; -+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; -+ unsigned offset_high: 16; -+ } gate; - }; - } __attribute__((packed)); - -diff -urNp linux-3.0.7/arch/x86/include/asm/e820.h linux-3.0.7/arch/x86/include/asm/e820.h ---- linux-3.0.7/arch/x86/include/asm/e820.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/e820.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/e820.h linux-3.0.8/arch/x86/include/asm/e820.h +--- linux-3.0.8/arch/x86/include/asm/e820.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/e820.h 2011-08-23 21:47:55.000000000 -0400 @@ -69,7 +69,7 @@ struct e820map { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 @@ -7768,9 +7334,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/e820.h linux-3.0.7/arch/x86/include/ #define BIOS_END 0x00100000 #define BIOS_ROM_BASE 0xffe00000 -diff -urNp linux-3.0.7/arch/x86/include/asm/elf.h linux-3.0.7/arch/x86/include/asm/elf.h ---- linux-3.0.7/arch/x86/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/elf.h linux-3.0.8/arch/x86/include/asm/elf.h +--- linux-3.0.8/arch/x86/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 @@ -237,7 +237,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. */ @@ -7825,9 +7391,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/elf.h linux-3.0.7/arch/x86/include/a -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/emergency-restart.h linux-3.0.7/arch/x86/include/asm/emergency-restart.h ---- linux-3.0.7/arch/x86/include/asm/emergency-restart.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/emergency-restart.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/emergency-restart.h linux-3.0.8/arch/x86/include/asm/emergency-restart.h +--- linux-3.0.8/arch/x86/include/asm/emergency-restart.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/emergency-restart.h 2011-08-23 21:47:55.000000000 -0400 @@ -15,6 +15,6 @@ enum reboot_type { extern enum reboot_type reboot_type; @@ -7836,9 +7402,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/emergency-restart.h linux-3.0.7/arch +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/futex.h linux-3.0.7/arch/x86/include/asm/futex.h ---- linux-3.0.7/arch/x86/include/asm/futex.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/futex.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/futex.h linux-3.0.8/arch/x86/include/asm/futex.h +--- linux-3.0.8/arch/x86/include/asm/futex.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/futex.h 2011-10-06 04:17:55.000000000 -0400 @@ -12,16 +12,18 @@ #include <asm/system.h> @@ -7897,9 +7463,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/futex.h linux-3.0.7/arch/x86/include : "i" (-EFAULT), "r" (newval), "1" (oldval) : "memory" ); -diff -urNp linux-3.0.7/arch/x86/include/asm/hw_irq.h linux-3.0.7/arch/x86/include/asm/hw_irq.h ---- linux-3.0.7/arch/x86/include/asm/hw_irq.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/hw_irq.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/hw_irq.h linux-3.0.8/arch/x86/include/asm/hw_irq.h +--- linux-3.0.8/arch/x86/include/asm/hw_irq.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/hw_irq.h 2011-08-23 21:47:55.000000000 -0400 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); @@ -7911,9 +7477,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/hw_irq.h linux-3.0.7/arch/x86/includ /* EISA */ extern void eisa_set_level_irq(unsigned int irq); -diff -urNp linux-3.0.7/arch/x86/include/asm/i387.h linux-3.0.7/arch/x86/include/asm/i387.h ---- linux-3.0.7/arch/x86/include/asm/i387.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/i387.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/i387.h linux-3.0.8/arch/x86/include/asm/i387.h +--- linux-3.0.8/arch/x86/include/asm/i387.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/i387.h 2011-10-06 04:17:55.000000000 -0400 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7963,9 +7529,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/i387.h linux-3.0.7/arch/x86/include/ else clts(); } -diff -urNp linux-3.0.7/arch/x86/include/asm/io.h linux-3.0.7/arch/x86/include/asm/io.h ---- linux-3.0.7/arch/x86/include/asm/io.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/io.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/io.h linux-3.0.8/arch/x86/include/asm/io.h +--- linux-3.0.8/arch/x86/include/asm/io.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/io.h 2011-08-23 21:47:55.000000000 -0400 @@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void); #include <linux/vmalloc.h> @@ -7984,9 +7550,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/io.h linux-3.0.7/arch/x86/include/as /* * Convert a virtual cached pointer to an uncached pointer */ -diff -urNp linux-3.0.7/arch/x86/include/asm/irqflags.h linux-3.0.7/arch/x86/include/asm/irqflags.h ---- linux-3.0.7/arch/x86/include/asm/irqflags.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/irqflags.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/irqflags.h linux-3.0.8/arch/x86/include/asm/irqflags.h +--- linux-3.0.8/arch/x86/include/asm/irqflags.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/irqflags.h 2011-08-23 21:47:55.000000000 -0400 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i sti; \ sysexit @@ -7999,9 +7565,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/irqflags.h linux-3.0.7/arch/x86/incl #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-3.0.7/arch/x86/include/asm/kprobes.h linux-3.0.7/arch/x86/include/asm/kprobes.h ---- linux-3.0.7/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/kprobes.h linux-3.0.8/arch/x86/include/asm/kprobes.h +--- linux-3.0.8/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 @@ -8018,9 +7584,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/kprobes.h linux-3.0.7/arch/x86/inclu #define flush_insn_slot(p) do { } while (0) -diff -urNp linux-3.0.7/arch/x86/include/asm/kvm_host.h linux-3.0.7/arch/x86/include/asm/kvm_host.h ---- linux-3.0.7/arch/x86/include/asm/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/kvm_host.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/kvm_host.h linux-3.0.8/arch/x86/include/asm/kvm_host.h +--- linux-3.0.8/arch/x86/include/asm/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/kvm_host.h 2011-08-26 19:49:56.000000000 -0400 @@ -441,7 +441,7 @@ struct kvm_arch { unsigned int n_used_mmu_pages; unsigned int n_requested_mmu_pages; @@ -8039,9 +7605,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/kvm_host.h linux-3.0.7/arch/x86/incl struct kvm_arch_async_pf { u32 token; -diff -urNp linux-3.0.7/arch/x86/include/asm/local.h linux-3.0.7/arch/x86/include/asm/local.h ---- linux-3.0.7/arch/x86/include/asm/local.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/local.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/local.h linux-3.0.8/arch/x86/include/asm/local.h +--- linux-3.0.8/arch/x86/include/asm/local.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/local.h 2011-08-23 21:47:55.000000000 -0400 @@ -18,26 +18,58 @@ typedef struct { static inline void local_inc(local_t *l) @@ -8194,9 +7760,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/local.h linux-3.0.7/arch/x86/include : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-3.0.7/arch/x86/include/asm/mman.h linux-3.0.7/arch/x86/include/asm/mman.h ---- linux-3.0.7/arch/x86/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/mman.h linux-3.0.8/arch/x86/include/asm/mman.h +--- linux-3.0.8/arch/x86/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -8212,42 +7778,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/mman.h linux-3.0.7/arch/x86/include/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/mmu.h linux-3.0.7/arch/x86/include/asm/mmu.h ---- linux-3.0.7/arch/x86/include/asm/mmu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/mmu.h 2011-08-23 21:47:55.000000000 -0400 -@@ -9,7 +9,7 @@ - * we put the segment information here. - */ - typedef struct { -- void *ldt; -+ struct desc_struct *ldt; - int size; - - #ifdef CONFIG_X86_64 -@@ -18,7 +18,19 @@ typedef struct { - #endif - - struct mutex lock; -- void *vdso; -+ unsigned long vdso; -+ -+#ifdef CONFIG_X86_32 -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) -+ unsigned long user_cs_base; -+ unsigned long user_cs_limit; -+ -+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) -+ cpumask_t cpu_user_cs_mask; -+#endif -+ -+#endif -+#endif - } mm_context_t; - - #ifdef CONFIG_SMP -diff -urNp linux-3.0.7/arch/x86/include/asm/mmu_context.h linux-3.0.7/arch/x86/include/asm/mmu_context.h ---- linux-3.0.7/arch/x86/include/asm/mmu_context.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/mmu_context.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/mmu_context.h linux-3.0.8/arch/x86/include/asm/mmu_context.h +--- linux-3.0.8/arch/x86/include/asm/mmu_context.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/mmu_context.h 2011-08-23 21:48:14.000000000 -0400 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -8368,9 +7901,42 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/mmu_context.h linux-3.0.7/arch/x86/i } #define activate_mm(prev, next) \ -diff -urNp linux-3.0.7/arch/x86/include/asm/module.h linux-3.0.7/arch/x86/include/asm/module.h ---- linux-3.0.7/arch/x86/include/asm/module.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/module.h 2011-10-07 19:24:31.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/mmu.h linux-3.0.8/arch/x86/include/asm/mmu.h +--- linux-3.0.8/arch/x86/include/asm/mmu.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/mmu.h 2011-08-23 21:47:55.000000000 -0400 +@@ -9,7 +9,7 @@ + * we put the segment information here. + */ + typedef struct { +- void *ldt; ++ struct desc_struct *ldt; + int size; + + #ifdef CONFIG_X86_64 +@@ -18,7 +18,19 @@ typedef struct { + #endif + + struct mutex lock; +- void *vdso; ++ unsigned long vdso; ++ ++#ifdef CONFIG_X86_32 ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ unsigned long user_cs_base; ++ unsigned long user_cs_limit; ++ ++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) ++ cpumask_t cpu_user_cs_mask; ++#endif ++ ++#endif ++#endif + } mm_context_t; + + #ifdef CONFIG_SMP +diff -urNp linux-3.0.8/arch/x86/include/asm/module.h linux-3.0.8/arch/x86/include/asm/module.h +--- linux-3.0.8/arch/x86/include/asm/module.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/module.h 2011-10-07 19:24:31.000000000 -0400 @@ -5,6 +5,7 @@ #ifdef CONFIG_X86_64 @@ -8400,9 +7966,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/module.h linux-3.0.7/arch/x86/includ +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF + #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/page_64_types.h linux-3.0.7/arch/x86/include/asm/page_64_types.h ---- linux-3.0.7/arch/x86/include/asm/page_64_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/page_64_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/page_64_types.h linux-3.0.8/arch/x86/include/asm/page_64_types.h +--- linux-3.0.8/arch/x86/include/asm/page_64_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/page_64_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); /* duplicated to the one in bootmem.h */ @@ -8412,9 +7978,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/page_64_types.h linux-3.0.7/arch/x86 extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt.h linux-3.0.7/arch/x86/include/asm/paravirt.h ---- linux-3.0.7/arch/x86/include/asm/paravirt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/paravirt.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt.h linux-3.0.8/arch/x86/include/asm/paravirt.h +--- linux-3.0.8/arch/x86/include/asm/paravirt.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/paravirt.h 2011-08-23 21:47:55.000000000 -0400 @@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, val); } @@ -8487,9 +8053,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt.h linux-3.0.7/arch/x86/incl #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt_types.h linux-3.0.7/arch/x86/include/asm/paravirt_types.h ---- linux-3.0.7/arch/x86/include/asm/paravirt_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/paravirt_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt_types.h linux-3.0.8/arch/x86/include/asm/paravirt_types.h +--- linux-3.0.8/arch/x86/include/asm/paravirt_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/paravirt_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -78,19 +78,19 @@ struct pv_init_ops { */ unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, @@ -8561,9 +8127,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt_types.h linux-3.0.7/arch/x8 /* This contains all the paravirt structures: we get a convenient * number for each function using the offset which we use to indicate -diff -urNp linux-3.0.7/arch/x86/include/asm/pgalloc.h linux-3.0.7/arch/x86/include/asm/pgalloc.h ---- linux-3.0.7/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/pgalloc.h linux-3.0.8/arch/x86/include/asm/pgalloc.h +--- linux-3.0.8/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -8578,9 +8144,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/pgalloc.h linux-3.0.7/arch/x86/inclu set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-2level.h linux-3.0.7/arch/x86/include/asm/pgtable-2level.h ---- linux-3.0.7/arch/x86/include/asm/pgtable-2level.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable-2level.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-2level.h linux-3.0.8/arch/x86/include/asm/pgtable-2level.h +--- linux-3.0.8/arch/x86/include/asm/pgtable-2level.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable-2level.h 2011-08-23 21:47:55.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) @@ -8591,9 +8157,87 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-2level.h linux-3.0.7/arch/x8 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-3level.h linux-3.0.7/arch/x86/include/asm/pgtable-3level.h ---- linux-3.0.7/arch/x86/include/asm/pgtable-3level.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable-3level.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32.h linux-3.0.8/arch/x86/include/asm/pgtable_32.h +--- linux-3.0.8/arch/x86/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 +@@ -25,9 +25,6 @@ + struct mm_struct; + struct vm_area_struct; + +-extern pgd_t swapper_pg_dir[1024]; +-extern pgd_t initial_page_table[1024]; +- + static inline void pgtable_cache_init(void) { } + static inline void check_pgt_cache(void) { } + void paging_init(void); +@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u + # include <asm/pgtable-2level.h> + #endif + ++extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; ++extern pgd_t initial_page_table[PTRS_PER_PGD]; ++#ifdef CONFIG_X86_PAE ++extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD]; ++#endif ++ + #if defined(CONFIG_HIGHPTE) + #define pte_offset_map(dir, address) \ + ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ +@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, u + /* Clear a kernel PTE and flush it from the TLB */ + #define kpte_clear_flush(ptep, vaddr) \ + do { \ ++ pax_open_kernel(); \ + pte_clear(&init_mm, (vaddr), (ptep)); \ ++ pax_close_kernel(); \ + __flush_tlb_one((vaddr)); \ + } while (0) + +@@ -74,6 +79,9 @@ do { \ + + #endif /* !__ASSEMBLY__ */ + ++#define HAVE_ARCH_UNMAPPED_AREA ++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN ++ + /* + * kern_addr_valid() is (1) for FLATMEM and (0) for + * SPARSEMEM and DISCONTIGMEM +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h +--- linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h 2011-08-23 21:47:55.000000000 -0400 +@@ -8,7 +8,7 @@ + */ + #ifdef CONFIG_X86_PAE + # include <asm/pgtable-3level_types.h> +-# define PMD_SIZE (1UL << PMD_SHIFT) ++# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) + # define PMD_MASK (~(PMD_SIZE - 1)) + #else + # include <asm/pgtable-2level_types.h> +@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set + # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) + #endif + ++#ifdef CONFIG_PAX_KERNEXEC ++#ifndef __ASSEMBLY__ ++extern unsigned char MODULES_EXEC_VADDR[]; ++extern unsigned char MODULES_EXEC_END[]; ++#endif ++#include <asm/boot.h> ++#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET) ++#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET) ++#else ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) ++#endif ++ + #define MODULES_VADDR VMALLOC_START + #define MODULES_END VMALLOC_END + #define MODULES_LEN (MODULES_VADDR - MODULES_END) +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-3level.h linux-3.0.8/arch/x86/include/asm/pgtable-3level.h +--- linux-3.0.8/arch/x86/include/asm/pgtable-3level.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable-3level.h 2011-08-23 21:47:55.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) @@ -8611,9 +8255,66 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-3level.h linux-3.0.7/arch/x8 } /* -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable.h linux-3.0.7/arch/x86/include/asm/pgtable.h ---- linux-3.0.7/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64.h linux-3.0.8/arch/x86/include/asm/pgtable_64.h +--- linux-3.0.8/arch/x86/include/asm/pgtable_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable_64.h 2011-08-23 21:47:55.000000000 -0400 +@@ -16,10 +16,13 @@ + + extern pud_t level3_kernel_pgt[512]; + extern pud_t level3_ident_pgt[512]; ++extern pud_t level3_vmalloc_pgt[512]; ++extern pud_t level3_vmemmap_pgt[512]; ++extern pud_t level2_vmemmap_pgt[512]; + extern pmd_t level2_kernel_pgt[512]; + extern pmd_t level2_fixmap_pgt[512]; +-extern pmd_t level2_ident_pgt[512]; +-extern pgd_t init_level4_pgt[]; ++extern pmd_t level2_ident_pgt[512*2]; ++extern pgd_t init_level4_pgt[512]; + + #define swapper_pg_dir init_level4_pgt + +@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic + + static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) + { ++ pax_open_kernel(); + *pmdp = pmd; ++ pax_close_kernel(); + } + + static inline void native_pmd_clear(pmd_t *pmd) +@@ -107,6 +112,13 @@ static inline void native_pud_clear(pud_ + + static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd) + { ++ pax_open_kernel(); ++ *pgdp = pgd; ++ pax_close_kernel(); ++} ++ ++static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd) ++{ + *pgdp = pgd; + } + +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h +--- linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h 2011-08-23 21:47:55.000000000 -0400 +@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; + #define MODULES_VADDR _AC(0xffffffffa0000000, UL) + #define MODULES_END _AC(0xffffffffff000000, UL) + #define MODULES_LEN (MODULES_END - MODULES_VADDR) ++#define MODULES_EXEC_VADDR MODULES_VADDR ++#define MODULES_EXEC_END MODULES_END ++ ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) + + #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable.h linux-3.0.8/arch/x86/include/asm/pgtable.h +--- linux-3.0.8/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm #ifndef __PAGETABLE_PUD_FOLDED @@ -8791,144 +8492,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable.h linux-3.0.7/arch/x86/inclu #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_32.h linux-3.0.7/arch/x86/include/asm/pgtable_32.h ---- linux-3.0.7/arch/x86/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 -@@ -25,9 +25,6 @@ - struct mm_struct; - struct vm_area_struct; - --extern pgd_t swapper_pg_dir[1024]; --extern pgd_t initial_page_table[1024]; -- - static inline void pgtable_cache_init(void) { } - static inline void check_pgt_cache(void) { } - void paging_init(void); -@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u - # include <asm/pgtable-2level.h> - #endif - -+extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; -+extern pgd_t initial_page_table[PTRS_PER_PGD]; -+#ifdef CONFIG_X86_PAE -+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD]; -+#endif -+ - #if defined(CONFIG_HIGHPTE) - #define pte_offset_map(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ -@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, u - /* Clear a kernel PTE and flush it from the TLB */ - #define kpte_clear_flush(ptep, vaddr) \ - do { \ -+ pax_open_kernel(); \ - pte_clear(&init_mm, (vaddr), (ptep)); \ -+ pax_close_kernel(); \ - __flush_tlb_one((vaddr)); \ - } while (0) - -@@ -74,6 +79,9 @@ do { \ - - #endif /* !__ASSEMBLY__ */ - -+#define HAVE_ARCH_UNMAPPED_AREA -+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -+ - /* - * kern_addr_valid() is (1) for FLATMEM and (0) for - * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h ---- linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h 2011-08-23 21:47:55.000000000 -0400 -@@ -8,7 +8,7 @@ - */ - #ifdef CONFIG_X86_PAE - # include <asm/pgtable-3level_types.h> --# define PMD_SIZE (1UL << PMD_SHIFT) -+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) - # define PMD_MASK (~(PMD_SIZE - 1)) - #else - # include <asm/pgtable-2level_types.h> -@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set - # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) - #endif - -+#ifdef CONFIG_PAX_KERNEXEC -+#ifndef __ASSEMBLY__ -+extern unsigned char MODULES_EXEC_VADDR[]; -+extern unsigned char MODULES_EXEC_END[]; -+#endif -+#include <asm/boot.h> -+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET) -+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET) -+#else -+#define ktla_ktva(addr) (addr) -+#define ktva_ktla(addr) (addr) -+#endif -+ - #define MODULES_VADDR VMALLOC_START - #define MODULES_END VMALLOC_END - #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_64.h linux-3.0.7/arch/x86/include/asm/pgtable_64.h ---- linux-3.0.7/arch/x86/include/asm/pgtable_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable_64.h 2011-08-23 21:47:55.000000000 -0400 -@@ -16,10 +16,13 @@ - - extern pud_t level3_kernel_pgt[512]; - extern pud_t level3_ident_pgt[512]; -+extern pud_t level3_vmalloc_pgt[512]; -+extern pud_t level3_vmemmap_pgt[512]; -+extern pud_t level2_vmemmap_pgt[512]; - extern pmd_t level2_kernel_pgt[512]; - extern pmd_t level2_fixmap_pgt[512]; --extern pmd_t level2_ident_pgt[512]; --extern pgd_t init_level4_pgt[]; -+extern pmd_t level2_ident_pgt[512*2]; -+extern pgd_t init_level4_pgt[512]; - - #define swapper_pg_dir init_level4_pgt - -@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic - - static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) - { -+ pax_open_kernel(); - *pmdp = pmd; -+ pax_close_kernel(); - } - - static inline void native_pmd_clear(pmd_t *pmd) -@@ -107,6 +112,13 @@ static inline void native_pud_clear(pud_ - - static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd) - { -+ pax_open_kernel(); -+ *pgdp = pgd; -+ pax_close_kernel(); -+} -+ -+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd) -+{ - *pgdp = pgd; - } - -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h ---- linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h 2011-08-23 21:47:55.000000000 -0400 -@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; - #define MODULES_VADDR _AC(0xffffffffa0000000, UL) - #define MODULES_END _AC(0xffffffffff000000, UL) - #define MODULES_LEN (MODULES_END - MODULES_VADDR) -+#define MODULES_EXEC_VADDR MODULES_VADDR -+#define MODULES_EXEC_END MODULES_END -+ -+#define ktla_ktva(addr) (addr) -+#define ktva_ktla(addr) (addr) - - #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_types.h linux-3.0.7/arch/x86/include/asm/pgtable_types.h ---- linux-3.0.7/arch/x86/include/asm/pgtable_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/pgtable_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_types.h linux-3.0.8/arch/x86/include/asm/pgtable_types.h +--- linux-3.0.8/arch/x86/include/asm/pgtable_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/pgtable_types.h 2011-08-23 21:47:55.000000000 -0400 @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -9042,9 +8608,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_types.h linux-3.0.7/arch/x86 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-3.0.7/arch/x86/include/asm/processor.h linux-3.0.7/arch/x86/include/asm/processor.h ---- linux-3.0.7/arch/x86/include/asm/processor.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/processor.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/processor.h linux-3.0.8/arch/x86/include/asm/processor.h +--- linux-3.0.8/arch/x86/include/asm/processor.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/processor.h 2011-08-23 21:47:55.000000000 -0400 @@ -266,7 +266,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -9147,9 +8713,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/processor.h linux-3.0.7/arch/x86/inc #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-3.0.7/arch/x86/include/asm/ptrace.h linux-3.0.7/arch/x86/include/asm/ptrace.h ---- linux-3.0.7/arch/x86/include/asm/ptrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/ptrace.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/ptrace.h linux-3.0.8/arch/x86/include/asm/ptrace.h +--- linux-3.0.8/arch/x86/include/asm/ptrace.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/ptrace.h 2011-08-23 21:47:55.000000000 -0400 @@ -153,28 +153,29 @@ static inline unsigned long regs_return_ } @@ -9186,9 +8752,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/ptrace.h linux-3.0.7/arch/x86/includ #endif } -diff -urNp linux-3.0.7/arch/x86/include/asm/reboot.h linux-3.0.7/arch/x86/include/asm/reboot.h ---- linux-3.0.7/arch/x86/include/asm/reboot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/reboot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/reboot.h linux-3.0.8/arch/x86/include/asm/reboot.h +--- linux-3.0.8/arch/x86/include/asm/reboot.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/reboot.h 2011-08-23 21:47:55.000000000 -0400 @@ -6,19 +6,19 @@ struct pt_regs; @@ -9215,9 +8781,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/reboot.h linux-3.0.7/arch/x86/includ /* These must match dispatch_table in reboot_32.S */ #define MRR_BIOS 0 #define MRR_APM 1 -diff -urNp linux-3.0.7/arch/x86/include/asm/rwsem.h linux-3.0.7/arch/x86/include/asm/rwsem.h ---- linux-3.0.7/arch/x86/include/asm/rwsem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/rwsem.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/rwsem.h linux-3.0.8/arch/x86/include/asm/rwsem.h +--- linux-3.0.8/arch/x86/include/asm/rwsem.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/rwsem.h 2011-08-23 21:47:55.000000000 -0400 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -9342,9 +8908,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/rwsem.h linux-3.0.7/arch/x86/include : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-3.0.7/arch/x86/include/asm/segment.h linux-3.0.7/arch/x86/include/asm/segment.h ---- linux-3.0.7/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/segment.h 2011-09-17 00:53:42.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/segment.h linux-3.0.8/arch/x86/include/asm/segment.h +--- linux-3.0.8/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/segment.h 2011-09-17 00:53:42.000000000 -0400 @@ -64,10 +64,15 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -9411,9 +8977,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/segment.h linux-3.0.7/arch/x86/inclu #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-3.0.7/arch/x86/include/asm/smp.h linux-3.0.7/arch/x86/include/asm/smp.h ---- linux-3.0.7/arch/x86/include/asm/smp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/smp.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/smp.h linux-3.0.8/arch/x86/include/asm/smp.h +--- linux-3.0.8/arch/x86/include/asm/smp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/smp.h 2011-08-23 21:47:55.000000000 -0400 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_ /* cpus sharing the last level cache: */ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map); @@ -9449,9 +9015,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/smp.h linux-3.0.7/arch/x86/include/a #define safe_smp_processor_id() smp_processor_id() #endif -diff -urNp linux-3.0.7/arch/x86/include/asm/spinlock.h linux-3.0.7/arch/x86/include/asm/spinlock.h ---- linux-3.0.7/arch/x86/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/spinlock.h linux-3.0.8/arch/x86/include/asm/spinlock.h +--- linux-3.0.8/arch/x86/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar static inline void arch_read_lock(arch_rwlock_t *rw) { @@ -9514,9 +9080,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/spinlock.h linux-3.0.7/arch/x86/incl : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-3.0.7/arch/x86/include/asm/stackprotector.h linux-3.0.7/arch/x86/include/asm/stackprotector.h ---- linux-3.0.7/arch/x86/include/asm/stackprotector.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/stackprotector.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/stackprotector.h linux-3.0.8/arch/x86/include/asm/stackprotector.h +--- linux-3.0.8/arch/x86/include/asm/stackprotector.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/stackprotector.h 2011-08-23 21:47:55.000000000 -0400 @@ -48,7 +48,7 @@ * head_32 for boot CPU and setup_per_cpu_areas() for others. */ @@ -9535,9 +9101,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/stackprotector.h linux-3.0.7/arch/x8 asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-3.0.7/arch/x86/include/asm/stacktrace.h linux-3.0.7/arch/x86/include/asm/stacktrace.h ---- linux-3.0.7/arch/x86/include/asm/stacktrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/stacktrace.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/stacktrace.h linux-3.0.8/arch/x86/include/asm/stacktrace.h +--- linux-3.0.8/arch/x86/include/asm/stacktrace.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/stacktrace.h 2011-08-23 21:47:55.000000000 -0400 @@ -11,28 +11,20 @@ extern int kstack_depth_to_print; @@ -9588,9 +9154,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/stacktrace.h linux-3.0.7/arch/x86/in }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs, -diff -urNp linux-3.0.7/arch/x86/include/asm/sys_ia32.h linux-3.0.7/arch/x86/include/asm/sys_ia32.h ---- linux-3.0.7/arch/x86/include/asm/sys_ia32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/sys_ia32.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/sys_ia32.h linux-3.0.8/arch/x86/include/asm/sys_ia32.h +--- linux-3.0.8/arch/x86/include/asm/sys_ia32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/sys_ia32.h 2011-10-06 04:17:55.000000000 -0400 @@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int compat_sigset_t __user *, unsigned int); asmlinkage long sys32_alarm(unsigned int); @@ -9600,9 +9166,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/sys_ia32.h linux-3.0.7/arch/x86/incl asmlinkage long sys32_sysfs(int, u32, u32); asmlinkage long sys32_sched_rr_get_interval(compat_pid_t, -diff -urNp linux-3.0.7/arch/x86/include/asm/system.h linux-3.0.7/arch/x86/include/asm/system.h ---- linux-3.0.7/arch/x86/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/system.h linux-3.0.8/arch/x86/include/asm/system.h +--- linux-3.0.8/arch/x86/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 @@ -129,7 +129,7 @@ do { \ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -9645,9 +9211,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/system.h linux-3.0.7/arch/x86/includ /* * Force strict CPU ordering. -diff -urNp linux-3.0.7/arch/x86/include/asm/thread_info.h linux-3.0.7/arch/x86/include/asm/thread_info.h ---- linux-3.0.7/arch/x86/include/asm/thread_info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/thread_info.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/thread_info.h linux-3.0.8/arch/x86/include/asm/thread_info.h +--- linux-3.0.8/arch/x86/include/asm/thread_info.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/thread_info.h 2011-08-23 21:47:55.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <asm/page.h> @@ -9795,231 +9361,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/thread_info.h linux-3.0.7/arch/x86/i + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess.h linux-3.0.7/arch/x86/include/asm/uaccess.h ---- linux-3.0.7/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/uaccess.h 2011-10-06 04:17:55.000000000 -0400 -@@ -7,12 +7,15 @@ - #include <linux/compiler.h> - #include <linux/thread_info.h> - #include <linux/string.h> -+#include <linux/sched.h> - #include <asm/asm.h> - #include <asm/page.h> - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 - -+extern void check_object_size(const void *ptr, unsigned long n, bool to); -+ - /* - * The fs value determines whether argument validity checking should be - * performed or not. If get_fs() == USER_DS, checking is performed, with -@@ -28,7 +31,12 @@ - - #define get_ds() (KERNEL_DS) - #define get_fs() (current_thread_info()->addr_limit) -+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) -+void __set_fs(mm_segment_t x); -+void set_fs(mm_segment_t x); -+#else - #define set_fs(x) (current_thread_info()->addr_limit = (x)) -+#endif - - #define segment_eq(a, b) ((a).seg == (b).seg) - -@@ -76,7 +84,33 @@ - * checks that the pointer is in the user space range - after calling - * this function, memory access functions may still return -EFAULT. - */ --#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) -+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) -+#define access_ok(type, addr, size) \ -+({ \ -+ long __size = size; \ -+ unsigned long __addr = (unsigned long)addr; \ -+ unsigned long __addr_ao = __addr & PAGE_MASK; \ -+ unsigned long __end_ao = __addr + __size - 1; \ -+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \ -+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \ -+ while(__addr_ao <= __end_ao) { \ -+ char __c_ao; \ -+ __addr_ao += PAGE_SIZE; \ -+ if (__size > PAGE_SIZE) \ -+ cond_resched(); \ -+ if (__get_user(__c_ao, (char __user *)__addr)) \ -+ break; \ -+ if (type != VERIFY_WRITE) { \ -+ __addr = __addr_ao; \ -+ continue; \ -+ } \ -+ if (__put_user(__c_ao, (char __user *)__addr)) \ -+ break; \ -+ __addr = __addr_ao; \ -+ } \ -+ } \ -+ __ret_ao; \ -+}) - - /* - * The exception table consists of pairs of addresses: the first is the -@@ -182,12 +216,20 @@ extern int __get_user_bad(void); - asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ - : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") - -- -+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __copyuser_seg "gs;" -+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" -+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" -+#else -+#define __copyuser_seg -+#define __COPYUSER_SET_ES -+#define __COPYUSER_RESTORE_ES -+#endif - - #ifdef CONFIG_X86_32 - #define __put_user_asm_u64(x, addr, err, errret) \ -- asm volatile("1: movl %%eax,0(%2)\n" \ -- "2: movl %%edx,4(%2)\n" \ -+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ -+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ - "3:\n" \ - ".section .fixup,\"ax\"\n" \ - "4: movl %3,%0\n" \ -@@ -199,8 +241,8 @@ extern int __get_user_bad(void); - : "A" (x), "r" (addr), "i" (errret), "0" (err)) - - #define __put_user_asm_ex_u64(x, addr) \ -- asm volatile("1: movl %%eax,0(%1)\n" \ -- "2: movl %%edx,4(%1)\n" \ -+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ -+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ - "3:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - _ASM_EXTABLE(2b, 3b - 2b) \ -@@ -252,7 +294,7 @@ extern void __put_user_8(void); - __typeof__(*(ptr)) __pu_val; \ - __chk_user_ptr(ptr); \ - might_fault(); \ -- __pu_val = x; \ -+ __pu_val = (x); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - __put_user_x(1, __pu_val, ptr, __ret_pu); \ -@@ -373,7 +415,7 @@ do { \ - } while (0) - - #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ -- asm volatile("1: mov"itype" %2,%"rtype"1\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ - "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: mov %3,%0\n" \ -@@ -381,7 +423,7 @@ do { \ - " jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ -- : "=r" (err), ltype(x) \ -+ : "=r" (err), ltype (x) \ - : "m" (__m(addr)), "i" (errret), "0" (err)) - - #define __get_user_size_ex(x, ptr, size) \ -@@ -406,7 +448,7 @@ do { \ - } while (0) - - #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ -- asm volatile("1: mov"itype" %1,%"rtype"0\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ - "2:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - : ltype(x) : "m" (__m(addr))) -@@ -423,13 +465,24 @@ do { \ - int __gu_err; \ - unsigned long __gu_val; \ - __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ -- (x) = (__force __typeof__(*(ptr)))__gu_val; \ -+ (x) = (__typeof__(*(ptr)))__gu_val; \ - __gu_err; \ - }) - - /* FIXME: this hack is definitely wrong -AK */ - struct __large_struct { unsigned long buf[100]; }; --#define __m(x) (*(struct __large_struct __user *)(x)) -+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define ____m(x) \ -+({ \ -+ unsigned long ____x = (unsigned long)(x); \ -+ if (____x < PAX_USER_SHADOW_BASE) \ -+ ____x += PAX_USER_SHADOW_BASE; \ -+ (void __user *)____x; \ -+}) -+#else -+#define ____m(x) (x) -+#endif -+#define __m(x) (*(struct __large_struct __user *)____m(x)) - - /* - * Tell gcc we read from memory instead of writing: this is because -@@ -437,7 +490,7 @@ struct __large_struct { unsigned long bu - * aliasing issues. - */ - #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ -- asm volatile("1: mov"itype" %"rtype"1,%2\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ - "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: mov %3,%0\n" \ -@@ -445,10 +498,10 @@ struct __large_struct { unsigned long bu - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ - : "=r"(err) \ -- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) -+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err)) - - #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ -- asm volatile("1: mov"itype" %"rtype"0,%1\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ - "2:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - : : ltype(x), "m" (__m(addr))) -@@ -487,8 +540,12 @@ struct __large_struct { unsigned long bu - * On error, the variable @x is set to zero. - */ - -+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __get_user(x, ptr) get_user((x), (ptr)) -+#else - #define __get_user(x, ptr) \ - __get_user_nocheck((x), (ptr), sizeof(*(ptr))) -+#endif - - /** - * __put_user: - Write a simple value into user space, with less checking. -@@ -510,8 +567,12 @@ struct __large_struct { unsigned long bu - * Returns zero on success, or -EFAULT on error. - */ - -+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __put_user(x, ptr) put_user((x), (ptr)) -+#else - #define __put_user(x, ptr) \ - __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) -+#endif - - #define __get_user_unaligned __get_user - #define __put_user_unaligned __put_user -@@ -529,7 +590,7 @@ struct __large_struct { unsigned long bu - #define get_user_ex(x, ptr) do { \ - unsigned long __gue_val; \ - __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ -- (x) = (__force __typeof__(*(ptr)))__gue_val; \ -+ (x) = (__typeof__(*(ptr)))__gue_val; \ - } while (0) - - #ifdef CONFIG_X86_WP_WORKS_OK -diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess_32.h linux-3.0.7/arch/x86/include/asm/uaccess_32.h ---- linux-3.0.7/arch/x86/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/uaccess_32.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_32.h linux-3.0.8/arch/x86/include/asm/uaccess_32.h +--- linux-3.0.8/arch/x86/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/uaccess_32.h 2011-08-23 21:48:14.000000000 -0400 @@ -43,6 +43,11 @@ 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) @@ -10187,9 +9531,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess_32.h linux-3.0.7/arch/x86/in return n; } -diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess_64.h linux-3.0.7/arch/x86/include/asm/uaccess_64.h ---- linux-3.0.7/arch/x86/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/uaccess_64.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_64.h linux-3.0.8/arch/x86/include/asm/uaccess_64.h +--- linux-3.0.8/arch/x86/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/uaccess_64.h 2011-10-06 04:17:55.000000000 -0400 @@ -10,6 +10,9 @@ #include <asm/alternative.h> #include <asm/cpufeature.h> @@ -10601,9 +9945,231 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess_64.h linux-3.0.7/arch/x86/in +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-3.0.7/arch/x86/include/asm/vdso.h linux-3.0.7/arch/x86/include/asm/vdso.h ---- linux-3.0.7/arch/x86/include/asm/vdso.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/vdso.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess.h linux-3.0.8/arch/x86/include/asm/uaccess.h +--- linux-3.0.8/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/uaccess.h 2011-10-06 04:17:55.000000000 -0400 +@@ -7,12 +7,15 @@ + #include <linux/compiler.h> + #include <linux/thread_info.h> + #include <linux/string.h> ++#include <linux/sched.h> + #include <asm/asm.h> + #include <asm/page.h> + + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 + ++extern void check_object_size(const void *ptr, unsigned long n, bool to); ++ + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() == USER_DS, checking is performed, with +@@ -28,7 +31,12 @@ + + #define get_ds() (KERNEL_DS) + #define get_fs() (current_thread_info()->addr_limit) ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++void __set_fs(mm_segment_t x); ++void set_fs(mm_segment_t x); ++#else + #define set_fs(x) (current_thread_info()->addr_limit = (x)) ++#endif + + #define segment_eq(a, b) ((a).seg == (b).seg) + +@@ -76,7 +84,33 @@ + * checks that the pointer is in the user space range - after calling + * this function, memory access functions may still return -EFAULT. + */ +-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) ++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) ++#define access_ok(type, addr, size) \ ++({ \ ++ long __size = size; \ ++ unsigned long __addr = (unsigned long)addr; \ ++ unsigned long __addr_ao = __addr & PAGE_MASK; \ ++ unsigned long __end_ao = __addr + __size - 1; \ ++ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \ ++ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \ ++ while(__addr_ao <= __end_ao) { \ ++ char __c_ao; \ ++ __addr_ao += PAGE_SIZE; \ ++ if (__size > PAGE_SIZE) \ ++ cond_resched(); \ ++ if (__get_user(__c_ao, (char __user *)__addr)) \ ++ break; \ ++ if (type != VERIFY_WRITE) { \ ++ __addr = __addr_ao; \ ++ continue; \ ++ } \ ++ if (__put_user(__c_ao, (char __user *)__addr)) \ ++ break; \ ++ __addr = __addr_ao; \ ++ } \ ++ } \ ++ __ret_ao; \ ++}) + + /* + * The exception table consists of pairs of addresses: the first is the +@@ -182,12 +216,20 @@ extern int __get_user_bad(void); + asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") + +- ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __copyuser_seg "gs;" ++#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" ++#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" ++#else ++#define __copyuser_seg ++#define __COPYUSER_SET_ES ++#define __COPYUSER_RESTORE_ES ++#endif + + #ifdef CONFIG_X86_32 + #define __put_user_asm_u64(x, addr, err, errret) \ +- asm volatile("1: movl %%eax,0(%2)\n" \ +- "2: movl %%edx,4(%2)\n" \ ++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ + "3:\n" \ + ".section .fixup,\"ax\"\n" \ + "4: movl %3,%0\n" \ +@@ -199,8 +241,8 @@ extern int __get_user_bad(void); + : "A" (x), "r" (addr), "i" (errret), "0" (err)) + + #define __put_user_asm_ex_u64(x, addr) \ +- asm volatile("1: movl %%eax,0(%1)\n" \ +- "2: movl %%edx,4(%1)\n" \ ++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ + "3:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + _ASM_EXTABLE(2b, 3b - 2b) \ +@@ -252,7 +294,7 @@ extern void __put_user_8(void); + __typeof__(*(ptr)) __pu_val; \ + __chk_user_ptr(ptr); \ + might_fault(); \ +- __pu_val = x; \ ++ __pu_val = (x); \ + switch (sizeof(*(ptr))) { \ + case 1: \ + __put_user_x(1, __pu_val, ptr, __ret_pu); \ +@@ -373,7 +415,7 @@ do { \ + } while (0) + + #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ +- asm volatile("1: mov"itype" %2,%"rtype"1\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -381,7 +423,7 @@ do { \ + " jmp 2b\n" \ + ".previous\n" \ + _ASM_EXTABLE(1b, 3b) \ +- : "=r" (err), ltype(x) \ ++ : "=r" (err), ltype (x) \ + : "m" (__m(addr)), "i" (errret), "0" (err)) + + #define __get_user_size_ex(x, ptr, size) \ +@@ -406,7 +448,7 @@ do { \ + } while (0) + + #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %1,%"rtype"0\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : ltype(x) : "m" (__m(addr))) +@@ -423,13 +465,24 @@ do { \ + int __gu_err; \ + unsigned long __gu_val; \ + __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ +- (x) = (__force __typeof__(*(ptr)))__gu_val; \ ++ (x) = (__typeof__(*(ptr)))__gu_val; \ + __gu_err; \ + }) + + /* FIXME: this hack is definitely wrong -AK */ + struct __large_struct { unsigned long buf[100]; }; +-#define __m(x) (*(struct __large_struct __user *)(x)) ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define ____m(x) \ ++({ \ ++ unsigned long ____x = (unsigned long)(x); \ ++ if (____x < PAX_USER_SHADOW_BASE) \ ++ ____x += PAX_USER_SHADOW_BASE; \ ++ (void __user *)____x; \ ++}) ++#else ++#define ____m(x) (x) ++#endif ++#define __m(x) (*(struct __large_struct __user *)____m(x)) + + /* + * Tell gcc we read from memory instead of writing: this is because +@@ -437,7 +490,7 @@ struct __large_struct { unsigned long bu + * aliasing issues. + */ + #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ +- asm volatile("1: mov"itype" %"rtype"1,%2\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -445,10 +498,10 @@ struct __large_struct { unsigned long bu + ".previous\n" \ + _ASM_EXTABLE(1b, 3b) \ + : "=r"(err) \ +- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) ++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err)) + + #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %"rtype"0,%1\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : : ltype(x), "m" (__m(addr))) +@@ -487,8 +540,12 @@ struct __large_struct { unsigned long bu + * On error, the variable @x is set to zero. + */ + ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __get_user(x, ptr) get_user((x), (ptr)) ++#else + #define __get_user(x, ptr) \ + __get_user_nocheck((x), (ptr), sizeof(*(ptr))) ++#endif + + /** + * __put_user: - Write a simple value into user space, with less checking. +@@ -510,8 +567,12 @@ struct __large_struct { unsigned long bu + * Returns zero on success, or -EFAULT on error. + */ + ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __put_user(x, ptr) put_user((x), (ptr)) ++#else + #define __put_user(x, ptr) \ + __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) ++#endif + + #define __get_user_unaligned __get_user + #define __put_user_unaligned __put_user +@@ -529,7 +590,7 @@ struct __large_struct { unsigned long bu + #define get_user_ex(x, ptr) do { \ + unsigned long __gue_val; \ + __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ +- (x) = (__force __typeof__(*(ptr)))__gue_val; \ ++ (x) = (__typeof__(*(ptr)))__gue_val; \ + } while (0) + + #ifdef CONFIG_X86_WP_WORKS_OK +diff -urNp linux-3.0.8/arch/x86/include/asm/vdso.h linux-3.0.8/arch/x86/include/asm/vdso.h +--- linux-3.0.8/arch/x86/include/asm/vdso.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/vdso.h 2011-10-06 04:17:55.000000000 -0400 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[]; #define VDSO32_SYMBOL(base, name) \ ({ \ @@ -10613,9 +10179,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/vdso.h linux-3.0.7/arch/x86/include/ }) #endif -diff -urNp linux-3.0.7/arch/x86/include/asm/x86_init.h linux-3.0.7/arch/x86/include/asm/x86_init.h ---- linux-3.0.7/arch/x86/include/asm/x86_init.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/x86_init.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/x86_init.h linux-3.0.8/arch/x86/include/asm/x86_init.h +--- linux-3.0.8/arch/x86/include/asm/x86_init.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/x86_init.h 2011-08-23 21:47:55.000000000 -0400 @@ -28,7 +28,7 @@ struct x86_init_mpparse { void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); void (*find_smp_config)(void); @@ -10733,9 +10299,9 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/x86_init.h linux-3.0.7/arch/x86/incl extern struct x86_init_ops x86_init; extern struct x86_cpuinit_ops x86_cpuinit; -diff -urNp linux-3.0.7/arch/x86/include/asm/xsave.h linux-3.0.7/arch/x86/include/asm/xsave.h ---- linux-3.0.7/arch/x86/include/asm/xsave.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/include/asm/xsave.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/include/asm/xsave.h linux-3.0.8/arch/x86/include/asm/xsave.h +--- linux-3.0.8/arch/x86/include/asm/xsave.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/include/asm/xsave.h 2011-10-06 04:17:55.000000000 -0400 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav { int err; @@ -10765,9 +10331,135 @@ diff -urNp linux-3.0.7/arch/x86/include/asm/xsave.h linux-3.0.7/arch/x86/include __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile ---- linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/Kconfig linux-3.0.8/arch/x86/Kconfig +--- linux-3.0.8/arch/x86/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/Kconfig 2011-09-17 00:58:36.000000000 -0400 +@@ -229,7 +229,7 @@ config X86_HT + + config X86_32_LAZY_GS + def_bool y +- depends on X86_32 && !CC_STACKPROTECTOR ++ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF + + config ARCH_HWEIGHT_CFLAGS + string +@@ -1018,7 +1018,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 +@@ -1055,7 +1055,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. +@@ -1109,7 +1109,7 @@ config PAGE_OFFSET + hex + default 0xB0000000 if VMSPLIT_3G_OPT + default 0x80000000 if VMSPLIT_2G +- default 0x78000000 if VMSPLIT_2G_OPT ++ default 0x70000000 if VMSPLIT_2G_OPT + default 0x40000000 if VMSPLIT_1G + default 0xC0000000 + depends on X86_32 +@@ -1483,6 +1483,7 @@ config SECCOMP + + config CC_STACKPROTECTOR + bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" ++ depends on X86_64 || !PAX_MEMORY_UDEREF + ---help--- + This option turns on the -fstack-protector GCC feature. This + feature puts, at the beginning of functions, a canary value on +@@ -1540,6 +1541,7 @@ config KEXEC_JUMP + config PHYSICAL_START + hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) + default "0x1000000" ++ range 0x400000 0x40000000 + ---help--- + This gives the physical address where the kernel is loaded. + +@@ -1603,6 +1605,7 @@ config X86_NEED_RELOCS + config PHYSICAL_ALIGN + hex "Alignment value to which kernel should be aligned" if X86_32 + default "0x1000000" ++ range 0x400000 0x1000000 if PAX_KERNEXEC + range 0x2000 0x1000000 + ---help--- + This value puts the alignment restrictions on physical address +@@ -1634,9 +1637,10 @@ config HOTPLUG_CPU + Say N if you want to disable CPU hotplug. + + config COMPAT_VDSO +- def_bool y ++ def_bool n + prompt "Compat VDSO support" + depends on X86_32 || IA32_EMULATION ++ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF + ---help--- + Map the 32-bit VDSO to the predictable old-style address too. + +diff -urNp linux-3.0.8/arch/x86/Kconfig.cpu linux-3.0.8/arch/x86/Kconfig.cpu +--- linux-3.0.8/arch/x86/Kconfig.cpu 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/Kconfig.cpu 2011-08-23 21:47:55.000000000 -0400 +@@ -338,7 +338,7 @@ config X86_PPRO_FENCE + + config X86_F00F_BUG + def_bool y +- depends on M586MMX || M586TSC || M586 || M486 || M386 ++ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC + + config X86_INVD_BUG + def_bool y +@@ -362,7 +362,7 @@ config X86_POPAD_OK + + config X86_ALIGNMENT_16 + def_bool y +- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 ++ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 + + config X86_INTEL_USERCOPY + def_bool y +@@ -408,7 +408,7 @@ config X86_CMPXCHG64 + # generates cmov. + config X86_CMOV + def_bool y +- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) ++ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) + + config X86_MINIMUM_CPU_FAMILY + int +diff -urNp linux-3.0.8/arch/x86/Kconfig.debug linux-3.0.8/arch/x86/Kconfig.debug +--- linux-3.0.8/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400 +@@ -81,7 +81,7 @@ config X86_PTDUMP + config DEBUG_RODATA + bool "Write protect kernel read-only data structures" + default y +- depends on DEBUG_KERNEL ++ depends on DEBUG_KERNEL && BROKEN + ---help--- + Mark the kernel read-only data as write-protected in the pagetables, + in order to catch accidental (and incorrect) writes to such const +@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST + + config DEBUG_SET_MODULE_RONX + bool "Set loadable kernel module data as NX and text as RO" +- depends on MODULES ++ depends on MODULES && BROKEN + ---help--- + This option helps catch unintended modifications to loadable + kernel module's text and read-only data. It also prevents execution +diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile +--- linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400 @@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) @@ -10778,9 +10470,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.7/arch/x KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400 @@ -108,6 +108,9 @@ wakeup_code: /* Do any other stuff... */ @@ -10799,9 +10491,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.7/arch/x #else pushw $0 pushw trampoline_segment -diff -urNp linux-3.0.7/arch/x86/kernel/acpi/sleep.c linux-3.0.7/arch/x86/kernel/acpi/sleep.c ---- linux-3.0.7/arch/x86/kernel/acpi/sleep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/acpi/sleep.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/acpi/sleep.c linux-3.0.8/arch/x86/kernel/acpi/sleep.c +--- linux-3.0.8/arch/x86/kernel/acpi/sleep.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/acpi/sleep.c 2011-08-23 21:47:55.000000000 -0400 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void) header->trampoline_segment = trampoline_address() >> 4; #ifdef CONFIG_SMP @@ -10815,9 +10507,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/acpi/sleep.c linux-3.0.7/arch/x86/kernel/ initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; -diff -urNp linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S ---- linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S +--- linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S 2011-08-23 21:47:55.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 @@ -10834,9 +10526,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.7/arch/x86/ker bogus_magic: jmp bogus_magic -diff -urNp linux-3.0.7/arch/x86/kernel/alternative.c linux-3.0.7/arch/x86/kernel/alternative.c ---- linux-3.0.7/arch/x86/kernel/alternative.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/alternative.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/alternative.c linux-3.0.8/arch/x86/kernel/alternative.c +--- linux-3.0.8/arch/x86/kernel/alternative.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/alternative.c 2011-08-23 21:47:55.000000000 -0400 @@ -313,7 +313,7 @@ static void alternatives_smp_lock(const if (!*poff || ptr < text || ptr >= text_end) continue; @@ -10938,9 +10630,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/alternative.c linux-3.0.7/arch/x86/kernel return addr; } -diff -urNp linux-3.0.7/arch/x86/kernel/apic/apic.c linux-3.0.7/arch/x86/kernel/apic/apic.c ---- linux-3.0.7/arch/x86/kernel/apic/apic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/apic/apic.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/apic/apic.c linux-3.0.8/arch/x86/kernel/apic/apic.c +--- linux-3.0.8/arch/x86/kernel/apic/apic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/apic/apic.c 2011-08-23 21:48:14.000000000 -0400 @@ -173,7 +173,7 @@ int first_system_vector = 0xfe; /* * Debug level, exported for io_apic.c @@ -10968,9 +10660,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/apic/apic.c linux-3.0.7/arch/x86/kernel/a bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); -diff -urNp linux-3.0.7/arch/x86/kernel/apic/io_apic.c linux-3.0.7/arch/x86/kernel/apic/io_apic.c ---- linux-3.0.7/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/apic/io_apic.c linux-3.0.8/arch/x86/kernel/apic/io_apic.c +--- linux-3.0.8/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); @@ -11007,9 +10699,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/apic/io_apic.c linux-3.0.7/arch/x86/kerne eoi_ioapic_irq(irq, cfg); } -diff -urNp linux-3.0.7/arch/x86/kernel/apm_32.c linux-3.0.7/arch/x86/kernel/apm_32.c ---- linux-3.0.7/arch/x86/kernel/apm_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/apm_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/apm_32.c linux-3.0.8/arch/x86/kernel/apm_32.c +--- linux-3.0.8/arch/x86/kernel/apm_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/apm_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -11081,9 +10773,20 @@ diff -urNp linux-3.0.7/arch/x86/kernel/apm_32.c linux-3.0.7/arch/x86/kernel/apm_ proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-3.0.7/arch/x86/kernel/asm-offsets.c linux-3.0.7/arch/x86/kernel/asm-offsets.c ---- linux-3.0.7/arch/x86/kernel/asm-offsets.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/asm-offsets.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets_64.c linux-3.0.8/arch/x86/kernel/asm-offsets_64.c +--- linux-3.0.8/arch/x86/kernel/asm-offsets_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/asm-offsets_64.c 2011-08-23 21:47:55.000000000 -0400 +@@ -69,6 +69,7 @@ int main(void) + BLANK(); + #undef ENTRY + ++ DEFINE(TSS_size, sizeof(struct tss_struct)); + OFFSET(TSS_ist, tss_struct, x86_tss.ist); + BLANK(); + +diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets.c linux-3.0.8/arch/x86/kernel/asm-offsets.c +--- linux-3.0.8/arch/x86/kernel/asm-offsets.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/asm-offsets.c 2011-08-23 21:47:55.000000000 -0400 @@ -33,6 +33,8 @@ void common(void) { OFFSET(TI_status, thread_info, status); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -11120,34 +10823,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/asm-offsets.c linux-3.0.7/arch/x86/kernel #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); -diff -urNp linux-3.0.7/arch/x86/kernel/asm-offsets_64.c linux-3.0.7/arch/x86/kernel/asm-offsets_64.c ---- linux-3.0.7/arch/x86/kernel/asm-offsets_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/asm-offsets_64.c 2011-08-23 21:47:55.000000000 -0400 -@@ -69,6 +69,7 @@ int main(void) - BLANK(); - #undef ENTRY - -+ DEFINE(TSS_size, sizeof(struct tss_struct)); - OFFSET(TSS_ist, tss_struct, x86_tss.ist); - BLANK(); - -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/Makefile linux-3.0.7/arch/x86/kernel/cpu/Makefile ---- linux-3.0.7/arch/x86/kernel/cpu/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/Makefile 2011-08-23 21:47:55.000000000 -0400 -@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg - CFLAGS_REMOVE_perf_event.o = -pg - endif - --# Make sure load_percpu_segment has no stackprotector --nostackp := $(call cc-option, -fno-stack-protector) --CFLAGS_common.o := $(nostackp) -- - obj-y := intel_cacheinfo.o scattered.o topology.o - obj-y += proc.o capflags.o powerflags.o common.o - obj-y += vmware.o hypervisor.o sched.o mshyperv.o -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/amd.c linux-3.0.7/arch/x86/kernel/cpu/amd.c ---- linux-3.0.7/arch/x86/kernel/cpu/amd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/amd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/amd.c linux-3.0.8/arch/x86/kernel/cpu/amd.c +--- linux-3.0.8/arch/x86/kernel/cpu/amd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/amd.c 2011-08-23 21:47:55.000000000 -0400 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { @@ -11157,9 +10835,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/amd.c linux-3.0.7/arch/x86/kernel/cpu /* Duron Rev A0 */ if (c->x86_model == 3 && c->x86_mask == 0) size = 64; -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/common.c linux-3.0.7/arch/x86/kernel/cpu/common.c ---- linux-3.0.7/arch/x86/kernel/cpu/common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/common.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/common.c linux-3.0.8/arch/x86/kernel/cpu/common.c +--- linux-3.0.8/arch/x86/kernel/cpu/common.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/common.c 2011-08-23 21:47:55.000000000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -11304,9 +10982,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/common.c linux-3.0.7/arch/x86/kernel/ struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/intel.c linux-3.0.7/arch/x86/kernel/cpu/intel.c ---- linux-3.0.7/arch/x86/kernel/cpu/intel.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/intel.c 2011-08-29 23:30:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/intel.c linux-3.0.8/arch/x86/kernel/cpu/intel.c +--- linux-3.0.8/arch/x86/kernel/cpu/intel.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/intel.c 2011-08-29 23:30:14.000000000 -0400 @@ -172,7 +172,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. @@ -11316,23 +10994,23 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/intel.c linux-3.0.7/arch/x86/kernel/c load_idt(&idt_descr); } #endif -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c ---- linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-23 21:47:55.000000000 -0400 -@@ -215,7 +215,9 @@ static int inject_init(void) - if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL)) - return -ENOMEM; - printk(KERN_INFO "Machine check injector initialized\n"); -- mce_chrdev_ops.write = mce_write; -+ pax_open_kernel(); -+ *(void **)&mce_chrdev_ops.write = mce_write; -+ pax_close_kernel(); - register_die_notifier(&mce_raise_nb); - return 0; - } -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/Makefile linux-3.0.8/arch/x86/kernel/cpu/Makefile +--- linux-3.0.8/arch/x86/kernel/cpu/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/Makefile 2011-08-23 21:47:55.000000000 -0400 +@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg + CFLAGS_REMOVE_perf_event.o = -pg + endif + +-# Make sure load_percpu_segment has no stackprotector +-nostackp := $(call cc-option, -fno-stack-protector) +-CFLAGS_common.o := $(nostackp) +- + obj-y := intel_cacheinfo.o scattered.o topology.o + obj-y += proc.o capflags.o powerflags.o common.o + obj-y += vmware.o hypervisor.o sched.o mshyperv.o +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c 2011-08-23 21:47:55.000000000 -0400 @@ -46,6 +46,7 @@ #include <asm/ipi.h> #include <asm/mce.h> @@ -11434,9 +11112,23 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.7/arch/x86/ker atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c ---- linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c +--- linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-23 21:47:55.000000000 -0400 +@@ -215,7 +215,9 @@ static int inject_init(void) + if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL)) + return -ENOMEM; + printk(KERN_INFO "Machine check injector initialized\n"); +- mce_chrdev_ops.write = mce_write; ++ pax_open_kernel(); ++ *(void **)&mce_chrdev_ops.write = mce_write; ++ pax_close_kernel(); + register_die_notifier(&mce_raise_nb); + return 0; + } +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c +--- linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c 2011-08-29 23:26:21.000000000 -0400 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -11446,9 +11138,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.7/arch/x86/kern const struct mtrr_ops *mtrr_if; -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-08-26 19:49:56.000000000 -0400 @@ -25,7 +25,7 @@ struct mtrr_ops { int (*validate_add_page)(unsigned long base, unsigned long size, unsigned int type); @@ -11458,9 +11150,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.7/arch/x86/kern extern int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg); -diff -urNp linux-3.0.7/arch/x86/kernel/cpu/perf_event.c linux-3.0.7/arch/x86/kernel/cpu/perf_event.c ---- linux-3.0.7/arch/x86/kernel/cpu/perf_event.c 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/cpu/perf_event.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/cpu/perf_event.c linux-3.0.8/arch/x86/kernel/cpu/perf_event.c +--- linux-3.0.8/arch/x86/kernel/cpu/perf_event.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/cpu/perf_event.c 2011-10-16 21:55:27.000000000 -0400 @@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp int i, j, w, wmax, num = 0; struct hw_perf_event *hwc; @@ -11479,9 +11171,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/cpu/perf_event.c linux-3.0.7/arch/x86/ker } } -diff -urNp linux-3.0.7/arch/x86/kernel/crash.c linux-3.0.7/arch/x86/kernel/crash.c ---- linux-3.0.7/arch/x86/kernel/crash.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/crash.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/crash.c linux-3.0.8/arch/x86/kernel/crash.c +--- linux-3.0.8/arch/x86/kernel/crash.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/crash.c 2011-08-23 21:47:55.000000000 -0400 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -11491,9 +11183,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/crash.c linux-3.0.7/arch/x86/kernel/crash crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-3.0.7/arch/x86/kernel/doublefault_32.c linux-3.0.7/arch/x86/kernel/doublefault_32.c ---- linux-3.0.7/arch/x86/kernel/doublefault_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/doublefault_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/doublefault_32.c linux-3.0.8/arch/x86/kernel/doublefault_32.c +--- linux-3.0.8/arch/x86/kernel/doublefault_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/doublefault_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -11525,9 +11217,129 @@ diff -urNp linux-3.0.7/arch/x86/kernel/doublefault_32.c linux-3.0.7/arch/x86/ker .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack.c linux-3.0.7/arch/x86/kernel/dumpstack.c ---- linux-3.0.7/arch/x86/kernel/dumpstack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/dumpstack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_32.c linux-3.0.8/arch/x86/kernel/dumpstack_32.c +--- linux-3.0.8/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400 +@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task + bp = stack_frame(task, regs); + + for (;;) { +- struct thread_info *context; ++ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); + +- context = (struct thread_info *) +- ((unsigned long)stack & (~(THREAD_SIZE - 1))); +- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); ++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); + +- stack = (unsigned long *)context->previous_esp; +- if (!stack) ++ if (stack_start == task_stack_page(task)) + break; ++ stack = *(unsigned long **)stack_start; + if (ops->stack(data, "IRQ") < 0) + break; + touch_nmi_watchdog(); +@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs + * When in-kernel, we also print out the stack and code at the + * time of the fault.. + */ +- if (!user_mode_vm(regs)) { ++ if (!user_mode(regs)) { + unsigned int code_prologue = code_bytes * 43 / 64; + unsigned int code_len = code_bytes; + unsigned char c; + u8 *ip; ++ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]); + + printk(KERN_EMERG "Stack:\n"); + show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG); + + printk(KERN_EMERG "Code: "); + +- ip = (u8 *)regs->ip - code_prologue; ++ ip = (u8 *)regs->ip - code_prologue + cs_base; + if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { + /* try starting at IP */ +- ip = (u8 *)regs->ip; ++ ip = (u8 *)regs->ip + cs_base; + code_len = code_len - code_prologue + 1; + } + for (i = 0; i < code_len; i++, ip++) { +@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs + printk(" Bad EIP value."); + break; + } +- if (ip == (u8 *)regs->ip) ++ if (ip == (u8 *)regs->ip + cs_base) + printk("<%02x> ", c); + else + printk("%02x ", c); +@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip) + { + unsigned short ud2; + ++ ip = ktla_ktva(ip); + if (ip < PAGE_OFFSET) + return 0; + if (probe_kernel_address((unsigned short *)ip, ud2)) +diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_64.c linux-3.0.8/arch/x86/kernel/dumpstack_64.c +--- linux-3.0.8/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400 +@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task + unsigned long *irq_stack_end = + (unsigned long *)per_cpu(irq_stack_ptr, cpu); + unsigned used = 0; +- struct thread_info *tinfo; + int graph = 0; + unsigned long dummy; ++ void *stack_start; + + if (!task) + task = current; +@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task + * current stack address. If the stacks consist of nested + * exceptions + */ +- tinfo = task_thread_info(task); + for (;;) { + char *id; + unsigned long *estack_end; ++ + estack_end = in_exception_stack(cpu, (unsigned long)stack, + &used, &id); + +@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task + if (ops->stack(data, id) < 0) + break; + +- bp = ops->walk_stack(tinfo, stack, bp, ops, ++ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops, + data, estack_end, &graph); + ops->stack(data, "<EOE>"); + /* +@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task + if (in_irq_stack(stack, irq_stack, irq_stack_end)) { + if (ops->stack(data, "IRQ") < 0) + break; +- bp = ops->walk_stack(tinfo, stack, bp, ++ bp = ops->walk_stack(task, irq_stack, stack, bp, + ops, data, irq_stack_end, &graph); + /* + * We link to the next stack (which would be +@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task + /* + * This handles the process stack: + */ +- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); ++ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); ++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); + put_cpu(); + } + EXPORT_SYMBOL(dump_trace); +diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack.c linux-3.0.8/arch/x86/kernel/dumpstack.c +--- linux-3.0.8/arch/x86/kernel/dumpstack.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/dumpstack.c 2011-08-23 21:48:14.000000000 -0400 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -11671,129 +11483,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack.c linux-3.0.7/arch/x86/kernel/d report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack_32.c linux-3.0.7/arch/x86/kernel/dumpstack_32.c ---- linux-3.0.7/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400 -@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task - bp = stack_frame(task, regs); - - for (;;) { -- struct thread_info *context; -+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); - -- context = (struct thread_info *) -- ((unsigned long)stack & (~(THREAD_SIZE - 1))); -- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); -+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); - -- stack = (unsigned long *)context->previous_esp; -- if (!stack) -+ if (stack_start == task_stack_page(task)) - break; -+ stack = *(unsigned long **)stack_start; - if (ops->stack(data, "IRQ") < 0) - break; - touch_nmi_watchdog(); -@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs - * When in-kernel, we also print out the stack and code at the - * time of the fault.. - */ -- if (!user_mode_vm(regs)) { -+ if (!user_mode(regs)) { - unsigned int code_prologue = code_bytes * 43 / 64; - unsigned int code_len = code_bytes; - unsigned char c; - u8 *ip; -+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]); - - printk(KERN_EMERG "Stack:\n"); - show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG); - - printk(KERN_EMERG "Code: "); - -- ip = (u8 *)regs->ip - code_prologue; -+ ip = (u8 *)regs->ip - code_prologue + cs_base; - if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { - /* try starting at IP */ -- ip = (u8 *)regs->ip; -+ ip = (u8 *)regs->ip + cs_base; - code_len = code_len - code_prologue + 1; - } - for (i = 0; i < code_len; i++, ip++) { -@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs - printk(" Bad EIP value."); - break; - } -- if (ip == (u8 *)regs->ip) -+ if (ip == (u8 *)regs->ip + cs_base) - printk("<%02x> ", c); - else - printk("%02x ", c); -@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip) - { - unsigned short ud2; - -+ ip = ktla_ktva(ip); - if (ip < PAGE_OFFSET) - return 0; - if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack_64.c linux-3.0.7/arch/x86/kernel/dumpstack_64.c ---- linux-3.0.7/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400 -@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task - unsigned long *irq_stack_end = - (unsigned long *)per_cpu(irq_stack_ptr, cpu); - unsigned used = 0; -- struct thread_info *tinfo; - int graph = 0; - unsigned long dummy; -+ void *stack_start; - - if (!task) - task = current; -@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task - * current stack address. If the stacks consist of nested - * exceptions - */ -- tinfo = task_thread_info(task); - for (;;) { - char *id; - unsigned long *estack_end; -+ - estack_end = in_exception_stack(cpu, (unsigned long)stack, - &used, &id); - -@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task - if (ops->stack(data, id) < 0) - break; - -- bp = ops->walk_stack(tinfo, stack, bp, ops, -+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops, - data, estack_end, &graph); - ops->stack(data, "<EOE>"); - /* -@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task - if (in_irq_stack(stack, irq_stack, irq_stack_end)) { - if (ops->stack(data, "IRQ") < 0) - break; -- bp = ops->walk_stack(tinfo, stack, bp, -+ bp = ops->walk_stack(task, irq_stack, stack, bp, - ops, data, irq_stack_end, &graph); - /* - * We link to the next stack (which would be -@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task - /* - * This handles the process stack: - */ -- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); -+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); -+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); - put_cpu(); - } - EXPORT_SYMBOL(dump_trace); -diff -urNp linux-3.0.7/arch/x86/kernel/early_printk.c linux-3.0.7/arch/x86/kernel/early_printk.c ---- linux-3.0.7/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/early_printk.c linux-3.0.8/arch/x86/kernel/early_printk.c +--- linux-3.0.8/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400 @@ -7,6 +7,7 @@ #include <linux/pci_regs.h> #include <linux/pci_ids.h> @@ -11811,9 +11503,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/early_printk.c linux-3.0.7/arch/x86/kerne va_start(ap, fmt); n = vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); -diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/entry_32.S ---- linux-3.0.7/arch/x86/kernel/entry_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/entry_32.S 2011-08-30 18:23:52.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/entry_32.S linux-3.0.8/arch/x86/kernel/entry_32.S +--- linux-3.0.8/arch/x86/kernel/entry_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/entry_32.S 2011-10-20 04:46:01.000000000 -0400 @@ -185,13 +185,146 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -11987,6 +11679,15 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en .macro RESTORE_INT_REGS popl_cfi %ebx CFI_RESTORE ebx +@@ -307,7 +449,7 @@ ENTRY(ret_from_fork) + popfl_cfi + jmp syscall_exit + CFI_ENDPROC +-END(ret_from_fork) ++ENDPROC(ret_from_fork) + + /* + * Interrupt exit functions should be protected against kprobes @@ -332,7 +474,15 @@ check_userspace: movb PT_CS(%esp), %al andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax @@ -12003,15 +11704,26 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en ENTRY(resume_userspace) LOCKDEP_SYS_EXIT -@@ -344,7 +494,7 @@ ENTRY(resume_userspace) +@@ -344,8 +494,8 @@ ENTRY(resume_userspace) andl $_TIF_WORK_MASK, %ecx # is there any work to be done on # int/exception return? jne work_pending - jmp restore_all +-END(ret_from_exception) + jmp restore_all_pax - END(ret_from_exception) ++ENDPROC(ret_from_exception) #ifdef CONFIG_PREEMPT + ENTRY(resume_kernel) +@@ -360,7 +510,7 @@ need_resched: + jz restore_all + call preempt_schedule_irq + jmp need_resched +-END(resume_kernel) ++ENDPROC(resume_kernel) + #endif + CFI_ENDPROC + /* @@ -394,23 +544,34 @@ sysenter_past_esp: /*CFI_REL_OFFSET cs, 0*/ /* @@ -12159,7 +11871,7 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en pushl_cfi $__ESPFIX_SS pushl_cfi %eax /* new kernel esp */ /* Disable interrupts, but do not irqtrace this section: we -@@ -613,29 +824,23 @@ work_resched: +@@ -613,34 +824,28 @@ work_resched: movl TI_flags(%ebp), %ecx andl $_TIF_WORK_MASK, %ecx # is there any work to be done other # than syscall tracing? @@ -12193,7 +11905,13 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en #endif xorl %edx, %edx call do_notify_resume -@@ -648,6 +853,9 @@ syscall_trace_entry: + jmp resume_userspace_sig +-END(work_pending) ++ENDPROC(work_pending) + + # perform syscall exit tracing + ALIGN +@@ -648,11 +853,14 @@ syscall_trace_entry: movl $-ENOSYS,PT_EAX(%esp) movl %esp, %eax call syscall_trace_enter @@ -12203,7 +11921,19 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en /* What it returned is what we'll actually use. */ cmpl $(nr_syscalls), %eax jnae syscall_call -@@ -670,6 +878,10 @@ END(syscall_exit_work) + jmp syscall_exit +-END(syscall_trace_entry) ++ENDPROC(syscall_trace_entry) + + # perform syscall exit tracing + ALIGN +@@ -665,20 +873,24 @@ syscall_exit_work: + movl %esp, %eax + call syscall_trace_leave + jmp resume_userspace +-END(syscall_exit_work) ++ENDPROC(syscall_exit_work) + CFI_ENDPROC RING0_INT_FRAME # can't unwind into user space anyway syscall_fault: @@ -12214,6 +11944,17 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en GET_THREAD_INFO(%ebp) movl $-EFAULT,PT_EAX(%esp) jmp resume_userspace +-END(syscall_fault) ++ENDPROC(syscall_fault) + + syscall_badsys: + movl $-ENOSYS,PT_EAX(%esp) + jmp resume_userspace +-END(syscall_badsys) ++ENDPROC(syscall_badsys) + CFI_ENDPROC + /* + * End of kprobes section @@ -752,6 +964,36 @@ ptregs_clone: CFI_ENDPROC ENDPROC(ptregs_clone) @@ -12269,6 +12010,188 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en shl $16, %eax addl %esp, %eax /* the adjusted stack pointer */ pushl_cfi $__KERNEL_DS +@@ -815,7 +1064,7 @@ vector=vector+1 + .endr + 2: jmp common_interrupt + .endr +-END(irq_entries_start) ++ENDPROC(irq_entries_start) + + .previous + END(interrupt) +@@ -863,7 +1112,7 @@ ENTRY(coprocessor_error) + pushl_cfi $do_coprocessor_error + jmp error_code + CFI_ENDPROC +-END(coprocessor_error) ++ENDPROC(coprocessor_error) + + ENTRY(simd_coprocessor_error) + RING0_INT_FRAME +@@ -889,7 +1138,7 @@ ENTRY(simd_coprocessor_error) + #endif + jmp error_code + CFI_ENDPROC +-END(simd_coprocessor_error) ++ENDPROC(simd_coprocessor_error) + + ENTRY(device_not_available) + RING0_INT_FRAME +@@ -897,7 +1146,7 @@ ENTRY(device_not_available) + pushl_cfi $do_device_not_available + jmp error_code + CFI_ENDPROC +-END(device_not_available) ++ENDPROC(device_not_available) + + #ifdef CONFIG_PARAVIRT + ENTRY(native_iret) +@@ -906,12 +1155,12 @@ ENTRY(native_iret) + .align 4 + .long native_iret, iret_exc + .previous +-END(native_iret) ++ENDPROC(native_iret) + + ENTRY(native_irq_enable_sysexit) + sti + sysexit +-END(native_irq_enable_sysexit) ++ENDPROC(native_irq_enable_sysexit) + #endif + + ENTRY(overflow) +@@ -920,7 +1169,7 @@ ENTRY(overflow) + pushl_cfi $do_overflow + jmp error_code + CFI_ENDPROC +-END(overflow) ++ENDPROC(overflow) + + ENTRY(bounds) + RING0_INT_FRAME +@@ -928,7 +1177,7 @@ ENTRY(bounds) + pushl_cfi $do_bounds + jmp error_code + CFI_ENDPROC +-END(bounds) ++ENDPROC(bounds) + + ENTRY(invalid_op) + RING0_INT_FRAME +@@ -936,7 +1185,7 @@ ENTRY(invalid_op) + pushl_cfi $do_invalid_op + jmp error_code + CFI_ENDPROC +-END(invalid_op) ++ENDPROC(invalid_op) + + ENTRY(coprocessor_segment_overrun) + RING0_INT_FRAME +@@ -944,35 +1193,35 @@ ENTRY(coprocessor_segment_overrun) + pushl_cfi $do_coprocessor_segment_overrun + jmp error_code + CFI_ENDPROC +-END(coprocessor_segment_overrun) ++ENDPROC(coprocessor_segment_overrun) + + ENTRY(invalid_TSS) + RING0_EC_FRAME + pushl_cfi $do_invalid_TSS + jmp error_code + CFI_ENDPROC +-END(invalid_TSS) ++ENDPROC(invalid_TSS) + + ENTRY(segment_not_present) + RING0_EC_FRAME + pushl_cfi $do_segment_not_present + jmp error_code + CFI_ENDPROC +-END(segment_not_present) ++ENDPROC(segment_not_present) + + ENTRY(stack_segment) + RING0_EC_FRAME + pushl_cfi $do_stack_segment + jmp error_code + CFI_ENDPROC +-END(stack_segment) ++ENDPROC(stack_segment) + + ENTRY(alignment_check) + RING0_EC_FRAME + pushl_cfi $do_alignment_check + jmp error_code + CFI_ENDPROC +-END(alignment_check) ++ENDPROC(alignment_check) + + ENTRY(divide_error) + RING0_INT_FRAME +@@ -980,7 +1229,7 @@ ENTRY(divide_error) + pushl_cfi $do_divide_error + jmp error_code + CFI_ENDPROC +-END(divide_error) ++ENDPROC(divide_error) + + #ifdef CONFIG_X86_MCE + ENTRY(machine_check) +@@ -989,7 +1238,7 @@ ENTRY(machine_check) + pushl_cfi machine_check_vector + jmp error_code + CFI_ENDPROC +-END(machine_check) ++ENDPROC(machine_check) + #endif + + ENTRY(spurious_interrupt_bug) +@@ -998,7 +1247,7 @@ ENTRY(spurious_interrupt_bug) + pushl_cfi $do_spurious_interrupt_bug + jmp error_code + CFI_ENDPROC +-END(spurious_interrupt_bug) ++ENDPROC(spurious_interrupt_bug) + /* + * End of kprobes section + */ +@@ -1113,7 +1362,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector + + ENTRY(mcount) + ret +-END(mcount) ++ENDPROC(mcount) + + ENTRY(ftrace_caller) + cmpl $0, function_trace_stop +@@ -1142,7 +1391,7 @@ ftrace_graph_call: + .globl ftrace_stub + ftrace_stub: + ret +-END(ftrace_caller) ++ENDPROC(ftrace_caller) + + #else /* ! CONFIG_DYNAMIC_FTRACE */ + +@@ -1178,7 +1427,7 @@ trace: + popl %ecx + popl %eax + jmp ftrace_stub +-END(mcount) ++ENDPROC(mcount) + #endif /* CONFIG_DYNAMIC_FTRACE */ + #endif /* CONFIG_FUNCTION_TRACER */ + +@@ -1199,7 +1448,7 @@ ENTRY(ftrace_graph_caller) + popl %ecx + popl %eax + ret +-END(ftrace_graph_caller) ++ENDPROC(ftrace_graph_caller) + + .globl return_to_handler + return_to_handler: @@ -1213,7 +1462,6 @@ return_to_handler: jmp *%ecx #endif @@ -12277,7 +12200,7 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en #include "syscall_table_32.S" syscall_table_size=(.-sys_call_table) -@@ -1259,9 +1507,12 @@ error_code: +@@ -1259,15 +1507,18 @@ error_code: movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart REG_TO_PTGS %ecx SET_KERNEL_GS %ecx @@ -12291,6 +12214,22 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en TRACE_IRQS_OFF movl %esp,%eax # pt_regs pointer call *%edi + jmp ret_from_exception + CFI_ENDPROC +-END(page_fault) ++ENDPROC(page_fault) + + /* + * Debug traps and NMI can happen at the one SYSENTER instruction +@@ -1309,7 +1560,7 @@ debug_stack_correct: + call do_debug + jmp ret_from_exception + CFI_ENDPROC +-END(debug) ++ENDPROC(debug) + + /* + * NMI is doubly nasty. It can happen _while_ we're handling @@ -1346,6 +1597,9 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer @@ -12301,7 +12240,7 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en jmp restore_all_notrace CFI_ENDPROC -@@ -1382,6 +1636,9 @@ nmi_espfix_stack: +@@ -1382,12 +1636,15 @@ nmi_espfix_stack: FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi @@ -12311,9 +12250,42 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/en RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/entry_64.S ---- linux-3.0.7/arch/x86/kernel/entry_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/entry_64.S 2011-10-11 10:44:33.000000000 -0400 + jmp irq_return + CFI_ENDPROC +-END(nmi) ++ENDPROC(nmi) + + ENTRY(int3) + RING0_INT_FRAME +@@ -1399,14 +1656,14 @@ ENTRY(int3) + call do_int3 + jmp ret_from_exception + CFI_ENDPROC +-END(int3) ++ENDPROC(int3) + + ENTRY(general_protection) + RING0_EC_FRAME + pushl_cfi $do_general_protection + jmp error_code + CFI_ENDPROC +-END(general_protection) ++ENDPROC(general_protection) + + #ifdef CONFIG_KVM_GUEST + ENTRY(async_page_fault) +@@ -1414,7 +1671,7 @@ ENTRY(async_page_fault) + pushl_cfi $do_async_page_fault + jmp error_code + CFI_ENDPROC +-END(async_page_fault) ++ENDPROC(async_page_fault) + #endif + + /* +diff -urNp linux-3.0.8/arch/x86/kernel/entry_64.S linux-3.0.8/arch/x86/kernel/entry_64.S +--- linux-3.0.8/arch/x86/kernel/entry_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/entry_64.S 2011-10-20 04:46:01.000000000 -0400 @@ -53,6 +53,8 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -12323,22 +12295,28 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */ #include <linux/elf-em.h> -@@ -66,6 +68,7 @@ +@@ -66,8 +68,9 @@ #ifdef CONFIG_FUNCTION_TRACER #ifdef CONFIG_DYNAMIC_FTRACE ENTRY(mcount) + pax_force_retaddr retq - END(mcount) +-END(mcount) ++ENDPROC(mcount) -@@ -90,6 +93,7 @@ GLOBAL(ftrace_graph_call) + ENTRY(ftrace_caller) + cmpl $0, function_trace_stop +@@ -90,8 +93,9 @@ GLOBAL(ftrace_graph_call) #endif GLOBAL(ftrace_stub) + pax_force_retaddr retq - END(ftrace_caller) +-END(ftrace_caller) ++ENDPROC(ftrace_caller) + #else /* ! CONFIG_DYNAMIC_FTRACE */ + ENTRY(mcount) @@ -110,6 +114,7 @@ ENTRY(mcount) #endif @@ -12347,7 +12325,7 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en retq trace: -@@ -119,6 +124,7 @@ trace: +@@ -119,12 +124,13 @@ trace: movq 8(%rbp), %rsi subq $MCOUNT_INSN_SIZE, %rdi @@ -12355,14 +12333,24 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en call *ftrace_trace_function MCOUNT_RESTORE_FRAME -@@ -144,6 +150,7 @@ ENTRY(ftrace_graph_caller) + + jmp ftrace_stub +-END(mcount) ++ENDPROC(mcount) + #endif /* CONFIG_DYNAMIC_FTRACE */ + #endif /* CONFIG_FUNCTION_TRACER */ + +@@ -144,8 +150,9 @@ ENTRY(ftrace_graph_caller) MCOUNT_RESTORE_FRAME + pax_force_retaddr retq - END(ftrace_graph_caller) +-END(ftrace_graph_caller) ++ENDPROC(ftrace_graph_caller) + GLOBAL(return_to_handler) + subq $24, %rsp @@ -161,6 +168,7 @@ GLOBAL(return_to_handler) movq 8(%rsp), %rdx movq (%rsp), %rax @@ -12650,23 +12638,31 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en je 1f SWAPGS /* -@@ -338,6 +609,7 @@ ENTRY(save_args) +@@ -338,9 +609,10 @@ ENTRY(save_args) * We entered an interrupt context - irqs are off: */ 2: TRACE_IRQS_OFF + pax_force_retaddr ret CFI_ENDPROC - END(save_args) -@@ -354,6 +626,7 @@ ENTRY(save_rest) +-END(save_args) ++ENDPROC(save_args) + .popsection + + ENTRY(save_rest) +@@ -354,9 +626,10 @@ ENTRY(save_rest) movq_cfi r15, R15+16 movq %r11, 8(%rsp) /* return address */ FIXUP_TOP_OF_STACK %r11, 16 + pax_force_retaddr ret CFI_ENDPROC - END(save_rest) -@@ -385,7 +658,8 @@ ENTRY(save_paranoid) +-END(save_rest) ++ENDPROC(save_rest) + + /* save complete stack frame */ + .pushsection .kprobes.text, "ax" +@@ -385,9 +658,10 @@ ENTRY(save_paranoid) js 1f /* negative -> in kernel */ SWAPGS xorl %ebx,%ebx @@ -12674,8 +12670,11 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en +1: pax_force_retaddr + ret CFI_ENDPROC - END(save_paranoid) +-END(save_paranoid) ++ENDPROC(save_paranoid) .popsection + + /* @@ -409,7 +683,7 @@ ENTRY(ret_from_fork) RESTORE_REST @@ -12685,6 +12684,15 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en je int_ret_from_sys_call testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET +@@ -419,7 +693,7 @@ ENTRY(ret_from_fork) + jmp ret_from_sys_call # go to the SYSRET fastpath + + CFI_ENDPROC +-END(ret_from_fork) ++ENDPROC(ret_from_fork) + + /* + * System call entry. Up to 6 arguments in registers are supported. @@ -455,7 +729,7 @@ END(ret_from_fork) ENTRY(system_call) CFI_STARTPROC simple @@ -12747,14 +12755,63 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en je retint_restore_args movl $_TIF_ALLWORK_MASK,%edi /* edi: mask to check */ -@@ -702,6 +985,7 @@ ENTRY(ptregscall_common) +@@ -668,7 +951,7 @@ int_restore_rest: + TRACE_IRQS_OFF + jmp int_with_check + CFI_ENDPROC +-END(system_call) ++ENDPROC(system_call) + + /* + * Certain special system calls that need to save a complete full stack frame. +@@ -684,7 +967,7 @@ ENTRY(\label) + call \func + jmp ptregscall_common + CFI_ENDPROC +-END(\label) ++ENDPROC(\label) + .endm + + PTREGSCALL stub_clone, sys_clone, %r8 +@@ -702,9 +985,10 @@ ENTRY(ptregscall_common) movq_cfi_restore R12+8, r12 movq_cfi_restore RBP+8, rbp movq_cfi_restore RBX+8, rbx + pax_force_retaddr ret $REST_SKIP /* pop extended registers */ CFI_ENDPROC - END(ptregscall_common) +-END(ptregscall_common) ++ENDPROC(ptregscall_common) + + ENTRY(stub_execve) + CFI_STARTPROC +@@ -719,7 +1003,7 @@ ENTRY(stub_execve) + RESTORE_REST + jmp int_ret_from_sys_call + CFI_ENDPROC +-END(stub_execve) ++ENDPROC(stub_execve) + + /* + * sigreturn is special because it needs to restore all registers on return. +@@ -737,7 +1021,7 @@ ENTRY(stub_rt_sigreturn) + RESTORE_REST + jmp int_ret_from_sys_call + CFI_ENDPROC +-END(stub_rt_sigreturn) ++ENDPROC(stub_rt_sigreturn) + + /* + * Build the entry stubs and pointer table with some assembler magic. +@@ -772,7 +1056,7 @@ vector=vector+1 + 2: jmp common_interrupt + .endr + CFI_ENDPROC +-END(irq_entries_start) ++ENDPROC(irq_entries_start) + + .previous + END(interrupt) @@ -793,6 +1077,16 @@ END(interrupt) CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP call save_args @@ -12798,7 +12855,25 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en /* * The iretq could re-enable interrupts: */ -@@ -1027,6 +1325,16 @@ ENTRY(\sym) +@@ -941,7 +1239,7 @@ ENTRY(retint_kernel) + #endif + + CFI_ENDPROC +-END(common_interrupt) ++ENDPROC(common_interrupt) + /* + * End of kprobes section + */ +@@ -957,7 +1255,7 @@ ENTRY(\sym) + interrupt \do_sym + jmp ret_from_intr + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) + .endm + + #ifdef CONFIG_SMP +@@ -1027,12 +1325,22 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -12815,7 +12890,14 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1044,6 +1352,16 @@ ENTRY(\sym) + jmp error_exit /* %ebx: no swapgs flag */ + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) + .endm + + .macro paranoidzeroentry sym do_sym +@@ -1044,15 +1352,25 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF @@ -12832,8 +12914,10 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1052,7 +1370,7 @@ ENTRY(\sym) - END(\sym) + jmp paranoid_exit /* %ebx: no swapgs flag */ + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) .endm -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8) @@ -12841,7 +12925,7 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en .macro paranoidzeroentry_ist sym do_sym ist ENTRY(\sym) INTR_FRAME -@@ -1062,8 +1380,24 @@ ENTRY(\sym) +@@ -1062,14 +1380,30 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF @@ -12866,7 +12950,14 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist) call \do_sym addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist) -@@ -1080,6 +1414,16 @@ ENTRY(\sym) + jmp paranoid_exit /* %ebx: no swapgs flag */ + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) + .endm + + .macro errorentry sym do_sym +@@ -1080,13 +1414,23 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -12883,7 +12974,15 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1099,6 +1443,16 @@ ENTRY(\sym) + call \do_sym + jmp error_exit /* %ebx: no swapgs flag */ + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) + .endm + + /* error code is on the stack already */ +@@ -1099,13 +1443,23 @@ ENTRY(\sym) call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF @@ -12900,15 +12999,27 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1134,6 +1488,7 @@ gs_change: + call \do_sym + jmp paranoid_exit /* %ebx: no swapgs flag */ + CFI_ENDPROC +-END(\sym) ++ENDPROC(\sym) + .endm + + zeroentry divide_error do_divide_error +@@ -1134,9 +1488,10 @@ gs_change: 2: mfence /* workaround */ SWAPGS popfq_cfi + pax_force_retaddr ret CFI_ENDPROC - END(native_load_gs_index) -@@ -1158,6 +1513,7 @@ ENTRY(kernel_thread_helper) +-END(native_load_gs_index) ++ENDPROC(native_load_gs_index) + + .section __ex_table,"a" + .align 8 +@@ -1158,13 +1513,14 @@ ENTRY(kernel_thread_helper) * Here we are in the child and the registers are set as they were * at kernel_thread() invocation in the parent. */ @@ -12916,6 +13027,14 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en call *%rsi # exit mov %eax, %edi + call do_exit + ud2 # padding for call trace + CFI_ENDPROC +-END(kernel_thread_helper) ++ENDPROC(kernel_thread_helper) + + /* + * execve(). This function needs to use IRET, not SYSRET, to set up all state properly. @@ -1193,9 +1549,10 @@ ENTRY(kernel_execve) je int_ret_from_sys_call RESTORE_ARGS @@ -12940,6 +13059,24 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en #ifdef CONFIG_XEN zeroentry xen_hypervisor_callback xen_do_hypervisor_callback +@@ -1253,7 +1611,7 @@ ENTRY(xen_do_hypervisor_callback) # do + decl PER_CPU_VAR(irq_count) + jmp error_exit + CFI_ENDPROC +-END(xen_do_hypervisor_callback) ++ENDPROC(xen_do_hypervisor_callback) + + /* + * Hypervisor uses this for application faults while it executes. +@@ -1312,7 +1670,7 @@ ENTRY(xen_failsafe_callback) + SAVE_ALL + jmp error_exit + CFI_ENDPROC +-END(xen_failsafe_callback) ++ENDPROC(xen_failsafe_callback) + + apicinterrupt XEN_HVM_EVTCHN_CALLBACK \ + xen_hvm_callback_vector xen_evtchn_do_upcall @@ -1361,16 +1719,31 @@ ENTRY(paranoid_exit) TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ @@ -12973,6 +13110,15 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en jmp irq_return paranoid_userspace: GET_THREAD_INFO(%rcx) +@@ -1399,7 +1772,7 @@ paranoid_schedule: + TRACE_IRQS_OFF + jmp paranoid_userspace + CFI_ENDPROC +-END(paranoid_exit) ++ENDPROC(paranoid_exit) + + /* + * Exception entry point. This expects an error code/orig_rax on the stack. @@ -1426,12 +1799,13 @@ ENTRY(error_entry) movq_cfi r14, R14+8 movq_cfi r15, R15+8 @@ -12988,6 +13134,24 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en ret /* +@@ -1458,7 +1832,7 @@ bstep_iret: + movq %rcx,RIP+8(%rsp) + jmp error_swapgs + CFI_ENDPROC +-END(error_entry) ++ENDPROC(error_entry) + + + /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */ +@@ -1478,7 +1852,7 @@ ENTRY(error_exit) + jnz retint_careful + jmp retint_swapgs + CFI_ENDPROC +-END(error_exit) ++ENDPROC(error_exit) + + + /* runs on exception stack */ @@ -1490,6 +1864,16 @@ ENTRY(nmi) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid @@ -13035,9 +13199,26 @@ diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/en jmp irq_return nmi_userspace: GET_THREAD_INFO(%rcx) -diff -urNp linux-3.0.7/arch/x86/kernel/ftrace.c linux-3.0.7/arch/x86/kernel/ftrace.c ---- linux-3.0.7/arch/x86/kernel/ftrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/ftrace.c 2011-08-23 21:47:55.000000000 -0400 +@@ -1534,14 +1934,14 @@ nmi_schedule: + jmp paranoid_exit + CFI_ENDPROC + #endif +-END(nmi) ++ENDPROC(nmi) + + ENTRY(ignore_sysret) + CFI_STARTPROC + mov $-ENOSYS,%eax + sysret + CFI_ENDPROC +-END(ignore_sysret) ++ENDPROC(ignore_sysret) + + /* + * End of kprobes section +diff -urNp linux-3.0.8/arch/x86/kernel/ftrace.c linux-3.0.8/arch/x86/kernel/ftrace.c +--- linux-3.0.8/arch/x86/kernel/ftrace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/ftrace.c 2011-08-23 21:47:55.000000000 -0400 @@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the static const void *mod_code_newcode; /* holds the text to write to the IP */ @@ -13095,9 +13276,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/ftrace.c linux-3.0.7/arch/x86/kernel/ftra if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-3.0.7/arch/x86/kernel/head32.c linux-3.0.7/arch/x86/kernel/head32.c ---- linux-3.0.7/arch/x86/kernel/head32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/head32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/head32.c linux-3.0.8/arch/x86/kernel/head32.c +--- linux-3.0.8/arch/x86/kernel/head32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/head32.c 2011-08-23 21:47:55.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/io_apic.h> #include <asm/bios_ebda.h> @@ -13115,9 +13296,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/head32.c linux-3.0.7/arch/x86/kernel/head #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-3.0.7/arch/x86/kernel/head_32.S linux-3.0.7/arch/x86/kernel/head_32.S ---- linux-3.0.7/arch/x86/kernel/head_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/head_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/head_32.S linux-3.0.8/arch/x86/kernel/head_32.S +--- linux-3.0.8/arch/x86/kernel/head_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/head_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -13552,9 +13733,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/head_32.S linux-3.0.7/arch/x86/kernel/hea + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-3.0.7/arch/x86/kernel/head_64.S linux-3.0.7/arch/x86/kernel/head_64.S ---- linux-3.0.7/arch/x86/kernel/head_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/head_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/head_64.S linux-3.0.8/arch/x86/kernel/head_64.S +--- linux-3.0.8/arch/x86/kernel/head_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/head_64.S 2011-08-23 21:47:55.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -13824,9 +14005,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/head_64.S linux-3.0.7/arch/x86/kernel/hea __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c ---- linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c +--- linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -13848,9 +14029,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c linux-3.0.7/arch/x86/kern +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-3.0.7/arch/x86/kernel/i8259.c linux-3.0.7/arch/x86/kernel/i8259.c ---- linux-3.0.7/arch/x86/kernel/i8259.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/i8259.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/i8259.c linux-3.0.8/arch/x86/kernel/i8259.c +--- linux-3.0.8/arch/x86/kernel/i8259.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/i8259.c 2011-08-23 21:47:55.000000000 -0400 @@ -210,7 +210,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; @@ -13860,9 +14041,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/i8259.c linux-3.0.7/arch/x86/kernel/i8259 /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is -diff -urNp linux-3.0.7/arch/x86/kernel/init_task.c linux-3.0.7/arch/x86/kernel/init_task.c ---- linux-3.0.7/arch/x86/kernel/init_task.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/init_task.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/init_task.c linux-3.0.8/arch/x86/kernel/init_task.c +--- linux-3.0.8/arch/x86/kernel/init_task.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/init_task.c 2011-08-23 21:47:55.000000000 -0400 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -13881,9 +14062,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/init_task.c linux-3.0.7/arch/x86/kernel/i - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-3.0.7/arch/x86/kernel/ioport.c linux-3.0.7/arch/x86/kernel/ioport.c ---- linux-3.0.7/arch/x86/kernel/ioport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/ioport.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/ioport.c linux-3.0.8/arch/x86/kernel/ioport.c +--- linux-3.0.8/arch/x86/kernel/ioport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/ioport.c 2011-08-23 21:48:14.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -13927,46 +14108,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/ioport.c linux-3.0.7/arch/x86/kernel/iopo if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-3.0.7/arch/x86/kernel/irq.c linux-3.0.7/arch/x86/kernel/irq.c ---- linux-3.0.7/arch/x86/kernel/irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/irq.c 2011-08-23 21:47:55.000000000 -0400 -@@ -17,7 +17,7 @@ - #include <asm/mce.h> - #include <asm/hw_irq.h> - --atomic_t irq_err_count; -+atomic_unchecked_t irq_err_count; - - /* Function pointer for generic interrupt vector handling */ - void (*x86_platform_ipi_callback)(void) = NULL; -@@ -116,9 +116,9 @@ int arch_show_interrupts(struct seq_file - seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); - seq_printf(p, " Machine check polls\n"); - #endif -- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); -+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count)); - #if defined(CONFIG_X86_IO_APIC) -- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count)); -+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count)); - #endif - return 0; - } -@@ -158,10 +158,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) - - u64 arch_irq_stat(void) - { -- u64 sum = atomic_read(&irq_err_count); -+ u64 sum = atomic_read_unchecked(&irq_err_count); - - #ifdef CONFIG_X86_IO_APIC -- sum += atomic_read(&irq_mis_count); -+ sum += atomic_read_unchecked(&irq_mis_count); - #endif - return sum; - } -diff -urNp linux-3.0.7/arch/x86/kernel/irq_32.c linux-3.0.7/arch/x86/kernel/irq_32.c ---- linux-3.0.7/arch/x86/kernel/irq_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/irq_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/irq_32.c linux-3.0.8/arch/x86/kernel/irq_32.c +--- linux-3.0.8/arch/x86/kernel/irq_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/irq_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=r" (sp) : "0" (THREAD_SIZE - 1)); @@ -14106,9 +14250,46 @@ diff -urNp linux-3.0.7/arch/x86/kernel/irq_32.c linux-3.0.7/arch/x86/kernel/irq_ /* * Shouldn't happen, we returned above if in_interrupt(): */ -diff -urNp linux-3.0.7/arch/x86/kernel/kgdb.c linux-3.0.7/arch/x86/kernel/kgdb.c ---- linux-3.0.7/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/irq.c linux-3.0.8/arch/x86/kernel/irq.c +--- linux-3.0.8/arch/x86/kernel/irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/irq.c 2011-08-23 21:47:55.000000000 -0400 +@@ -17,7 +17,7 @@ + #include <asm/mce.h> + #include <asm/hw_irq.h> + +-atomic_t irq_err_count; ++atomic_unchecked_t irq_err_count; + + /* Function pointer for generic interrupt vector handling */ + void (*x86_platform_ipi_callback)(void) = NULL; +@@ -116,9 +116,9 @@ int arch_show_interrupts(struct seq_file + seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); + seq_printf(p, " Machine check polls\n"); + #endif +- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); ++ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count)); + #if defined(CONFIG_X86_IO_APIC) +- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count)); ++ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count)); + #endif + return 0; + } +@@ -158,10 +158,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) + + u64 arch_irq_stat(void) + { +- u64 sum = atomic_read(&irq_err_count); ++ u64 sum = atomic_read_unchecked(&irq_err_count); + + #ifdef CONFIG_X86_IO_APIC +- sum += atomic_read(&irq_mis_count); ++ sum += atomic_read_unchecked(&irq_mis_count); + #endif + return sum; + } +diff -urNp linux-3.0.8/arch/x86/kernel/kgdb.c linux-3.0.8/arch/x86/kernel/kgdb.c +--- linux-3.0.8/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, #ifdef CONFIG_X86_32 switch (regno) { @@ -14147,9 +14328,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/kgdb.c linux-3.0.7/arch/x86/kernel/kgdb.c if (user_mode(regs)) return single_step_cont(regs, args); break; -diff -urNp linux-3.0.7/arch/x86/kernel/kprobes.c linux-3.0.7/arch/x86/kernel/kprobes.c ---- linux-3.0.7/arch/x86/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/kprobes.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kprobes.c +--- linux-3.0.8/arch/x86/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/kprobes.c 2011-10-11 10:44:33.000000000 -0400 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat } __attribute__((packed)) *insn; @@ -14293,9 +14474,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/kprobes.c linux-3.0.7/arch/x86/kernel/kpr RELATIVE_ADDR_SIZE); insn_buf[0] = RELATIVEJUMP_OPCODE; -diff -urNp linux-3.0.7/arch/x86/kernel/kvm.c linux-3.0.7/arch/x86/kernel/kvm.c ---- linux-3.0.7/arch/x86/kernel/kvm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/kvm.c 2011-08-24 18:10:12.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/kvm.c linux-3.0.8/arch/x86/kernel/kvm.c +--- linux-3.0.8/arch/x86/kernel/kvm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/kvm.c 2011-08-24 18:10:12.000000000 -0400 @@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo pv_mmu_ops.set_pud = kvm_set_pud; #if PAGETABLE_LEVELS == 4 @@ -14304,9 +14485,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/kvm.c linux-3.0.7/arch/x86/kernel/kvm.c #endif #endif pv_mmu_ops.flush_tlb_user = kvm_flush_tlb; -diff -urNp linux-3.0.7/arch/x86/kernel/ldt.c linux-3.0.7/arch/x86/kernel/ldt.c ---- linux-3.0.7/arch/x86/kernel/ldt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/ldt.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/ldt.c linux-3.0.8/arch/x86/kernel/ldt.c +--- linux-3.0.8/arch/x86/kernel/ldt.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/ldt.c 2011-08-23 21:47:55.000000000 -0400 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -14371,9 +14552,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/ldt.c linux-3.0.7/arch/x86/kernel/ldt.c fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-3.0.7/arch/x86/kernel/machine_kexec_32.c linux-3.0.7/arch/x86/kernel/machine_kexec_32.c ---- linux-3.0.7/arch/x86/kernel/machine_kexec_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/machine_kexec_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/machine_kexec_32.c linux-3.0.8/arch/x86/kernel/machine_kexec_32.c +--- linux-3.0.8/arch/x86/kernel/machine_kexec_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/machine_kexec_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -27,7 +27,7 @@ #include <asm/cacheflush.h> #include <asm/debugreg.h> @@ -14401,9 +14582,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/machine_kexec_32.c linux-3.0.7/arch/x86/k relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-3.0.7/arch/x86/kernel/microcode_intel.c linux-3.0.7/arch/x86/kernel/microcode_intel.c ---- linux-3.0.7/arch/x86/kernel/microcode_intel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/microcode_intel.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/microcode_intel.c linux-3.0.8/arch/x86/kernel/microcode_intel.c +--- linux-3.0.8/arch/x86/kernel/microcode_intel.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/microcode_intel.c 2011-10-06 04:17:55.000000000 -0400 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -14420,9 +14601,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/microcode_intel.c linux-3.0.7/arch/x86/ke } static void microcode_fini_cpu(int cpu) -diff -urNp linux-3.0.7/arch/x86/kernel/module.c linux-3.0.7/arch/x86/kernel/module.c ---- linux-3.0.7/arch/x86/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/module.c linux-3.0.8/arch/x86/kernel/module.c +--- linux-3.0.8/arch/x86/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 @@ -36,21 +36,66 @@ #define DEBUGP(fmt...) #endif @@ -14561,21 +14742,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/module.c linux-3.0.7/arch/x86/kernel/modu #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c ---- linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c 2011-08-23 21:47:55.000000000 -0400 -@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t - arch_spin_lock(lock); - } - --struct pv_lock_ops pv_lock_ops = { -+struct pv_lock_ops pv_lock_ops __read_only = { - #ifdef CONFIG_SMP - .spin_is_locked = __ticket_spin_is_locked, - .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-3.0.7/arch/x86/kernel/paravirt.c linux-3.0.7/arch/x86/kernel/paravirt.c ---- linux-3.0.7/arch/x86/kernel/paravirt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/paravirt.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/paravirt.c linux-3.0.8/arch/x86/kernel/paravirt.c +--- linux-3.0.8/arch/x86/kernel/paravirt.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/paravirt.c 2011-08-23 21:48:14.000000000 -0400 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x) { return x; @@ -14724,9 +14893,21 @@ diff -urNp linux-3.0.7/arch/x86/kernel/paravirt.c linux-3.0.7/arch/x86/kernel/pa }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-3.0.7/arch/x86/kernel/pci-iommu_table.c linux-3.0.7/arch/x86/kernel/pci-iommu_table.c ---- linux-3.0.7/arch/x86/kernel/pci-iommu_table.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/pci-iommu_table.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c +--- linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c 2011-08-23 21:47:55.000000000 -0400 +@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t + arch_spin_lock(lock); + } + +-struct pv_lock_ops pv_lock_ops = { ++struct pv_lock_ops pv_lock_ops __read_only = { + #ifdef CONFIG_SMP + .spin_is_locked = __ticket_spin_is_locked, + .spin_is_contended = __ticket_spin_is_contended, +diff -urNp linux-3.0.8/arch/x86/kernel/pci-iommu_table.c linux-3.0.8/arch/x86/kernel/pci-iommu_table.c +--- linux-3.0.8/arch/x86/kernel/pci-iommu_table.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/pci-iommu_table.c 2011-08-23 21:48:14.000000000 -0400 @@ -2,7 +2,7 @@ #include <asm/iommu_table.h> #include <linux/string.h> @@ -14745,149 +14926,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/pci-iommu_table.c linux-3.0.7/arch/x86/ke /* Simple cyclic dependency checker. */ for (p = start; p < finish; p++) { q = find_dependents_of(start, finish, p); -diff -urNp linux-3.0.7/arch/x86/kernel/process.c linux-3.0.7/arch/x86/kernel/process.c ---- linux-3.0.7/arch/x86/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/process.c 2011-08-30 18:23:52.000000000 -0400 -@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru - - void free_thread_info(struct thread_info *ti) - { -- free_thread_xstate(ti->task); - free_pages((unsigned long)ti, get_order(THREAD_SIZE)); - } - -+static struct kmem_cache *task_struct_cachep; -+ - void arch_task_cache_init(void) - { -- task_xstate_cachep = -- kmem_cache_create("task_xstate", xstate_size, -+ /* create a slab on which task_structs can be allocated */ -+ task_struct_cachep = -+ kmem_cache_create("task_struct", sizeof(struct task_struct), -+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); -+ -+ task_xstate_cachep = -+ kmem_cache_create("task_xstate", xstate_size, - __alignof__(union thread_xstate), -- SLAB_PANIC | SLAB_NOTRACK, NULL); -+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); -+} -+ -+struct task_struct *alloc_task_struct_node(int node) -+{ -+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node); -+} -+ -+void free_task_struct(struct task_struct *task) -+{ -+ free_thread_xstate(task); -+ kmem_cache_free(task_struct_cachep, task); - } - - /* -@@ -70,7 +87,7 @@ void exit_thread(void) - unsigned long *bp = t->io_bitmap_ptr; - - if (bp) { -- struct tss_struct *tss = &per_cpu(init_tss, get_cpu()); -+ struct tss_struct *tss = init_tss + get_cpu(); - - t->io_bitmap_ptr = NULL; - clear_thread_flag(TIF_IO_BITMAP); -@@ -106,7 +123,7 @@ void show_regs_common(void) - - printk(KERN_CONT "\n"); - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s", -- current->pid, current->comm, print_tainted(), -+ task_pid_nr(current), current->comm, print_tainted(), - init_utsname()->release, - (int)strcspn(init_utsname()->version, " "), - init_utsname()->version); -@@ -120,6 +137,9 @@ void flush_thread(void) - { - struct task_struct *tsk = current; - -+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF) -+ loadsegment(gs, 0); -+#endif - flush_ptrace_hw_breakpoint(tsk); - memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); - /* -@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), voi - regs.di = (unsigned long) arg; - - #ifdef CONFIG_X86_32 -- regs.ds = __USER_DS; -- regs.es = __USER_DS; -+ regs.ds = __KERNEL_DS; -+ regs.es = __KERNEL_DS; - regs.fs = __KERNEL_PERCPU; -- regs.gs = __KERNEL_STACK_CANARY; -+ savesegment(gs, regs.gs); - #else - regs.ss = __KERNEL_DS; - #endif -@@ -403,7 +423,7 @@ void default_idle(void) - EXPORT_SYMBOL(default_idle); - #endif - --void stop_this_cpu(void *dummy) -+__noreturn void stop_this_cpu(void *dummy) - { - local_irq_disable(); - /* -@@ -668,16 +688,37 @@ static int __init idle_setup(char *str) - } - early_param("idle", idle_setup); - --unsigned long arch_align_stack(unsigned long sp) -+#ifdef CONFIG_PAX_RANDKSTACK -+void pax_randomize_kstack(struct pt_regs *regs) - { -- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} -+ struct thread_struct *thread = ¤t->thread; -+ unsigned long time; - --unsigned long arch_randomize_brk(struct mm_struct *mm) --{ -- unsigned long range_end = mm->brk + 0x02000000; -- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; --} -+ if (!randomize_va_space) -+ return; -+ -+ if (v8086_mode(regs)) -+ return; - -+ rdtscl(time); -+ -+ /* P4 seems to return a 0 LSB, ignore it */ -+#ifdef CONFIG_MPENTIUM4 -+ time &= 0x3EUL; -+ time <<= 2; -+#elif defined(CONFIG_X86_64) -+ time &= 0xFUL; -+ time <<= 4; -+#else -+ time &= 0x1FUL; -+ time <<= 3; -+#endif -+ -+ thread->sp0 ^= time; -+ load_sp0(init_tss + smp_processor_id(), thread); -+ -+#ifdef CONFIG_X86_64 -+ percpu_write(kernel_stack, thread->sp0); -+#endif -+} -+#endif -diff -urNp linux-3.0.7/arch/x86/kernel/process_32.c linux-3.0.7/arch/x86/kernel/process_32.c ---- linux-3.0.7/arch/x86/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/process_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/process_32.c linux-3.0.8/arch/x86/kernel/process_32.c +--- linux-3.0.8/arch/x86/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/process_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -14974,9 +15015,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/process_32.c linux-3.0.7/arch/x86/kernel/ return 0; } - -diff -urNp linux-3.0.7/arch/x86/kernel/process_64.c linux-3.0.7/arch/x86/kernel/process_64.c ---- linux-3.0.7/arch/x86/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/process_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/process_64.c linux-3.0.8/arch/x86/kernel/process_64.c +--- linux-3.0.8/arch/x86/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/process_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -15041,9 +15082,149 @@ diff -urNp linux-3.0.7/arch/x86/kernel/process_64.c linux-3.0.7/arch/x86/kernel/ return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-3.0.7/arch/x86/kernel/ptrace.c linux-3.0.7/arch/x86/kernel/ptrace.c ---- linux-3.0.7/arch/x86/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/ptrace.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/process.c linux-3.0.8/arch/x86/kernel/process.c +--- linux-3.0.8/arch/x86/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/process.c 2011-08-30 18:23:52.000000000 -0400 +@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru + + void free_thread_info(struct thread_info *ti) + { +- free_thread_xstate(ti->task); + free_pages((unsigned long)ti, get_order(THREAD_SIZE)); + } + ++static struct kmem_cache *task_struct_cachep; ++ + void arch_task_cache_init(void) + { +- task_xstate_cachep = +- kmem_cache_create("task_xstate", xstate_size, ++ /* create a slab on which task_structs can be allocated */ ++ task_struct_cachep = ++ kmem_cache_create("task_struct", sizeof(struct task_struct), ++ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); ++ ++ task_xstate_cachep = ++ kmem_cache_create("task_xstate", xstate_size, + __alignof__(union thread_xstate), +- SLAB_PANIC | SLAB_NOTRACK, NULL); ++ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); ++} ++ ++struct task_struct *alloc_task_struct_node(int node) ++{ ++ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node); ++} ++ ++void free_task_struct(struct task_struct *task) ++{ ++ free_thread_xstate(task); ++ kmem_cache_free(task_struct_cachep, task); + } + + /* +@@ -70,7 +87,7 @@ void exit_thread(void) + unsigned long *bp = t->io_bitmap_ptr; + + if (bp) { +- struct tss_struct *tss = &per_cpu(init_tss, get_cpu()); ++ struct tss_struct *tss = init_tss + get_cpu(); + + t->io_bitmap_ptr = NULL; + clear_thread_flag(TIF_IO_BITMAP); +@@ -106,7 +123,7 @@ void show_regs_common(void) + + printk(KERN_CONT "\n"); + printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s", +- current->pid, current->comm, print_tainted(), ++ task_pid_nr(current), current->comm, print_tainted(), + init_utsname()->release, + (int)strcspn(init_utsname()->version, " "), + init_utsname()->version); +@@ -120,6 +137,9 @@ void flush_thread(void) + { + struct task_struct *tsk = current; + ++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF) ++ loadsegment(gs, 0); ++#endif + flush_ptrace_hw_breakpoint(tsk); + memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); + /* +@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), voi + regs.di = (unsigned long) arg; + + #ifdef CONFIG_X86_32 +- regs.ds = __USER_DS; +- regs.es = __USER_DS; ++ regs.ds = __KERNEL_DS; ++ regs.es = __KERNEL_DS; + regs.fs = __KERNEL_PERCPU; +- regs.gs = __KERNEL_STACK_CANARY; ++ savesegment(gs, regs.gs); + #else + regs.ss = __KERNEL_DS; + #endif +@@ -403,7 +423,7 @@ void default_idle(void) + EXPORT_SYMBOL(default_idle); + #endif + +-void stop_this_cpu(void *dummy) ++__noreturn void stop_this_cpu(void *dummy) + { + local_irq_disable(); + /* +@@ -668,16 +688,37 @@ static int __init idle_setup(char *str) + } + early_param("idle", idle_setup); + +-unsigned long arch_align_stack(unsigned long sp) ++#ifdef CONFIG_PAX_RANDKSTACK ++void pax_randomize_kstack(struct pt_regs *regs) + { +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -= get_random_int() % 8192; +- return sp & ~0xf; +-} ++ struct thread_struct *thread = ¤t->thread; ++ unsigned long time; + +-unsigned long arch_randomize_brk(struct mm_struct *mm) +-{ +- unsigned long range_end = mm->brk + 0x02000000; +- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; +-} ++ if (!randomize_va_space) ++ return; ++ ++ if (v8086_mode(regs)) ++ return; + ++ rdtscl(time); ++ ++ /* P4 seems to return a 0 LSB, ignore it */ ++#ifdef CONFIG_MPENTIUM4 ++ time &= 0x3EUL; ++ time <<= 2; ++#elif defined(CONFIG_X86_64) ++ time &= 0xFUL; ++ time <<= 4; ++#else ++ time &= 0x1FUL; ++ time <<= 3; ++#endif ++ ++ thread->sp0 ^= time; ++ load_sp0(init_tss + smp_processor_id(), thread); ++ ++#ifdef CONFIG_X86_64 ++ percpu_write(kernel_stack, thread->sp0); ++#endif ++} ++#endif +diff -urNp linux-3.0.8/arch/x86/kernel/ptrace.c linux-3.0.8/arch/x86/kernel/ptrace.c +--- linux-3.0.8/arch/x86/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/ptrace.c 2011-08-23 21:47:55.000000000 -0400 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi unsigned long addr, unsigned long data) { @@ -15079,9 +15260,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/ptrace.c linux-3.0.7/arch/x86/kernel/ptra } void user_single_step_siginfo(struct task_struct *tsk, -diff -urNp linux-3.0.7/arch/x86/kernel/pvclock.c linux-3.0.7/arch/x86/kernel/pvclock.c ---- linux-3.0.7/arch/x86/kernel/pvclock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/pvclock.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/pvclock.c linux-3.0.8/arch/x86/kernel/pvclock.c +--- linux-3.0.8/arch/x86/kernel/pvclock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/pvclock.c 2011-08-23 21:47:55.000000000 -0400 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc return pv_tsc_khz; } @@ -15110,9 +15291,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/pvclock.c linux-3.0.7/arch/x86/kernel/pvc } while (unlikely(last != ret)); return ret; -diff -urNp linux-3.0.7/arch/x86/kernel/reboot.c linux-3.0.7/arch/x86/kernel/reboot.c ---- linux-3.0.7/arch/x86/kernel/reboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/reboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/reboot.c linux-3.0.8/arch/x86/kernel/reboot.c +--- linux-3.0.8/arch/x86/kernel/reboot.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/reboot.c 2011-08-23 21:47:55.000000000 -0400 @@ -35,7 +35,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -15244,9 +15425,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/reboot.c linux-3.0.7/arch/x86/kernel/rebo } struct machine_ops machine_ops = { -diff -urNp linux-3.0.7/arch/x86/kernel/setup.c linux-3.0.7/arch/x86/kernel/setup.c ---- linux-3.0.7/arch/x86/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/setup.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/setup.c linux-3.0.8/arch/x86/kernel/setup.c +--- linux-3.0.8/arch/x86/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/setup.c 2011-10-06 04:17:55.000000000 -0400 @@ -447,7 +447,7 @@ static void __init parse_setup_data(void switch (data->type) { @@ -15285,9 +15466,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/setup.c linux-3.0.7/arch/x86/kernel/setup 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-3.0.7/arch/x86/kernel/setup_percpu.c linux-3.0.7/arch/x86/kernel/setup_percpu.c ---- linux-3.0.7/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/setup_percpu.c linux-3.0.8/arch/x86/kernel/setup_percpu.c +--- linux-3.0.8/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400 @@ -21,19 +21,17 @@ #include <asm/cpu.h> #include <asm/stackprotector.h> @@ -15351,9 +15532,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/setup_percpu.c linux-3.0.7/arch/x86/kerne /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. -diff -urNp linux-3.0.7/arch/x86/kernel/signal.c linux-3.0.7/arch/x86/kernel/signal.c ---- linux-3.0.7/arch/x86/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/signal.c linux-3.0.8/arch/x86/kernel/signal.c +--- linux-3.0.8/arch/x86/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 @@ -198,7 +198,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. @@ -15437,9 +15618,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/signal.c linux-3.0.7/arch/x86/kernel/sign return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-3.0.7/arch/x86/kernel/smpboot.c linux-3.0.7/arch/x86/kernel/smpboot.c ---- linux-3.0.7/arch/x86/kernel/smpboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/smpboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/smpboot.c linux-3.0.8/arch/x86/kernel/smpboot.c +--- linux-3.0.8/arch/x86/kernel/smpboot.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/smpboot.c 2011-08-23 21:47:55.000000000 -0400 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api set_idle_for_cpu(cpu, c_idle.idle); do_rest: @@ -15477,9 +15658,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/smpboot.c linux-3.0.7/arch/x86/kernel/smp err = do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); -diff -urNp linux-3.0.7/arch/x86/kernel/step.c linux-3.0.7/arch/x86/kernel/step.c ---- linux-3.0.7/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/step.c linux-3.0.8/arch/x86/kernel/step.c +--- linux-3.0.8/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -15522,9 +15703,17 @@ diff -urNp linux-3.0.7/arch/x86/kernel/step.c linux-3.0.7/arch/x86/kernel/step.c /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-3.0.7/arch/x86/kernel/sys_i386_32.c linux-3.0.7/arch/x86/kernel/sys_i386_32.c ---- linux-3.0.7/arch/x86/kernel/sys_i386_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/sys_i386_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/syscall_table_32.S linux-3.0.8/arch/x86/kernel/syscall_table_32.S +--- linux-3.0.8/arch/x86/kernel/syscall_table_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/syscall_table_32.S 2011-08-23 21:47:55.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-3.0.8/arch/x86/kernel/sys_i386_32.c linux-3.0.8/arch/x86/kernel/sys_i386_32.c +--- linux-3.0.8/arch/x86/kernel/sys_i386_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/sys_i386_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -24,17 +24,224 @@ #include <asm/syscalls.h> @@ -15762,9 +15951,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/sys_i386_32.c linux-3.0.7/arch/x86/kernel + + return addr; } -diff -urNp linux-3.0.7/arch/x86/kernel/sys_x86_64.c linux-3.0.7/arch/x86/kernel/sys_x86_64.c ---- linux-3.0.7/arch/x86/kernel/sys_x86_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/sys_x86_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/sys_x86_64.c linux-3.0.8/arch/x86/kernel/sys_x86_64.c +--- linux-3.0.8/arch/x86/kernel/sys_x86_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/sys_x86_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -15902,17 +16091,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/sys_x86_64.c linux-3.0.7/arch/x86/kernel/ mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-3.0.7/arch/x86/kernel/syscall_table_32.S linux-3.0.7/arch/x86/kernel/syscall_table_32.S ---- linux-3.0.7/arch/x86/kernel/syscall_table_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/syscall_table_32.S 2011-08-23 21:47:55.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-3.0.7/arch/x86/kernel/tboot.c linux-3.0.7/arch/x86/kernel/tboot.c ---- linux-3.0.7/arch/x86/kernel/tboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/tboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/tboot.c linux-3.0.8/arch/x86/kernel/tboot.c +--- linux-3.0.8/arch/x86/kernel/tboot.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/tboot.c 2011-08-23 21:47:55.000000000 -0400 @@ -217,7 +217,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) @@ -15961,9 +16142,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/tboot.c linux-3.0.7/arch/x86/kernel/tboot register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } -diff -urNp linux-3.0.7/arch/x86/kernel/time.c linux-3.0.7/arch/x86/kernel/time.c ---- linux-3.0.7/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/time.c linux-3.0.8/arch/x86/kernel/time.c +--- linux-3.0.8/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs { unsigned long pc = instruction_pointer(regs); @@ -15994,9 +16175,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/time.c linux-3.0.7/arch/x86/kernel/time.c } return pc; } -diff -urNp linux-3.0.7/arch/x86/kernel/tls.c linux-3.0.7/arch/x86/kernel/tls.c ---- linux-3.0.7/arch/x86/kernel/tls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/tls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/tls.c linux-3.0.8/arch/x86/kernel/tls.c +--- linux-3.0.8/arch/x86/kernel/tls.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/tls.c 2011-08-23 21:47:55.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; @@ -16009,9 +16190,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/tls.c linux-3.0.7/arch/x86/kernel/tls.c set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-3.0.7/arch/x86/kernel/trampoline_32.S linux-3.0.7/arch/x86/kernel/trampoline_32.S ---- linux-3.0.7/arch/x86/kernel/trampoline_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/trampoline_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/trampoline_32.S linux-3.0.8/arch/x86/kernel/trampoline_32.S +--- linux-3.0.8/arch/x86/kernel/trampoline_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/trampoline_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -16034,9 +16215,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/trampoline_32.S linux-3.0.7/arch/x86/kern # 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-3.0.7/arch/x86/kernel/trampoline_64.S linux-3.0.7/arch/x86/kernel/trampoline_64.S ---- linux-3.0.7/arch/x86/kernel/trampoline_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/trampoline_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/trampoline_64.S linux-3.0.8/arch/x86/kernel/trampoline_64.S +--- linux-3.0.8/arch/x86/kernel/trampoline_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/trampoline_64.S 2011-08-23 21:47:55.000000000 -0400 @@ -90,7 +90,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -16055,9 +16236,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/trampoline_64.S linux-3.0.7/arch/x86/kern .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-3.0.7/arch/x86/kernel/traps.c linux-3.0.7/arch/x86/kernel/traps.c ---- linux-3.0.7/arch/x86/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/traps.c linux-3.0.8/arch/x86/kernel/traps.c +--- linux-3.0.8/arch/x86/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 @@ -70,12 +70,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -16237,9 +16418,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/traps.c linux-3.0.7/arch/x86/kernel/traps if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-3.0.7/arch/x86/kernel/verify_cpu.S linux-3.0.7/arch/x86/kernel/verify_cpu.S ---- linux-3.0.7/arch/x86/kernel/verify_cpu.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/verify_cpu.S 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/verify_cpu.S linux-3.0.8/arch/x86/kernel/verify_cpu.S +--- linux-3.0.8/arch/x86/kernel/verify_cpu.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/verify_cpu.S 2011-08-23 21:48:14.000000000 -0400 @@ -20,6 +20,7 @@ * arch/x86/boot/compressed/head_64.S: Boot cpu verification * arch/x86/kernel/trampoline_64.S: secondary processor verification @@ -16248,9 +16429,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/verify_cpu.S linux-3.0.7/arch/x86/kernel/ * * verify_cpu, returns the status of longmode and SSE in register %eax. * 0: Success 1: Failure -diff -urNp linux-3.0.7/arch/x86/kernel/vm86_32.c linux-3.0.7/arch/x86/kernel/vm86_32.c ---- linux-3.0.7/arch/x86/kernel/vm86_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/vm86_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/vm86_32.c linux-3.0.8/arch/x86/kernel/vm86_32.c +--- linux-3.0.8/arch/x86/kernel/vm86_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/vm86_32.c 2011-08-23 21:48:14.000000000 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -16315,9 +16496,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/vm86_32.c linux-3.0.7/arch/x86/kernel/vm8 if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-3.0.7/arch/x86/kernel/vmlinux.lds.S linux-3.0.7/arch/x86/kernel/vmlinux.lds.S ---- linux-3.0.7/arch/x86/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/vmlinux.lds.S linux-3.0.8/arch/x86/kernel/vmlinux.lds.S +--- linux-3.0.8/arch/x86/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 @@ -26,6 +26,13 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -16580,9 +16761,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/vmlinux.lds.S linux-3.0.7/arch/x86/kernel "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-3.0.7/arch/x86/kernel/vsyscall_64.c linux-3.0.7/arch/x86/kernel/vsyscall_64.c ---- linux-3.0.7/arch/x86/kernel/vsyscall_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/vsyscall_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/vsyscall_64.c linux-3.0.8/arch/x86/kernel/vsyscall_64.c +--- linux-3.0.8/arch/x86/kernel/vsyscall_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/vsyscall_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode); DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = { @@ -16601,9 +16782,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/vsyscall_64.c linux-3.0.7/arch/x86/kernel .proc_handler = proc_dointvec }, {} }; -diff -urNp linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c ---- linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c +--- linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c 2011-08-23 21:47:55.000000000 -0400 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); @@ -16613,9 +16794,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.7/arch/x86/ker EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); -diff -urNp linux-3.0.7/arch/x86/kernel/xsave.c linux-3.0.7/arch/x86/kernel/xsave.c ---- linux-3.0.7/arch/x86/kernel/xsave.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kernel/xsave.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kernel/xsave.c linux-3.0.8/arch/x86/kernel/xsave.c +--- linux-3.0.8/arch/x86/kernel/xsave.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kernel/xsave.c 2011-10-06 04:17:55.000000000 -0400 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; @@ -16643,9 +16824,9 @@ diff -urNp linux-3.0.7/arch/x86/kernel/xsave.c linux-3.0.7/arch/x86/kernel/xsave buf); if (unlikely(err)) { /* -diff -urNp linux-3.0.7/arch/x86/kvm/emulate.c linux-3.0.7/arch/x86/kvm/emulate.c ---- linux-3.0.7/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/emulate.c linux-3.0.8/arch/x86/kvm/emulate.c +--- linux-3.0.8/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400 @@ -96,7 +96,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) @@ -16680,9 +16861,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/emulate.c linux-3.0.7/arch/x86/kvm/emulate.c switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ -diff -urNp linux-3.0.7/arch/x86/kvm/lapic.c linux-3.0.7/arch/x86/kvm/lapic.c ---- linux-3.0.7/arch/x86/kvm/lapic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/lapic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/lapic.c linux-3.0.8/arch/x86/kvm/lapic.c +--- linux-3.0.8/arch/x86/kvm/lapic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/lapic.c 2011-08-23 21:47:55.000000000 -0400 @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -16692,9 +16873,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/lapic.c linux-3.0.7/arch/x86/kvm/lapic.c #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-3.0.7/arch/x86/kvm/mmu.c linux-3.0.7/arch/x86/kvm/mmu.c ---- linux-3.0.7/arch/x86/kvm/mmu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/mmu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/mmu.c linux-3.0.8/arch/x86/kvm/mmu.c +--- linux-3.0.8/arch/x86/kvm/mmu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/mmu.c 2011-08-23 21:47:55.000000000 -0400 @@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes); @@ -16713,9 +16894,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/mmu.c linux-3.0.7/arch/x86/kvm/mmu.c gentry = 0; kvm_mmu_free_some_pages(vcpu); ++vcpu->kvm->stat.mmu_pte_write; -diff -urNp linux-3.0.7/arch/x86/kvm/paging_tmpl.h linux-3.0.7/arch/x86/kvm/paging_tmpl.h ---- linux-3.0.7/arch/x86/kvm/paging_tmpl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/paging_tmpl.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/paging_tmpl.h linux-3.0.8/arch/x86/kvm/paging_tmpl.h +--- linux-3.0.8/arch/x86/kvm/paging_tmpl.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/paging_tmpl.h 2011-10-06 04:17:55.000000000 -0400 @@ -182,7 +182,7 @@ walk: break; } @@ -16743,9 +16924,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/paging_tmpl.h linux-3.0.7/arch/x86/kvm/pagin spin_unlock(&vcpu->kvm->mmu_lock); -diff -urNp linux-3.0.7/arch/x86/kvm/svm.c linux-3.0.7/arch/x86/kvm/svm.c ---- linux-3.0.7/arch/x86/kvm/svm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/svm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/svm.c linux-3.0.8/arch/x86/kvm/svm.c +--- linux-3.0.8/arch/x86/kvm/svm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/svm.c 2011-08-23 21:47:55.000000000 -0400 @@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu * int cpu = raw_smp_processor_id(); @@ -16769,9 +16950,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/svm.c linux-3.0.7/arch/x86/kvm/svm.c reload_tss(vcpu); local_irq_disable(); -diff -urNp linux-3.0.7/arch/x86/kvm/vmx.c linux-3.0.7/arch/x86/kvm/vmx.c ---- linux-3.0.7/arch/x86/kvm/vmx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/vmx.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/vmx.c linux-3.0.8/arch/x86/kvm/vmx.c +--- linux-3.0.8/arch/x86/kvm/vmx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/vmx.c 2011-08-23 21:47:55.000000000 -0400 @@ -797,7 +797,11 @@ static void reload_tss(void) struct desc_struct *descs; @@ -16850,9 +17031,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/vmx.c linux-3.0.7/arch/x86/kvm/vmx.c vmx->launched = 1; vmx->exit_reason = vmcs_read32(VM_EXIT_REASON); -diff -urNp linux-3.0.7/arch/x86/kvm/x86.c linux-3.0.7/arch/x86/kvm/x86.c ---- linux-3.0.7/arch/x86/kvm/x86.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/kvm/x86.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/kvm/x86.c linux-3.0.8/arch/x86/kvm/x86.c +--- linux-3.0.8/arch/x86/kvm/x86.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/kvm/x86.c 2011-10-06 04:17:55.000000000 -0400 @@ -1313,8 +1313,8 @@ static int xen_hvm_config(struct kvm_vcp { struct kvm *kvm = vcpu->kvm; @@ -16938,9 +17119,9 @@ diff -urNp linux-3.0.7/arch/x86/kvm/x86.c linux-3.0.7/arch/x86/kvm/x86.c { int r; struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; -diff -urNp linux-3.0.7/arch/x86/lguest/boot.c linux-3.0.7/arch/x86/lguest/boot.c ---- linux-3.0.7/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lguest/boot.c linux-3.0.8/arch/x86/lguest/boot.c +--- linux-3.0.8/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400 @@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt * Rebooting also tells the Host we're finished, but the RESTART flag tells the * Launcher to reboot us. @@ -16953,9 +17134,9 @@ diff -urNp linux-3.0.7/arch/x86/lguest/boot.c linux-3.0.7/arch/x86/lguest/boot.c } /*G:050 -diff -urNp linux-3.0.7/arch/x86/lib/atomic64_32.c linux-3.0.7/arch/x86/lib/atomic64_32.c ---- linux-3.0.7/arch/x86/lib/atomic64_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/atomic64_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/atomic64_32.c linux-3.0.8/arch/x86/lib/atomic64_32.c +--- linux-3.0.8/arch/x86/lib/atomic64_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/atomic64_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -8,18 +8,30 @@ long long atomic64_read_cx8(long long, const atomic64_t *v); @@ -17034,9 +17215,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/atomic64_32.c linux-3.0.7/arch/x86/lib/atomi long long atomic64_dec_if_positive_386(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_386); int atomic64_inc_not_zero_386(atomic64_t *v); -diff -urNp linux-3.0.7/arch/x86/lib/atomic64_386_32.S linux-3.0.7/arch/x86/lib/atomic64_386_32.S ---- linux-3.0.7/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/atomic64_386_32.S linux-3.0.8/arch/x86/lib/atomic64_386_32.S +--- linux-3.0.8/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -48,6 +48,10 @@ BEGIN(read) movl (v), %eax movl 4(v), %edx @@ -17292,9 +17473,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/atomic64_386_32.S linux-3.0.7/arch/x86/lib/a js 1f movl %eax, (v) movl %edx, 4(v) -diff -urNp linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S ---- linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S +--- linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S 2011-10-06 04:17:55.000000000 -0400 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8) CFI_STARTPROC @@ -17516,9 +17697,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S linux-3.0.7/arch/x86/lib/a ret 4: testl %edx, %edx -diff -urNp linux-3.0.7/arch/x86/lib/checksum_32.S linux-3.0.7/arch/x86/lib/checksum_32.S ---- linux-3.0.7/arch/x86/lib/checksum_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/checksum_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/checksum_32.S linux-3.0.8/arch/x86/lib/checksum_32.S +--- linux-3.0.8/arch/x86/lib/checksum_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/checksum_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -17763,9 +17944,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/checksum_32.S linux-3.0.7/arch/x86/lib/check #undef ROUND #undef ROUND1 -diff -urNp linux-3.0.7/arch/x86/lib/clear_page_64.S linux-3.0.7/arch/x86/lib/clear_page_64.S ---- linux-3.0.7/arch/x86/lib/clear_page_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/clear_page_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/clear_page_64.S linux-3.0.8/arch/x86/lib/clear_page_64.S +--- linux-3.0.8/arch/x86/lib/clear_page_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/clear_page_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -11,6 +11,7 @@ ENTRY(clear_page_c) movl $4096/8,%ecx xorl %eax,%eax @@ -17799,9 +17980,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/clear_page_64.S linux-3.0.7/arch/x86/lib/cle 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: .byte 0xeb /* jmp <disp8> */ -diff -urNp linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S ---- linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S +--- linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S 2011-10-07 19:07:28.000000000 -0400 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu: popf @@ -17816,9 +17997,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.7/arch/x86/lib/cm ret CFI_ENDPROC -diff -urNp linux-3.0.7/arch/x86/lib/copy_page_64.S linux-3.0.7/arch/x86/lib/copy_page_64.S ---- linux-3.0.7/arch/x86/lib/copy_page_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/copy_page_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/copy_page_64.S linux-3.0.8/arch/x86/lib/copy_page_64.S +--- linux-3.0.8/arch/x86/lib/copy_page_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/copy_page_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -2,12 +2,14 @@ #include <linux/linkage.h> @@ -17851,9 +18032,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/copy_page_64.S linux-3.0.7/arch/x86/lib/copy 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-3.0.7/arch/x86/lib/copy_user_64.S linux-3.0.7/arch/x86/lib/copy_user_64.S ---- linux-3.0.7/arch/x86/lib/copy_user_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/copy_user_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/copy_user_64.S linux-3.0.8/arch/x86/lib/copy_user_64.S +--- linux-3.0.8/arch/x86/lib/copy_user_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/copy_user_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -16,6 +16,7 @@ #include <asm/thread_info.h> #include <asm/cpufeature.h> @@ -17946,9 +18127,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/copy_user_64.S linux-3.0.7/arch/x86/lib/copy ret .section .fixup,"ax" -diff -urNp linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S ---- linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S +--- linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -8,12 +8,14 @@ #include <linux/linkage.h> @@ -17988,9 +18169,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S linux-3.0.7/arch/x86/ ret .section .fixup,"ax" -diff -urNp linux-3.0.7/arch/x86/lib/csum-copy_64.S linux-3.0.7/arch/x86/lib/csum-copy_64.S ---- linux-3.0.7/arch/x86/lib/csum-copy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/csum-copy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/csum-copy_64.S linux-3.0.8/arch/x86/lib/csum-copy_64.S +--- linux-3.0.8/arch/x86/lib/csum-copy_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/csum-copy_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -8,6 +8,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -18007,9 +18188,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/csum-copy_64.S linux-3.0.7/arch/x86/lib/csum ret CFI_RESTORE_STATE -diff -urNp linux-3.0.7/arch/x86/lib/csum-wrappers_64.c linux-3.0.7/arch/x86/lib/csum-wrappers_64.c ---- linux-3.0.7/arch/x86/lib/csum-wrappers_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/csum-wrappers_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/csum-wrappers_64.c linux-3.0.8/arch/x86/lib/csum-wrappers_64.c +--- linux-3.0.8/arch/x86/lib/csum-wrappers_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/csum-wrappers_64.c 2011-10-06 04:17:55.000000000 -0400 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -18040,9 +18221,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/csum-wrappers_64.c linux-3.0.7/arch/x86/lib/ len, isum, NULL, errp); } EXPORT_SYMBOL(csum_partial_copy_to_user); -diff -urNp linux-3.0.7/arch/x86/lib/getuser.S linux-3.0.7/arch/x86/lib/getuser.S ---- linux-3.0.7/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/getuser.S 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/getuser.S linux-3.0.8/arch/x86/lib/getuser.S +--- linux-3.0.8/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/getuser.S 2011-10-07 19:07:23.000000000 -0400 @@ -33,15 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -18166,9 +18347,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/getuser.S linux-3.0.7/arch/x86/lib/getuser.S ret CFI_ENDPROC END(bad_get_user) -diff -urNp linux-3.0.7/arch/x86/lib/insn.c linux-3.0.7/arch/x86/lib/insn.c ---- linux-3.0.7/arch/x86/lib/insn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/insn.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/insn.c linux-3.0.8/arch/x86/lib/insn.c +--- linux-3.0.8/arch/x86/lib/insn.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/insn.c 2011-08-23 21:47:55.000000000 -0400 @@ -21,6 +21,11 @@ #include <linux/string.h> #include <asm/inat.h> @@ -18192,9 +18373,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/insn.c linux-3.0.7/arch/x86/lib/insn.c insn->x86_64 = x86_64 ? 1 : 0; insn->opnd_bytes = 4; if (x86_64) -diff -urNp linux-3.0.7/arch/x86/lib/iomap_copy_64.S linux-3.0.7/arch/x86/lib/iomap_copy_64.S ---- linux-3.0.7/arch/x86/lib/iomap_copy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/iomap_copy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/iomap_copy_64.S linux-3.0.8/arch/x86/lib/iomap_copy_64.S +--- linux-3.0.8/arch/x86/lib/iomap_copy_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/iomap_copy_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -17,6 +17,7 @@ #include <linux/linkage.h> @@ -18211,9 +18392,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/iomap_copy_64.S linux-3.0.7/arch/x86/lib/iom ret CFI_ENDPROC ENDPROC(__iowrite32_copy) -diff -urNp linux-3.0.7/arch/x86/lib/memcpy_64.S linux-3.0.7/arch/x86/lib/memcpy_64.S ---- linux-3.0.7/arch/x86/lib/memcpy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/memcpy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/memcpy_64.S linux-3.0.8/arch/x86/lib/memcpy_64.S +--- linux-3.0.8/arch/x86/lib/memcpy_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/memcpy_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -34,6 +34,7 @@ rep movsq movl %edx, %ecx @@ -18262,9 +18443,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/memcpy_64.S linux-3.0.7/arch/x86/lib/memcpy_ retq CFI_ENDPROC ENDPROC(memcpy) -diff -urNp linux-3.0.7/arch/x86/lib/memmove_64.S linux-3.0.7/arch/x86/lib/memmove_64.S ---- linux-3.0.7/arch/x86/lib/memmove_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/memmove_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/memmove_64.S linux-3.0.8/arch/x86/lib/memmove_64.S +--- linux-3.0.8/arch/x86/lib/memmove_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/memmove_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -18289,9 +18470,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/memmove_64.S linux-3.0.7/arch/x86/lib/memmov retq .Lmemmove_end_forward_efs: .previous -diff -urNp linux-3.0.7/arch/x86/lib/memset_64.S linux-3.0.7/arch/x86/lib/memset_64.S ---- linux-3.0.7/arch/x86/lib/memset_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/memset_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/memset_64.S linux-3.0.8/arch/x86/lib/memset_64.S +--- linux-3.0.8/arch/x86/lib/memset_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/memset_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -31,6 +31,7 @@ movl %r8d,%ecx rep stosb @@ -18316,9 +18497,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/memset_64.S linux-3.0.7/arch/x86/lib/memset_ ret CFI_RESTORE_STATE -diff -urNp linux-3.0.7/arch/x86/lib/mmx_32.c linux-3.0.7/arch/x86/lib/mmx_32.c ---- linux-3.0.7/arch/x86/lib/mmx_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/mmx_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/mmx_32.c linux-3.0.8/arch/x86/lib/mmx_32.c +--- linux-3.0.8/arch/x86/lib/mmx_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/mmx_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -18634,9 +18815,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/mmx_32.c linux-3.0.7/arch/x86/lib/mmx_32.c from += 64; to += 64; -diff -urNp linux-3.0.7/arch/x86/lib/msr-reg.S linux-3.0.7/arch/x86/lib/msr-reg.S ---- linux-3.0.7/arch/x86/lib/msr-reg.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/msr-reg.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/msr-reg.S linux-3.0.8/arch/x86/lib/msr-reg.S +--- linux-3.0.8/arch/x86/lib/msr-reg.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/msr-reg.S 2011-10-07 19:07:28.000000000 -0400 @@ -3,6 +3,7 @@ #include <asm/dwarf2.h> #include <asm/asm.h> @@ -18653,9 +18834,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/msr-reg.S linux-3.0.7/arch/x86/lib/msr-reg.S ret 3: CFI_RESTORE_STATE -diff -urNp linux-3.0.7/arch/x86/lib/putuser.S linux-3.0.7/arch/x86/lib/putuser.S ---- linux-3.0.7/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/putuser.S 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/putuser.S linux-3.0.8/arch/x86/lib/putuser.S +--- linux-3.0.8/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/putuser.S 2011-10-07 19:07:23.000000000 -0400 @@ -15,7 +15,9 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -18795,9 +18976,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/putuser.S linux-3.0.7/arch/x86/lib/putuser.S #endif xor %eax,%eax EXIT -diff -urNp linux-3.0.7/arch/x86/lib/rwlock_64.S linux-3.0.7/arch/x86/lib/rwlock_64.S ---- linux-3.0.7/arch/x86/lib/rwlock_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/rwlock_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/rwlock_64.S linux-3.0.8/arch/x86/lib/rwlock_64.S +--- linux-3.0.8/arch/x86/lib/rwlock_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/rwlock_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -17,6 +17,7 @@ ENTRY(__write_lock_failed) LOCK_PREFIX subl $RW_LOCK_BIAS,(%rdi) @@ -18814,9 +18995,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/rwlock_64.S linux-3.0.7/arch/x86/lib/rwlock_ ret CFI_ENDPROC END(__read_lock_failed) -diff -urNp linux-3.0.7/arch/x86/lib/rwsem_64.S linux-3.0.7/arch/x86/lib/rwsem_64.S ---- linux-3.0.7/arch/x86/lib/rwsem_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/rwsem_64.S 2011-10-07 10:46:47.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/rwsem_64.S linux-3.0.8/arch/x86/lib/rwsem_64.S +--- linux-3.0.8/arch/x86/lib/rwsem_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/rwsem_64.S 2011-10-07 10:46:47.000000000 -0400 @@ -51,6 +51,7 @@ ENTRY(call_rwsem_down_read_failed) popq_cfi %rdx CFI_RESTORE rdx @@ -18851,9 +19032,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/rwsem_64.S linux-3.0.7/arch/x86/lib/rwsem_64 ret CFI_ENDPROC ENDPROC(call_rwsem_downgrade_wake) -diff -urNp linux-3.0.7/arch/x86/lib/thunk_64.S linux-3.0.7/arch/x86/lib/thunk_64.S ---- linux-3.0.7/arch/x86/lib/thunk_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/thunk_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/thunk_64.S linux-3.0.8/arch/x86/lib/thunk_64.S +--- linux-3.0.8/arch/x86/lib/thunk_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/thunk_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -10,7 +10,8 @@ #include <asm/dwarf2.h> #include <asm/calling.h> @@ -18872,9 +19053,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/thunk_64.S linux-3.0.7/arch/x86/lib/thunk_64 + pax_force_retaddr + ret CFI_ENDPROC -diff -urNp linux-3.0.7/arch/x86/lib/usercopy_32.c linux-3.0.7/arch/x86/lib/usercopy_32.c ---- linux-3.0.7/arch/x86/lib/usercopy_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/usercopy_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/usercopy_32.c linux-3.0.8/arch/x86/lib/usercopy_32.c +--- linux-3.0.8/arch/x86/lib/usercopy_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/usercopy_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -19495,9 +19676,9 @@ diff -urNp linux-3.0.7/arch/x86/lib/usercopy_32.c linux-3.0.7/arch/x86/lib/userc +} +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-3.0.7/arch/x86/lib/usercopy_64.c linux-3.0.7/arch/x86/lib/usercopy_64.c ---- linux-3.0.7/arch/x86/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/lib/usercopy_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/lib/usercopy_64.c linux-3.0.8/arch/x86/lib/usercopy_64.c +--- linux-3.0.8/arch/x86/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/lib/usercopy_64.c 2011-10-06 04:17:55.000000000 -0400 @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -19556,9 +19737,33 @@ diff -urNp linux-3.0.7/arch/x86/lib/usercopy_64.c linux-3.0.7/arch/x86/lib/userc { char c; unsigned zero_len; -diff -urNp linux-3.0.7/arch/x86/mm/extable.c linux-3.0.7/arch/x86/mm/extable.c ---- linux-3.0.7/arch/x86/mm/extable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/extable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/Makefile linux-3.0.8/arch/x86/Makefile +--- linux-3.0.8/arch/x86/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/Makefile 2011-08-23 21:48:14.000000000 -0400 +@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y) + else + BITS := 64 + UTS_MACHINE := x86_64 ++ biarch := $(call cc-option,-m64) + CHECKFLAGS += -D__x86_64__ -m64 + + KBUILD_AFLAGS += -m64 +@@ -195,3 +196,12 @@ define archhelp + echo ' FDARGS="..." arguments for the booted kernel' + echo ' FDINITRD=file initrd for the booted kernel' + endef ++ ++define OLD_LD ++ ++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils. ++*** Please upgrade your binutils to 2.18 or newer ++endef ++ ++archprepare: ++ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) +diff -urNp linux-3.0.8/arch/x86/mm/extable.c linux-3.0.8/arch/x86/mm/extable.c +--- linux-3.0.8/arch/x86/mm/extable.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/extable.c 2011-08-23 21:47:55.000000000 -0400 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs const struct exception_table_entry *fixup; @@ -19568,9 +19773,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/extable.c linux-3.0.7/arch/x86/mm/extable.c 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-3.0.7/arch/x86/mm/fault.c linux-3.0.7/arch/x86/mm/fault.c ---- linux-3.0.7/arch/x86/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/fault.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/fault.c linux-3.0.8/arch/x86/mm/fault.c +--- linux-3.0.8/arch/x86/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/fault.c 2011-10-06 04:17:55.000000000 -0400 @@ -13,10 +13,18 @@ #include <linux/perf_event.h> /* perf_sw_event */ #include <linux/hugetlb.h> /* hstate_index_to_shift */ @@ -20237,9 +20442,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/fault.c linux-3.0.7/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-3.0.7/arch/x86/mm/gup.c linux-3.0.7/arch/x86/mm/gup.c ---- linux-3.0.7/arch/x86/mm/gup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/gup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/gup.c linux-3.0.8/arch/x86/mm/gup.c +--- linux-3.0.8/arch/x86/mm/gup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/gup.c 2011-08-23 21:47:55.000000000 -0400 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -20249,9 +20454,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/gup.c linux-3.0.7/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-3.0.7/arch/x86/mm/highmem_32.c linux-3.0.7/arch/x86/mm/highmem_32.c ---- linux-3.0.7/arch/x86/mm/highmem_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/highmem_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/highmem_32.c linux-3.0.8/arch/x86/mm/highmem_32.c +--- linux-3.0.8/arch/x86/mm/highmem_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/highmem_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -20263,9 +20468,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/highmem_32.c linux-3.0.7/arch/x86/mm/highmem_ return (void *)vaddr; } -diff -urNp linux-3.0.7/arch/x86/mm/hugetlbpage.c linux-3.0.7/arch/x86/mm/hugetlbpage.c ---- linux-3.0.7/arch/x86/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/hugetlbpage.c linux-3.0.8/arch/x86/mm/hugetlbpage.c +--- linux-3.0.8/arch/x86/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -20473,144 +20678,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/hugetlbpage.c linux-3.0.7/arch/x86/mm/hugetlb return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-3.0.7/arch/x86/mm/init.c linux-3.0.7/arch/x86/mm/init.c ---- linux-3.0.7/arch/x86/mm/init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/init.c 2011-08-23 21:48:14.000000000 -0400 -@@ -31,7 +31,7 @@ int direct_gbpages - static void __init find_early_table_space(unsigned long end, int use_pse, - int use_gbpages) - { -- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end; -+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end; - phys_addr_t base; - - puds = (end + PUD_SIZE - 1) >> PUD_SHIFT; -@@ -313,12 +313,34 @@ unsigned long __init_refok init_memory_m - */ - int devmem_is_allowed(unsigned long pagenr) - { -- if (pagenr <= 256) -+#ifdef CONFIG_GRKERNSEC_KMEM -+ /* allow BDA */ -+ if (!pagenr) -+ return 1; -+ /* allow EBDA */ -+ if ((0x9f000 >> PAGE_SHIFT) == pagenr) -+ return 1; -+#else -+ if (!pagenr) -+ return 1; -+#ifdef CONFIG_VM86 -+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) -+ return 1; -+#endif -+#endif -+ -+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) - return 1; -+#ifdef CONFIG_GRKERNSEC_KMEM -+ /* throw out everything else below 1MB */ -+ if (pagenr <= 256) -+ return 0; -+#endif - if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) - return 0; - if (!page_is_ram(pagenr)) - return 1; -+ - return 0; - } - -@@ -373,6 +395,86 @@ void free_init_pages(char *what, unsigne - - void free_initmem(void) - { -+ -+#ifdef CONFIG_PAX_KERNEXEC -+#ifdef CONFIG_X86_32 -+ /* PaX: limit KERNEL_CS to actual size */ -+ unsigned long addr, limit; -+ struct desc_struct d; -+ int cpu; -+ -+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext; -+ limit = (limit - 1UL) >> PAGE_SHIFT; -+ -+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE); -+ for (cpu = 0; cpu < NR_CPUS; cpu++) { -+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC); -+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S); -+ } -+ -+ /* PaX: make KERNEL_CS read-only */ -+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text)); -+ if (!paravirt_enabled()) -+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT); -+/* -+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); -+ } -+*/ -+#ifdef CONFIG_X86_PAE -+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT); -+/* -+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); -+ } -+*/ -+#endif -+ -+#ifdef CONFIG_MODULES -+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT); -+#endif -+ -+#else -+ pgd_t *pgd; -+ pud_t *pud; -+ pmd_t *pmd; -+ unsigned long addr, end; -+ -+ /* PaX: make kernel code/rodata read-only, rest non-executable */ -+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ if (!pmd_present(*pmd)) -+ continue; -+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata) -+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); -+ else -+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); -+ } -+ -+ addr = (unsigned long)__va(__pa(__START_KERNEL_map)); -+ end = addr + KERNEL_IMAGE_SIZE; -+ for (; addr < end; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ if (!pmd_present(*pmd)) -+ continue; -+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata))) -+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); -+ } -+#endif -+ -+ flush_tlb_all(); -+#endif -+ - free_init_pages("unused kernel memory", - (unsigned long)(&__init_begin), - (unsigned long)(&__init_end)); -diff -urNp linux-3.0.7/arch/x86/mm/init_32.c linux-3.0.7/arch/x86/mm/init_32.c ---- linux-3.0.7/arch/x86/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/init_32.c linux-3.0.8/arch/x86/mm/init_32.c +--- linux-3.0.8/arch/x86/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } @@ -20885,9 +20955,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/init_32.c linux-3.0.7/arch/x86/mm/init_32.c 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-3.0.7/arch/x86/mm/init_64.c linux-3.0.7/arch/x86/mm/init_64.c ---- linux-3.0.7/arch/x86/mm/init_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/init_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/init_64.c linux-3.0.8/arch/x86/mm/init_64.c +--- linux-3.0.8/arch/x86/mm/init_64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/init_64.c 2011-10-06 04:17:55.000000000 -0400 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa * around without checking the pgd every time. */ @@ -21017,9 +21087,144 @@ diff -urNp linux-3.0.7/arch/x86/mm/init_64.c linux-3.0.7/arch/x86/mm/init_64.c return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-3.0.7/arch/x86/mm/iomap_32.c linux-3.0.7/arch/x86/mm/iomap_32.c ---- linux-3.0.7/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/init.c linux-3.0.8/arch/x86/mm/init.c +--- linux-3.0.8/arch/x86/mm/init.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/init.c 2011-10-25 09:10:41.000000000 -0400 +@@ -31,7 +31,7 @@ int direct_gbpages + static void __init find_early_table_space(unsigned long end, int use_pse, + int use_gbpages) + { +- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end; ++ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end; + phys_addr_t base; + + puds = (end + PUD_SIZE - 1) >> PUD_SHIFT; +@@ -312,12 +312,34 @@ unsigned long __init_refok init_memory_m + */ + int devmem_is_allowed(unsigned long pagenr) + { +- if (pagenr <= 256) ++#ifdef CONFIG_GRKERNSEC_KMEM ++ /* allow BDA */ ++ if (!pagenr) ++ return 1; ++ /* allow EBDA */ ++ if ((0x9f000 >> PAGE_SHIFT) == pagenr) ++ return 1; ++#else ++ if (!pagenr) ++ return 1; ++#ifdef CONFIG_VM86 ++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) ++ return 1; ++#endif ++#endif ++ ++ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) + return 1; ++#ifdef CONFIG_GRKERNSEC_KMEM ++ /* throw out everything else below 1MB */ ++ if (pagenr <= 256) ++ return 0; ++#endif + if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) + return 0; + if (!page_is_ram(pagenr)) + return 1; ++ + return 0; + } + +@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigne + + void free_initmem(void) + { ++ ++#ifdef CONFIG_PAX_KERNEXEC ++#ifdef CONFIG_X86_32 ++ /* PaX: limit KERNEL_CS to actual size */ ++ unsigned long addr, limit; ++ struct desc_struct d; ++ int cpu; ++ ++ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext; ++ limit = (limit - 1UL) >> PAGE_SHIFT; ++ ++ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE); ++ for (cpu = 0; cpu < NR_CPUS; cpu++) { ++ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC); ++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S); ++ } ++ ++ /* PaX: make KERNEL_CS read-only */ ++ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text)); ++ if (!paravirt_enabled()) ++ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT); ++/* ++ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); ++ } ++*/ ++#ifdef CONFIG_X86_PAE ++ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT); ++/* ++ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); ++ } ++*/ ++#endif ++ ++#ifdef CONFIG_MODULES ++ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT); ++#endif ++ ++#else ++ pgd_t *pgd; ++ pud_t *pud; ++ pmd_t *pmd; ++ unsigned long addr, end; ++ ++ /* PaX: make kernel code/rodata read-only, rest non-executable */ ++ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ if (!pmd_present(*pmd)) ++ continue; ++ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata) ++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); ++ else ++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); ++ } ++ ++ addr = (unsigned long)__va(__pa(__START_KERNEL_map)); ++ end = addr + KERNEL_IMAGE_SIZE; ++ for (; addr < end; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ if (!pmd_present(*pmd)) ++ continue; ++ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata))) ++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); ++ } ++#endif ++ ++ flush_tlb_all(); ++#endif ++ + free_init_pages("unused kernel memory", + (unsigned long)(&__init_begin), + (unsigned long)(&__init_end)); +diff -urNp linux-3.0.8/arch/x86/mm/iomap_32.c linux-3.0.8/arch/x86/mm/iomap_32.c +--- linux-3.0.8/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -21032,9 +21237,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/iomap_32.c linux-3.0.7/arch/x86/mm/iomap_32.c arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-3.0.7/arch/x86/mm/ioremap.c linux-3.0.7/arch/x86/mm/ioremap.c ---- linux-3.0.7/arch/x86/mm/ioremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/ioremap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/ioremap.c linux-3.0.8/arch/x86/mm/ioremap.c +--- linux-3.0.8/arch/x86/mm/ioremap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/ioremap.c 2011-08-23 21:47:55.000000000 -0400 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) { int is_ram = page_is_ram(pfn); @@ -21063,9 +21268,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/ioremap.c linux-3.0.7/arch/x86/mm/ioremap.c /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c 2011-08-23 21:47:55.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. @@ -21078,9 +21283,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.7/arch/x86/mm return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-3.0.7/arch/x86/mm/mmap.c linux-3.0.7/arch/x86/mm/mmap.c ---- linux-3.0.7/arch/x86/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/mmap.c linux-3.0.8/arch/x86/mm/mmap.c +--- linux-3.0.8/arch/x86/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -21162,9 +21367,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/mmap.c linux-3.0.7/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.7/arch/x86/mm/mmio-mod.c linux-3.0.7/arch/x86/mm/mmio-mod.c ---- linux-3.0.7/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/mmio-mod.c linux-3.0.8/arch/x86/mm/mmio-mod.c +--- linux-3.0.8/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s break; default: @@ -21192,21 +21397,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/mmio-mod.c linux-3.0.7/arch/x86/mm/mmio-mod.c }; map.map_id = trace->id; -diff -urNp linux-3.0.7/arch/x86/mm/pageattr-test.c linux-3.0.7/arch/x86/mm/pageattr-test.c ---- linux-3.0.7/arch/x86/mm/pageattr-test.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pageattr-test.c 2011-08-23 21:47:55.000000000 -0400 -@@ -36,7 +36,7 @@ enum { - - static int pte_testbit(pte_t pte) - { -- return pte_flags(pte) & _PAGE_UNUSED1; -+ return pte_flags(pte) & _PAGE_CPA_TEST; - } - - struct split_state { -diff -urNp linux-3.0.7/arch/x86/mm/pageattr.c linux-3.0.7/arch/x86/mm/pageattr.c ---- linux-3.0.7/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/pageattr.c linux-3.0.8/arch/x86/mm/pageattr.c +--- linux-3.0.8/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection */ #ifdef CONFIG_PCI_BIOS @@ -21291,9 +21484,21 @@ diff -urNp linux-3.0.7/arch/x86/mm/pageattr.c linux-3.0.7/arch/x86/mm/pageattr.c } static int -diff -urNp linux-3.0.7/arch/x86/mm/pat.c linux-3.0.7/arch/x86/mm/pat.c ---- linux-3.0.7/arch/x86/mm/pat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pat.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/pageattr-test.c linux-3.0.8/arch/x86/mm/pageattr-test.c +--- linux-3.0.8/arch/x86/mm/pageattr-test.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pageattr-test.c 2011-08-23 21:47:55.000000000 -0400 +@@ -36,7 +36,7 @@ enum { + + static int pte_testbit(pte_t pte) + { +- return pte_flags(pte) & _PAGE_UNUSED1; ++ return pte_flags(pte) & _PAGE_CPA_TEST; + } + + struct split_state { +diff -urNp linux-3.0.8/arch/x86/mm/pat.c linux-3.0.8/arch/x86/mm/pat.c +--- linux-3.0.8/arch/x86/mm/pat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pat.c 2011-08-23 21:47:55.000000000 -0400 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) if (!entry) { @@ -21341,9 +21546,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/pat.c linux-3.0.7/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-3.0.7/arch/x86/mm/pf_in.c linux-3.0.7/arch/x86/mm/pf_in.c ---- linux-3.0.7/arch/x86/mm/pf_in.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pf_in.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/pf_in.c linux-3.0.8/arch/x86/mm/pf_in.c +--- linux-3.0.8/arch/x86/mm/pf_in.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pf_in.c 2011-08-23 21:47:55.000000000 -0400 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l int i; enum reason_type rv = OTHERS; @@ -21389,9 +21594,26 @@ diff -urNp linux-3.0.7/arch/x86/mm/pf_in.c linux-3.0.7/arch/x86/mm/pf_in.c p += skip_prefix(p, &prf); p += get_opcode(p, &opcode); for (i = 0; i < ARRAY_SIZE(imm_wop); i++) -diff -urNp linux-3.0.7/arch/x86/mm/pgtable.c linux-3.0.7/arch/x86/mm/pgtable.c ---- linux-3.0.7/arch/x86/mm/pgtable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pgtable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/pgtable_32.c linux-3.0.8/arch/x86/mm/pgtable_32.c +--- linux-3.0.8/arch/x86/mm/pgtable_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pgtable_32.c 2011-08-23 21:47:55.000000000 -0400 +@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, + return; + } + pte = pte_offset_kernel(pmd, vaddr); ++ ++ pax_open_kernel(); + if (pte_val(pteval)) + set_pte_at(&init_mm, vaddr, pte, pteval); + else + pte_clear(&init_mm, vaddr, pte); ++ pax_close_kernel(); + + /* + * It's enough to flush this one mapping. +diff -urNp linux-3.0.8/arch/x86/mm/pgtable.c linux-3.0.8/arch/x86/mm/pgtable.c +--- linux-3.0.8/arch/x86/mm/pgtable.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/pgtable.c 2011-08-23 21:47:55.000000000 -0400 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -21637,26 +21859,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/pgtable.c linux-3.0.7/arch/x86/mm/pgtable.c pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-3.0.7/arch/x86/mm/pgtable_32.c linux-3.0.7/arch/x86/mm/pgtable_32.c ---- linux-3.0.7/arch/x86/mm/pgtable_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/pgtable_32.c 2011-08-23 21:47:55.000000000 -0400 -@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, - return; - } - pte = pte_offset_kernel(pmd, vaddr); -+ -+ pax_open_kernel(); - if (pte_val(pteval)) - set_pte_at(&init_mm, vaddr, pte, pteval); - else - pte_clear(&init_mm, vaddr, pte); -+ pax_close_kernel(); - - /* - * It's enough to flush this one mapping. -diff -urNp linux-3.0.7/arch/x86/mm/setup_nx.c linux-3.0.7/arch/x86/mm/setup_nx.c ---- linux-3.0.7/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/setup_nx.c linux-3.0.8/arch/x86/mm/setup_nx.c +--- linux-3.0.8/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400 @@ -5,8 +5,10 @@ #include <asm/pgtable.h> #include <asm/proto.h> @@ -21686,9 +21891,9 @@ diff -urNp linux-3.0.7/arch/x86/mm/setup_nx.c linux-3.0.7/arch/x86/mm/setup_nx.c __supported_pte_mask &= ~_PAGE_NX; } -diff -urNp linux-3.0.7/arch/x86/mm/tlb.c linux-3.0.7/arch/x86/mm/tlb.c ---- linux-3.0.7/arch/x86/mm/tlb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/mm/tlb.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/mm/tlb.c linux-3.0.8/arch/x86/mm/tlb.c +--- linux-3.0.8/arch/x86/mm/tlb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/mm/tlb.c 2011-08-23 21:47:55.000000000 -0400 @@ -65,7 +65,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -21701,9 +21906,31 @@ diff -urNp linux-3.0.7/arch/x86/mm/tlb.c linux-3.0.7/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-3.0.7/arch/x86/net/bpf_jit.S linux-3.0.7/arch/x86/net/bpf_jit.S ---- linux-3.0.7/arch/x86/net/bpf_jit.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/net/bpf_jit.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/net/bpf_jit_comp.c linux-3.0.8/arch/x86/net/bpf_jit_comp.c +--- linux-3.0.8/arch/x86/net/bpf_jit_comp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/net/bpf_jit_comp.c 2011-08-23 21:47:55.000000000 -0400 +@@ -589,7 +589,9 @@ cond_branch: f_offset = addrs[i + filt + module_free(NULL, image); + return; + } ++ pax_open_kernel(); + memcpy(image + proglen, temp, ilen); ++ pax_close_kernel(); + } + proglen += ilen; + addrs[i] = proglen; +@@ -609,7 +611,7 @@ cond_branch: f_offset = addrs[i + filt + break; + } + if (proglen == oldproglen) { +- image = module_alloc(max_t(unsigned int, ++ image = module_alloc_exec(max_t(unsigned int, + proglen, + sizeof(struct work_struct))); + if (!image) +diff -urNp linux-3.0.8/arch/x86/net/bpf_jit.S linux-3.0.8/arch/x86/net/bpf_jit.S +--- linux-3.0.8/arch/x86/net/bpf_jit.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/net/bpf_jit.S 2011-10-07 19:07:28.000000000 -0400 @@ -9,6 +9,7 @@ */ #include <linux/linkage.h> @@ -21781,31 +22008,9 @@ diff -urNp linux-3.0.7/arch/x86/net/bpf_jit.S linux-3.0.7/arch/x86/net/bpf_jit.S xchg %eax,%ebx + pax_force_retaddr ret -diff -urNp linux-3.0.7/arch/x86/net/bpf_jit_comp.c linux-3.0.7/arch/x86/net/bpf_jit_comp.c ---- linux-3.0.7/arch/x86/net/bpf_jit_comp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/net/bpf_jit_comp.c 2011-08-23 21:47:55.000000000 -0400 -@@ -589,7 +589,9 @@ cond_branch: f_offset = addrs[i + filt - module_free(NULL, image); - return; - } -+ pax_open_kernel(); - memcpy(image + proglen, temp, ilen); -+ pax_close_kernel(); - } - proglen += ilen; - addrs[i] = proglen; -@@ -609,7 +611,7 @@ cond_branch: f_offset = addrs[i + filt - break; - } - if (proglen == oldproglen) { -- image = module_alloc(max_t(unsigned int, -+ image = module_alloc_exec(max_t(unsigned int, - proglen, - sizeof(struct work_struct))); - if (!image) -diff -urNp linux-3.0.7/arch/x86/oprofile/backtrace.c linux-3.0.7/arch/x86/oprofile/backtrace.c ---- linux-3.0.7/arch/x86/oprofile/backtrace.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/arch/x86/oprofile/backtrace.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/oprofile/backtrace.c linux-3.0.8/arch/x86/oprofile/backtrace.c +--- linux-3.0.8/arch/x86/oprofile/backtrace.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/arch/x86/oprofile/backtrace.c 2011-10-06 04:17:55.000000000 -0400 @@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram struct stack_frame_ia32 *fp; unsigned long bytes; @@ -21838,9 +22043,9 @@ diff -urNp linux-3.0.7/arch/x86/oprofile/backtrace.c linux-3.0.7/arch/x86/oprofi unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-3.0.7/arch/x86/pci/mrst.c linux-3.0.7/arch/x86/pci/mrst.c ---- linux-3.0.7/arch/x86/pci/mrst.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/pci/mrst.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/pci/mrst.c linux-3.0.8/arch/x86/pci/mrst.c +--- linux-3.0.8/arch/x86/pci/mrst.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/pci/mrst.c 2011-08-23 21:47:55.000000000 -0400 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void) printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n"); pci_mmcfg_late_init(); @@ -21852,9 +22057,9 @@ diff -urNp linux-3.0.7/arch/x86/pci/mrst.c linux-3.0.7/arch/x86/pci/mrst.c /* Continue with standard init */ return 1; } -diff -urNp linux-3.0.7/arch/x86/pci/pcbios.c linux-3.0.7/arch/x86/pci/pcbios.c ---- linux-3.0.7/arch/x86/pci/pcbios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/pci/pcbios.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/pci/pcbios.c linux-3.0.8/arch/x86/pci/pcbios.c +--- linux-3.0.8/arch/x86/pci/pcbios.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/pci/pcbios.c 2011-08-23 21:47:55.000000000 -0400 @@ -79,50 +79,93 @@ union bios32 { static struct { unsigned long address; @@ -22159,9 +22364,9 @@ diff -urNp linux-3.0.7/arch/x86/pci/pcbios.c linux-3.0.7/arch/x86/pci/pcbios.c return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_32.c linux-3.0.7/arch/x86/platform/efi/efi_32.c ---- linux-3.0.7/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/platform/efi/efi_32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_32.c linux-3.0.8/arch/x86/platform/efi/efi_32.c +--- linux-3.0.8/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/platform/efi/efi_32.c 2011-10-06 04:17:55.000000000 -0400 @@ -38,70 +38,56 @@ */ @@ -22259,9 +22464,9 @@ diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_32.c linux-3.0.7/arch/x86/platf /* * After the lock is released, the original page table is restored. -diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S ---- linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S 2011-09-19 09:16:58.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S +--- linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S 2011-09-19 09:16:58.000000000 -0400 @@ -6,7 +6,9 @@ */ @@ -22370,9 +22575,9 @@ diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S linux-3.0.7/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S ---- linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S +--- linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S 2011-10-06 04:17:55.000000000 -0400 @@ -7,6 +7,7 @@ */ @@ -22436,9 +22641,9 @@ diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S linux-3.0.7/arch/x86/ + pax_force_retaddr ret ENDPROC(efi_call6) -diff -urNp linux-3.0.7/arch/x86/platform/mrst/mrst.c linux-3.0.7/arch/x86/platform/mrst/mrst.c ---- linux-3.0.7/arch/x86/platform/mrst/mrst.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/platform/mrst/mrst.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/platform/mrst/mrst.c linux-3.0.8/arch/x86/platform/mrst/mrst.c +--- linux-3.0.8/arch/x86/platform/mrst/mrst.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/platform/mrst/mrst.c 2011-08-23 21:47:55.000000000 -0400 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void) } @@ -22458,9 +22663,9 @@ diff -urNp linux-3.0.7/arch/x86/platform/mrst/mrst.c linux-3.0.7/arch/x86/platfo } /* -diff -urNp linux-3.0.7/arch/x86/platform/uv/tlb_uv.c linux-3.0.7/arch/x86/platform/uv/tlb_uv.c ---- linux-3.0.7/arch/x86/platform/uv/tlb_uv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/platform/uv/tlb_uv.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/platform/uv/tlb_uv.c linux-3.0.8/arch/x86/platform/uv/tlb_uv.c +--- linux-3.0.8/arch/x86/platform/uv/tlb_uv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/platform/uv/tlb_uv.c 2011-08-23 21:48:14.000000000 -0400 @@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta cpumask_t mask; struct reset_args reset_args; @@ -22470,9 +22675,9 @@ diff -urNp linux-3.0.7/arch/x86/platform/uv/tlb_uv.c linux-3.0.7/arch/x86/platfo reset_args.sender = sender; cpus_clear(mask); /* find a single cpu for each uvhub in this distribution mask */ -diff -urNp linux-3.0.7/arch/x86/power/cpu.c linux-3.0.7/arch/x86/power/cpu.c ---- linux-3.0.7/arch/x86/power/cpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/power/cpu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/power/cpu.c linux-3.0.8/arch/x86/power/cpu.c +--- linux-3.0.8/arch/x86/power/cpu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/power/cpu.c 2011-08-23 21:47:55.000000000 -0400 @@ -130,7 +130,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -22492,9 +22697,9 @@ diff -urNp linux-3.0.7/arch/x86/power/cpu.c linux-3.0.7/arch/x86/power/cpu.c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-3.0.7/arch/x86/vdso/Makefile linux-3.0.7/arch/x86/vdso/Makefile ---- linux-3.0.7/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/vdso/Makefile linux-3.0.8/arch/x86/vdso/Makefile +--- linux-3.0.8/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400 @@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO $@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' @@ -22504,9 +22709,9 @@ diff -urNp linux-3.0.7/arch/x86/vdso/Makefile linux-3.0.7/arch/x86/vdso/Makefile GCOV_PROFILE := n # -diff -urNp linux-3.0.7/arch/x86/vdso/vdso32-setup.c linux-3.0.7/arch/x86/vdso/vdso32-setup.c ---- linux-3.0.7/arch/x86/vdso/vdso32-setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/vdso/vdso32-setup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/vdso/vdso32-setup.c linux-3.0.8/arch/x86/vdso/vdso32-setup.c +--- linux-3.0.8/arch/x86/vdso/vdso32-setup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/vdso/vdso32-setup.c 2011-08-23 21:47:55.000000000 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -22589,9 +22794,9 @@ diff -urNp linux-3.0.7/arch/x86/vdso/vdso32-setup.c linux-3.0.7/arch/x86/vdso/vd return &gate_vma; return NULL; } -diff -urNp linux-3.0.7/arch/x86/vdso/vma.c linux-3.0.7/arch/x86/vdso/vma.c ---- linux-3.0.7/arch/x86/vdso/vma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/vdso/vma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/vdso/vma.c linux-3.0.8/arch/x86/vdso/vma.c +--- linux-3.0.8/arch/x86/vdso/vma.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/vdso/vma.c 2011-08-23 21:47:55.000000000 -0400 @@ -15,18 +15,19 @@ #include <asm/proto.h> #include <asm/vdso.h> @@ -22694,9 +22899,9 @@ diff -urNp linux-3.0.7/arch/x86/vdso/vma.c linux-3.0.7/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-3.0.7/arch/x86/xen/enlighten.c linux-3.0.7/arch/x86/xen/enlighten.c ---- linux-3.0.7/arch/x86/xen/enlighten.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/enlighten.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/enlighten.c linux-3.0.8/arch/x86/xen/enlighten.c +--- linux-3.0.8/arch/x86/xen/enlighten.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/enlighten.c 2011-08-29 23:26:21.000000000 -0400 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -22769,9 +22974,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/enlighten.c linux-3.0.7/arch/x86/xen/enlight xen_smp_init(); #ifdef CONFIG_ACPI_NUMA -diff -urNp linux-3.0.7/arch/x86/xen/mmu.c linux-3.0.7/arch/x86/xen/mmu.c ---- linux-3.0.7/arch/x86/xen/mmu.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/mmu.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/mmu.c linux-3.0.8/arch/x86/xen/mmu.c +--- linux-3.0.8/arch/x86/xen/mmu.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/mmu.c 2011-08-29 23:26:21.000000000 -0400 @@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -22808,9 +23013,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/mmu.c linux-3.0.7/arch/x86/xen/mmu.c .alloc_pud = xen_alloc_pmd_init, .release_pud = xen_release_pmd_init, -diff -urNp linux-3.0.7/arch/x86/xen/smp.c linux-3.0.7/arch/x86/xen/smp.c ---- linux-3.0.7/arch/x86/xen/smp.c 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/smp.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/smp.c linux-3.0.8/arch/x86/xen/smp.c +--- linux-3.0.8/arch/x86/xen/smp.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/smp.c 2011-10-16 21:55:27.000000000 -0400 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -22855,9 +23060,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/smp.c linux-3.0.7/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-3.0.7/arch/x86/xen/xen-asm_32.S linux-3.0.7/arch/x86/xen/xen-asm_32.S ---- linux-3.0.7/arch/x86/xen/xen-asm_32.S 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/xen-asm_32.S 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/xen-asm_32.S linux-3.0.8/arch/x86/xen/xen-asm_32.S +--- linux-3.0.8/arch/x86/xen/xen-asm_32.S 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/xen-asm_32.S 2011-10-16 21:55:27.000000000 -0400 @@ -83,14 +83,14 @@ ENTRY(xen_iret) ESP_OFFSET=4 # bytes pushed onto stack @@ -22879,9 +23084,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/xen-asm_32.S linux-3.0.7/arch/x86/xen/xen-as #else movl xen_vcpu, %eax #endif -diff -urNp linux-3.0.7/arch/x86/xen/xen-head.S linux-3.0.7/arch/x86/xen/xen-head.S ---- linux-3.0.7/arch/x86/xen/xen-head.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/xen-head.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/xen-head.S linux-3.0.8/arch/x86/xen/xen-head.S +--- linux-3.0.8/arch/x86/xen/xen-head.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/xen-head.S 2011-08-23 21:47:55.000000000 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -22900,9 +23105,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/xen-head.S linux-3.0.7/arch/x86/xen/xen-head #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-3.0.7/arch/x86/xen/xen-ops.h linux-3.0.7/arch/x86/xen/xen-ops.h ---- linux-3.0.7/arch/x86/xen/xen-ops.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/arch/x86/xen/xen-ops.h linux-3.0.8/arch/x86/xen/xen-ops.h +--- linux-3.0.8/arch/x86/xen/xen-ops.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -22912,9 +23117,9 @@ diff -urNp linux-3.0.7/arch/x86/xen/xen-ops.h linux-3.0.7/arch/x86/xen/xen-ops.h struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-3.0.7/block/blk-iopoll.c linux-3.0.7/block/blk-iopoll.c ---- linux-3.0.7/block/blk-iopoll.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/blk-iopoll.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/block/blk-iopoll.c linux-3.0.8/block/blk-iopoll.c +--- linux-3.0.8/block/blk-iopoll.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/blk-iopoll.c 2011-08-23 21:47:55.000000000 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -22924,9 +23129,9 @@ diff -urNp linux-3.0.7/block/blk-iopoll.c linux-3.0.7/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-3.0.7/block/blk-map.c linux-3.0.7/block/blk-map.c ---- linux-3.0.7/block/blk-map.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/blk-map.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/block/blk-map.c linux-3.0.8/block/blk-map.c +--- linux-3.0.8/block/blk-map.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/blk-map.c 2011-08-23 21:47:55.000000000 -0400 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue if (!len || !kbuf) return -EINVAL; @@ -22936,9 +23141,9 @@ diff -urNp linux-3.0.7/block/blk-map.c linux-3.0.7/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-3.0.7/block/blk-softirq.c linux-3.0.7/block/blk-softirq.c ---- linux-3.0.7/block/blk-softirq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/blk-softirq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/block/blk-softirq.c linux-3.0.8/block/blk-softirq.c +--- linux-3.0.8/block/blk-softirq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/blk-softirq.c 2011-08-23 21:47:55.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. @@ -22948,9 +23153,9 @@ diff -urNp linux-3.0.7/block/blk-softirq.c linux-3.0.7/block/blk-softirq.c { struct list_head *cpu_list, local_list; -diff -urNp linux-3.0.7/block/bsg.c linux-3.0.7/block/bsg.c ---- linux-3.0.7/block/bsg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/bsg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/block/bsg.c linux-3.0.8/block/bsg.c +--- linux-3.0.8/block/bsg.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/bsg.c 2011-10-06 04:17:55.000000000 -0400 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -23018,9 +23223,9 @@ diff -urNp linux-3.0.7/block/bsg.c linux-3.0.7/block/bsg.c rq->sense, len); if (!ret) hdr->response_len = len; -diff -urNp linux-3.0.7/block/compat_ioctl.c linux-3.0.7/block/compat_ioctl.c ---- linux-3.0.7/block/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/block/compat_ioctl.c linux-3.0.8/block/compat_ioctl.c +--- linux-3.0.8/block/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_ err |= __get_user(f->spec1, &uf->spec1); err |= __get_user(f->fmt_gap, &uf->fmt_gap); @@ -23030,9 +23235,9 @@ diff -urNp linux-3.0.7/block/compat_ioctl.c linux-3.0.7/block/compat_ioctl.c if (err) { err = -EFAULT; goto out; -diff -urNp linux-3.0.7/block/scsi_ioctl.c linux-3.0.7/block/scsi_ioctl.c ---- linux-3.0.7/block/scsi_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/block/scsi_ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/block/scsi_ioctl.c linux-3.0.8/block/scsi_ioctl.c +--- linux-3.0.8/block/scsi_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/block/scsi_ioctl.c 2011-08-23 21:47:55.000000000 -0400 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) @@ -23084,9 +23289,9 @@ diff -urNp linux-3.0.7/block/scsi_ioctl.c linux-3.0.7/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; -diff -urNp linux-3.0.7/crypto/cryptd.c linux-3.0.7/crypto/cryptd.c ---- linux-3.0.7/crypto/cryptd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/crypto/cryptd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/crypto/cryptd.c linux-3.0.8/crypto/cryptd.c +--- linux-3.0.8/crypto/cryptd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/crypto/cryptd.c 2011-08-23 21:47:55.000000000 -0400 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx { struct cryptd_blkcipher_request_ctx { @@ -23105,9 +23310,9 @@ diff -urNp linux-3.0.7/crypto/cryptd.c linux-3.0.7/crypto/cryptd.c static void cryptd_queue_worker(struct work_struct *work); -diff -urNp linux-3.0.7/crypto/gf128mul.c linux-3.0.7/crypto/gf128mul.c ---- linux-3.0.7/crypto/gf128mul.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/crypto/gf128mul.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/crypto/gf128mul.c linux-3.0.8/crypto/gf128mul.c +--- linux-3.0.8/crypto/gf128mul.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/crypto/gf128mul.c 2011-08-23 21:47:55.000000000 -0400 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 for (i = 0; i < 7; ++i) gf128mul_x_lle(&p[i + 1], &p[i]); @@ -23126,9 +23331,9 @@ diff -urNp linux-3.0.7/crypto/gf128mul.c linux-3.0.7/crypto/gf128mul.c for (i = 0;;) { u8 ch = ((u8 *)b)[i]; -diff -urNp linux-3.0.7/crypto/serpent.c linux-3.0.7/crypto/serpent.c ---- linux-3.0.7/crypto/serpent.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/crypto/serpent.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/crypto/serpent.c linux-3.0.8/crypto/serpent.c +--- linux-3.0.8/crypto/serpent.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/crypto/serpent.c 2011-08-23 21:48:14.000000000 -0400 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_ u32 r0,r1,r2,r3,r4; int i; @@ -23138,9 +23343,166 @@ diff -urNp linux-3.0.7/crypto/serpent.c linux-3.0.7/crypto/serpent.c /* Copy key, add padding */ for (i = 0; i < keylen; ++i) -diff -urNp linux-3.0.7/drivers/acpi/apei/cper.c linux-3.0.7/drivers/acpi/apei/cper.c ---- linux-3.0.7/drivers/acpi/apei/cper.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/acpi/apei/cper.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/Documentation/dontdiff linux-3.0.8/Documentation/dontdiff +--- linux-3.0.8/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/Documentation/dontdiff 2011-10-20 04:46:01.000000000 -0400 +@@ -5,6 +5,7 @@ + *.cis + *.cpio + *.csp ++*.dbg + *.dsp + *.dvi + *.elf +@@ -48,9 +49,11 @@ + *.tab.h + *.tex + *.ver ++*.vim + *.xml + *.xz + *_MODULES ++*_reg_safe.h + *_vga16.c + *~ + \#*# +@@ -70,6 +73,7 @@ Kerntypes + Module.markers + Module.symvers + PENDING ++PERF* + SCCS + System.map* + TAGS +@@ -98,14 +102,18 @@ bzImage* + capability_names.h + capflags.c + classlist.h* ++clut_vga16.c ++common-cmds.h + comp*.log + compile.h* + conf + config + config-* + config_data.h* ++config.c + config.mak + config.mak.autogen ++config.tmp + conmakehash + consolemap_deftbl.c* + cpustr.h +@@ -126,12 +134,14 @@ fore200e_pca_fw.c* + gconf + gconf.glade.h + gen-devlist ++gen-kdb_cmds.c + gen_crc32table + gen_init_cpio + generated + genheaders + genksyms + *_gray256.c ++hash + hpet_example + hugepage-mmap + hugepage-shm +@@ -146,7 +156,7 @@ int32.c + int4.c + int8.c + kallsyms +-kconfig ++kern_constants.h + keywords.c + ksym.c* + ksym.h* +@@ -154,7 +164,6 @@ kxgettext + lkc_defs.h + lex.c + lex.*.c +-linux + logo_*.c + logo_*_clut224.c + logo_*_mono.c +@@ -166,7 +175,6 @@ machtypes.h + map + map_hugetlb + maui_boot.h +-media + mconf + miboot* + mk_elfconfig +@@ -174,6 +182,7 @@ mkboot + mkbugboot + mkcpustr + mkdep ++mkpiggy + mkprep + mkregtable + mktables +@@ -209,6 +218,7 @@ r300_reg_safe.h + r420_reg_safe.h + r600_reg_safe.h + recordmcount ++regdb.c + relocs + rlim_names.h + rn50_reg_safe.h +@@ -219,6 +229,7 @@ setup + setup.bin + setup.elf + sImage ++slabinfo + sm_tbl* + split-include + syscalltab.h +@@ -229,6 +240,7 @@ tftpboot.img + timeconst.h + times.h* + trix_boot.h ++user_constants.h + utsrelease.h* + vdso-syms.lds + vdso.lds +@@ -246,7 +258,9 @@ vmlinux + vmlinux-* + vmlinux.aout + vmlinux.bin.all ++vmlinux.bin.bz2 + vmlinux.lds ++vmlinux.relocs + vmlinuz + voffset.h + vsyscall.lds +@@ -254,6 +268,7 @@ vsyscall_32.lds + wanxlfw.inc + uImage + unifdef ++utsrelease.h + wakeup.bin + wakeup.elf + wakeup.lds +diff -urNp linux-3.0.8/Documentation/kernel-parameters.txt linux-3.0.8/Documentation/kernel-parameters.txt +--- linux-3.0.8/Documentation/kernel-parameters.txt 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/Documentation/kernel-parameters.txt 2011-08-23 21:47:55.000000000 -0400 +@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes + the specified number of seconds. This is to be used if + your oopses keep scrolling off the screen. + ++ pax_nouderef [X86] disables UDEREF. Most likely needed under certain ++ virtualization environments that don't cope well with the ++ expand down segment used by UDEREF on X86-32 or the frequent ++ page table updates on X86-64. ++ ++ pax_softmode= 0/1 to disable/enable PaX softmode on boot already. ++ + pcbit= [HW,ISDN] + + pcd. [PARIDE] +diff -urNp linux-3.0.8/drivers/acpi/apei/cper.c linux-3.0.8/drivers/acpi/apei/cper.c +--- linux-3.0.8/drivers/acpi/apei/cper.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/acpi/apei/cper.c 2011-08-23 21:47:55.000000000 -0400 @@ -38,12 +38,12 @@ */ u64 cper_next_record_id(void) @@ -23158,9 +23520,9 @@ diff -urNp linux-3.0.7/drivers/acpi/apei/cper.c linux-3.0.7/drivers/acpi/apei/cp } EXPORT_SYMBOL_GPL(cper_next_record_id); -diff -urNp linux-3.0.7/drivers/acpi/ec_sys.c linux-3.0.7/drivers/acpi/ec_sys.c ---- linux-3.0.7/drivers/acpi/ec_sys.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/acpi/ec_sys.c 2011-08-24 19:06:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/acpi/ec_sys.c linux-3.0.8/drivers/acpi/ec_sys.c +--- linux-3.0.8/drivers/acpi/ec_sys.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/acpi/ec_sys.c 2011-08-24 19:06:55.000000000 -0400 @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/acpi.h> @@ -23210,9 +23572,9 @@ diff -urNp linux-3.0.7/drivers/acpi/ec_sys.c linux-3.0.7/drivers/acpi/ec_sys.c err = ec_write(*off, byte_write); if (err) return err; -diff -urNp linux-3.0.7/drivers/acpi/proc.c linux-3.0.7/drivers/acpi/proc.c ---- linux-3.0.7/drivers/acpi/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/acpi/proc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/acpi/proc.c linux-3.0.8/drivers/acpi/proc.c +--- linux-3.0.8/drivers/acpi/proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/acpi/proc.c 2011-08-23 21:47:55.000000000 -0400 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -23247,9 +23609,9 @@ diff -urNp linux-3.0.7/drivers/acpi/proc.c linux-3.0.7/drivers/acpi/proc.c if (device_can_wakeup(&dev->dev)) { bool enable = !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); -diff -urNp linux-3.0.7/drivers/acpi/processor_driver.c linux-3.0.7/drivers/acpi/processor_driver.c ---- linux-3.0.7/drivers/acpi/processor_driver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/acpi/processor_driver.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/acpi/processor_driver.c linux-3.0.8/drivers/acpi/processor_driver.c +--- linux-3.0.8/drivers/acpi/processor_driver.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/acpi/processor_driver.c 2011-08-23 21:47:55.000000000 -0400 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( return 0; #endif @@ -23259,9 +23621,9 @@ diff -urNp linux-3.0.7/drivers/acpi/processor_driver.c linux-3.0.7/drivers/acpi/ /* * Buggy BIOS check -diff -urNp linux-3.0.7/drivers/ata/libata-core.c linux-3.0.7/drivers/ata/libata-core.c ---- linux-3.0.7/drivers/ata/libata-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ata/libata-core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ata/libata-core.c linux-3.0.8/drivers/ata/libata-core.c +--- linux-3.0.8/drivers/ata/libata-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ata/libata-core.c 2011-08-23 21:47:55.000000000 -0400 @@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -23299,9 +23661,9 @@ diff -urNp linux-3.0.7/drivers/ata/libata-core.c linux-3.0.7/drivers/ata/libata- spin_unlock(&lock); } -diff -urNp linux-3.0.7/drivers/ata/libata-eh.c linux-3.0.7/drivers/ata/libata-eh.c ---- linux-3.0.7/drivers/ata/libata-eh.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ata/libata-eh.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ata/libata-eh.c linux-3.0.8/drivers/ata/libata-eh.c +--- linux-3.0.8/drivers/ata/libata-eh.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ata/libata-eh.c 2011-08-23 21:48:14.000000000 -0400 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; @@ -23311,9 +23673,9 @@ diff -urNp linux-3.0.7/drivers/ata/libata-eh.c linux-3.0.7/drivers/ata/libata-eh ata_for_each_link(link, ap, HOST_FIRST) ata_eh_link_report(link); } -diff -urNp linux-3.0.7/drivers/ata/pata_arasan_cf.c linux-3.0.7/drivers/ata/pata_arasan_cf.c ---- linux-3.0.7/drivers/ata/pata_arasan_cf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ata/pata_arasan_cf.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ata/pata_arasan_cf.c linux-3.0.8/drivers/ata/pata_arasan_cf.c +--- linux-3.0.8/drivers/ata/pata_arasan_cf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ata/pata_arasan_cf.c 2011-08-23 21:47:55.000000000 -0400 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str /* Handle platform specific quirks */ if (pdata->quirk) { @@ -23325,9 +23687,9 @@ diff -urNp linux-3.0.7/drivers/ata/pata_arasan_cf.c linux-3.0.7/drivers/ata/pata ap->pio_mask = 0; } if (pdata->quirk & CF_BROKEN_MWDMA) -diff -urNp linux-3.0.7/drivers/atm/adummy.c linux-3.0.7/drivers/atm/adummy.c ---- linux-3.0.7/drivers/atm/adummy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/adummy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/adummy.c linux-3.0.8/drivers/atm/adummy.c +--- linux-3.0.8/drivers/atm/adummy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/adummy.c 2011-08-23 21:47:55.000000000 -0400 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -23337,9 +23699,9 @@ diff -urNp linux-3.0.7/drivers/atm/adummy.c linux-3.0.7/drivers/atm/adummy.c return 0; } -diff -urNp linux-3.0.7/drivers/atm/ambassador.c linux-3.0.7/drivers/atm/ambassador.c ---- linux-3.0.7/drivers/atm/ambassador.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/ambassador.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/ambassador.c linux-3.0.8/drivers/atm/ambassador.c +--- linux-3.0.8/drivers/atm/ambassador.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/ambassador.c 2011-08-23 21:47:55.000000000 -0400 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -23376,9 +23738,9 @@ diff -urNp linux-3.0.7/drivers/atm/ambassador.c linux-3.0.7/drivers/atm/ambassad return -ENOMEM; // ? } -diff -urNp linux-3.0.7/drivers/atm/atmtcp.c linux-3.0.7/drivers/atm/atmtcp.c ---- linux-3.0.7/drivers/atm/atmtcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/atmtcp.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/atmtcp.c linux-3.0.8/drivers/atm/atmtcp.c +--- linux-3.0.8/drivers/atm/atmtcp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/atmtcp.c 2011-08-23 21:47:55.000000000 -0400 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -23428,9 +23790,9 @@ diff -urNp linux-3.0.7/drivers/atm/atmtcp.c linux-3.0.7/drivers/atm/atmtcp.c done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-3.0.7/drivers/atm/eni.c linux-3.0.7/drivers/atm/eni.c ---- linux-3.0.7/drivers/atm/eni.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/eni.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/eni.c linux-3.0.8/drivers/atm/eni.c +--- linux-3.0.8/drivers/atm/eni.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/eni.c 2011-10-11 10:44:33.000000000 -0400 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -23485,9 +23847,9 @@ diff -urNp linux-3.0.7/drivers/atm/eni.c linux-3.0.7/drivers/atm/eni.c "MMF", "SMF", "MMF", "03?", /* 0- 3 */ "UTP", "05?", "06?", "07?", /* 4- 7 */ "TAXI","09?", "10?", "11?", /* 8-11 */ -diff -urNp linux-3.0.7/drivers/atm/firestream.c linux-3.0.7/drivers/atm/firestream.c ---- linux-3.0.7/drivers/atm/firestream.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/firestream.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/firestream.c linux-3.0.8/drivers/atm/firestream.c +--- linux-3.0.8/drivers/atm/firestream.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/firestream.c 2011-08-23 21:47:55.000000000 -0400 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct } } @@ -23521,9 +23883,9 @@ diff -urNp linux-3.0.7/drivers/atm/firestream.c linux-3.0.7/drivers/atm/firestre 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-3.0.7/drivers/atm/fore200e.c linux-3.0.7/drivers/atm/fore200e.c ---- linux-3.0.7/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/fore200e.c linux-3.0.8/drivers/atm/fore200e.c +--- linux-3.0.8/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -23580,9 +23942,9 @@ diff -urNp linux-3.0.7/drivers/atm/fore200e.c linux-3.0.7/drivers/atm/fore200e.c fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-3.0.7/drivers/atm/he.c linux-3.0.7/drivers/atm/he.c ---- linux-3.0.7/drivers/atm/he.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/he.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/he.c linux-3.0.8/drivers/atm/he.c +--- linux-3.0.8/drivers/atm/he.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/he.c 2011-08-23 21:47:55.000000000 -0400 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -23664,9 +24026,9 @@ diff -urNp linux-3.0.7/drivers/atm/he.c linux-3.0.7/drivers/atm/he.c return 0; } -diff -urNp linux-3.0.7/drivers/atm/horizon.c linux-3.0.7/drivers/atm/horizon.c ---- linux-3.0.7/drivers/atm/horizon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/horizon.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/horizon.c linux-3.0.8/drivers/atm/horizon.c +--- linux-3.0.8/drivers/atm/horizon.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/horizon.c 2011-08-23 21:47:55.000000000 -0400 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -23685,9 +24047,9 @@ diff -urNp linux-3.0.7/drivers/atm/horizon.c linux-3.0.7/drivers/atm/horizon.c // free the skb hrz_kfree_skb (skb); -diff -urNp linux-3.0.7/drivers/atm/idt77252.c linux-3.0.7/drivers/atm/idt77252.c ---- linux-3.0.7/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/idt77252.c linux-3.0.8/drivers/atm/idt77252.c +--- linux-3.0.8/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -23842,9 +24204,9 @@ diff -urNp linux-3.0.7/drivers/atm/idt77252.c linux-3.0.7/drivers/atm/idt77252.c return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-3.0.7/drivers/atm/iphase.c linux-3.0.7/drivers/atm/iphase.c ---- linux-3.0.7/drivers/atm/iphase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/iphase.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/iphase.c linux-3.0.8/drivers/atm/iphase.c +--- linux-3.0.8/drivers/atm/iphase.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/iphase.c 2011-08-23 21:47:55.000000000 -0400 @@ -1120,7 +1120,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)) @@ -23941,9 +24303,9 @@ diff -urNp linux-3.0.7/drivers/atm/iphase.c linux-3.0.7/drivers/atm/iphase.c 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-3.0.7/drivers/atm/lanai.c linux-3.0.7/drivers/atm/lanai.c ---- linux-3.0.7/drivers/atm/lanai.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/lanai.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/lanai.c linux-3.0.8/drivers/atm/lanai.c +--- linux-3.0.8/drivers/atm/lanai.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/lanai.c 2011-08-23 21:47:55.000000000 -0400 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -23998,9 +24360,9 @@ diff -urNp linux-3.0.7/drivers/atm/lanai.c linux-3.0.7/drivers/atm/lanai.c 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-3.0.7/drivers/atm/nicstar.c linux-3.0.7/drivers/atm/nicstar.c ---- linux-3.0.7/drivers/atm/nicstar.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/nicstar.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/nicstar.c linux-3.0.8/drivers/atm/nicstar.c +--- linux-3.0.8/drivers/atm/nicstar.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/nicstar.c 2011-08-23 21:47:55.000000000 -0400 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", @@ -24202,9 +24564,9 @@ diff -urNp linux-3.0.7/drivers/atm/nicstar.c linux-3.0.7/drivers/atm/nicstar.c } } -diff -urNp linux-3.0.7/drivers/atm/solos-pci.c linux-3.0.7/drivers/atm/solos-pci.c ---- linux-3.0.7/drivers/atm/solos-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/solos-pci.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/solos-pci.c linux-3.0.8/drivers/atm/solos-pci.c +--- linux-3.0.8/drivers/atm/solos-pci.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/solos-pci.c 2011-08-23 21:48:14.000000000 -0400 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -24232,9 +24594,9 @@ diff -urNp linux-3.0.7/drivers/atm/solos-pci.c linux-3.0.7/drivers/atm/solos-pci solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-3.0.7/drivers/atm/suni.c linux-3.0.7/drivers/atm/suni.c ---- linux-3.0.7/drivers/atm/suni.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/suni.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/suni.c linux-3.0.8/drivers/atm/suni.c +--- linux-3.0.8/drivers/atm/suni.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/suni.c 2011-08-23 21:47:55.000000000 -0400 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -24246,9 +24608,9 @@ diff -urNp linux-3.0.7/drivers/atm/suni.c linux-3.0.7/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-3.0.7/drivers/atm/uPD98402.c linux-3.0.7/drivers/atm/uPD98402.c ---- linux-3.0.7/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/uPD98402.c linux-3.0.8/drivers/atm/uPD98402.c +--- linux-3.0.8/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -24293,9 +24655,9 @@ diff -urNp linux-3.0.7/drivers/atm/uPD98402.c linux-3.0.7/drivers/atm/uPD98402.c return 0; } -diff -urNp linux-3.0.7/drivers/atm/zatm.c linux-3.0.7/drivers/atm/zatm.c ---- linux-3.0.7/drivers/atm/zatm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/atm/zatm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/atm/zatm.c linux-3.0.8/drivers/atm/zatm.c +--- linux-3.0.8/drivers/atm/zatm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/atm/zatm.c 2011-08-23 21:47:55.000000000 -0400 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -24323,9 +24685,9 @@ diff -urNp linux-3.0.7/drivers/atm/zatm.c linux-3.0.7/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-3.0.7/drivers/base/devtmpfs.c linux-3.0.7/drivers/base/devtmpfs.c ---- linux-3.0.7/drivers/base/devtmpfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/base/devtmpfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/base/devtmpfs.c linux-3.0.8/drivers/base/devtmpfs.c +--- linux-3.0.8/drivers/base/devtmpfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/base/devtmpfs.c 2011-10-06 04:17:55.000000000 -0400 @@ -357,7 +357,7 @@ int devtmpfs_mount(const char *mntdir) if (!dev_mnt) return 0; @@ -24335,9 +24697,9 @@ diff -urNp linux-3.0.7/drivers/base/devtmpfs.c linux-3.0.7/drivers/base/devtmpfs if (err) printk(KERN_INFO "devtmpfs: error mounting %i\n", err); else -diff -urNp linux-3.0.7/drivers/base/power/wakeup.c linux-3.0.7/drivers/base/power/wakeup.c ---- linux-3.0.7/drivers/base/power/wakeup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/base/power/wakeup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/base/power/wakeup.c linux-3.0.8/drivers/base/power/wakeup.c +--- linux-3.0.8/drivers/base/power/wakeup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/base/power/wakeup.c 2011-08-23 21:47:55.000000000 -0400 @@ -29,14 +29,14 @@ bool events_check_enabled; * They need to be modified together atomically, so it's better to use one * atomic variable to hold them both. @@ -24373,21 +24735,9 @@ diff -urNp linux-3.0.7/drivers/base/power/wakeup.c linux-3.0.7/drivers/base/powe } /** -diff -urNp linux-3.0.7/drivers/block/DAC960.c linux-3.0.7/drivers/block/DAC960.c ---- linux-3.0.7/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur - unsigned long flags; - int Channel, TargetID; - -+ pax_track_stack(); -+ - if (!init_dma_loaf(Controller->PCIDevice, &local_dma, - DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + - sizeof(DAC960_SCSI_Inquiry_T) + -diff -urNp linux-3.0.7/drivers/block/cciss.c linux-3.0.7/drivers/block/cciss.c ---- linux-3.0.7/drivers/block/cciss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/cciss.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c +--- linux-3.0.8/drivers/block/cciss.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/cciss.c 2011-08-23 21:48:14.000000000 -0400 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct int err; u32 cp; @@ -24511,9 +24861,9 @@ diff -urNp linux-3.0.7/drivers/block/cciss.c linux-3.0.7/drivers/block/cciss.c free_irq(h->intr[PERF_MODE_INT], h); } -diff -urNp linux-3.0.7/drivers/block/cciss.h linux-3.0.7/drivers/block/cciss.h ---- linux-3.0.7/drivers/block/cciss.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/block/cciss.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/cciss.h linux-3.0.8/drivers/block/cciss.h +--- linux-3.0.8/drivers/block/cciss.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/block/cciss.h 2011-08-23 21:47:55.000000000 -0400 @@ -100,7 +100,7 @@ struct ctlr_info /* information about each logical volume */ drive_info_struct *drv[CISS_MAX_LUN]; @@ -24523,9 +24873,9 @@ diff -urNp linux-3.0.7/drivers/block/cciss.h linux-3.0.7/drivers/block/cciss.h /* queue and queue Info */ struct list_head reqQ; -diff -urNp linux-3.0.7/drivers/block/cpqarray.c linux-3.0.7/drivers/block/cpqarray.c ---- linux-3.0.7/drivers/block/cpqarray.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/cpqarray.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/cpqarray.c linux-3.0.8/drivers/block/cpqarray.c +--- linux-3.0.8/drivers/block/cpqarray.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/cpqarray.c 2011-08-23 21:48:14.000000000 -0400 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) { goto Enomem4; @@ -24651,9 +25001,9 @@ diff -urNp linux-3.0.7/drivers/block/cpqarray.c linux-3.0.7/drivers/block/cpqarr if (done == 0) { udelay(10); /* a short fixed delay */ } else -diff -urNp linux-3.0.7/drivers/block/cpqarray.h linux-3.0.7/drivers/block/cpqarray.h ---- linux-3.0.7/drivers/block/cpqarray.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/cpqarray.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/cpqarray.h linux-3.0.8/drivers/block/cpqarray.h +--- linux-3.0.8/drivers/block/cpqarray.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/cpqarray.h 2011-08-23 21:47:55.000000000 -0400 @@ -99,7 +99,7 @@ struct ctlr_info { drv_info_t drv[NWD]; struct proc_dir_entry *proc; @@ -24663,9 +25013,21 @@ diff -urNp linux-3.0.7/drivers/block/cpqarray.h linux-3.0.7/drivers/block/cpqarr cmdlist_t *reqQ; cmdlist_t *cmpQ; -diff -urNp linux-3.0.7/drivers/block/drbd/drbd_int.h linux-3.0.7/drivers/block/drbd/drbd_int.h ---- linux-3.0.7/drivers/block/drbd/drbd_int.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/drbd/drbd_int.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/DAC960.c linux-3.0.8/drivers/block/DAC960.c +--- linux-3.0.8/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400 +@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur + unsigned long flags; + int Channel, TargetID; + ++ pax_track_stack(); ++ + if (!init_dma_loaf(Controller->PCIDevice, &local_dma, + DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + + sizeof(DAC960_SCSI_Inquiry_T) + +diff -urNp linux-3.0.8/drivers/block/drbd/drbd_int.h linux-3.0.8/drivers/block/drbd/drbd_int.h +--- linux-3.0.8/drivers/block/drbd/drbd_int.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/drbd/drbd_int.h 2011-10-06 04:17:55.000000000 -0400 @@ -737,7 +737,7 @@ struct drbd_request; struct drbd_epoch { struct list_head list; @@ -24723,9 +25085,9 @@ diff -urNp linux-3.0.7/drivers/block/drbd/drbd_int.h linux-3.0.7/drivers/block/d } void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo); -diff -urNp linux-3.0.7/drivers/block/drbd/drbd_main.c linux-3.0.7/drivers/block/drbd/drbd_main.c ---- linux-3.0.7/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/drbd/drbd_main.c linux-3.0.8/drivers/block/drbd/drbd_main.c +--- linux-3.0.8/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co p.sector = sector; p.block_id = block_id; @@ -24764,9 +25126,9 @@ diff -urNp linux-3.0.7/drivers/block/drbd/drbd_main.c linux-3.0.7/drivers/block/ mdev->al_writ_cnt = mdev->bm_writ_cnt = mdev->read_cnt = -diff -urNp linux-3.0.7/drivers/block/drbd/drbd_nl.c linux-3.0.7/drivers/block/drbd/drbd_nl.c ---- linux-3.0.7/drivers/block/drbd/drbd_nl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/drbd/drbd_nl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/drbd/drbd_nl.c linux-3.0.8/drivers/block/drbd/drbd_nl.c +--- linux-3.0.8/drivers/block/drbd/drbd_nl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/drbd/drbd_nl.c 2011-08-23 21:47:55.000000000 -0400 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru module_put(THIS_MODULE); } @@ -24812,9 +25174,9 @@ diff -urNp linux-3.0.7/drivers/block/drbd/drbd_nl.c linux-3.0.7/drivers/block/dr cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -diff -urNp linux-3.0.7/drivers/block/drbd/drbd_receiver.c linux-3.0.7/drivers/block/drbd/drbd_receiver.c ---- linux-3.0.7/drivers/block/drbd/drbd_receiver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/drbd/drbd_receiver.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/drbd/drbd_receiver.c linux-3.0.8/drivers/block/drbd/drbd_receiver.c +--- linux-3.0.8/drivers/block/drbd/drbd_receiver.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/drbd/drbd_receiver.c 2011-08-23 21:47:55.000000000 -0400 @@ -894,7 +894,7 @@ retry: sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10; sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; @@ -24900,9 +25262,9 @@ diff -urNp linux-3.0.7/drivers/block/drbd/drbd_receiver.c linux-3.0.7/drivers/bl D_ASSERT(list_empty(&mdev->current_epoch->list)); } -diff -urNp linux-3.0.7/drivers/block/loop.c linux-3.0.7/drivers/block/loop.c ---- linux-3.0.7/drivers/block/loop.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/drivers/block/loop.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/loop.c linux-3.0.8/drivers/block/loop.c +--- linux-3.0.8/drivers/block/loop.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/loop.c 2011-10-06 04:17:55.000000000 -0400 @@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil mm_segment_t old_fs = get_fs(); @@ -24912,9 +25274,9 @@ diff -urNp linux-3.0.7/drivers/block/loop.c linux-3.0.7/drivers/block/loop.c set_fs(old_fs); if (likely(bw == len)) return 0; -diff -urNp linux-3.0.7/drivers/block/nbd.c linux-3.0.7/drivers/block/nbd.c ---- linux-3.0.7/drivers/block/nbd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/block/nbd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/block/nbd.c linux-3.0.8/drivers/block/nbd.c +--- linux-3.0.8/drivers/block/nbd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/block/nbd.c 2011-08-23 21:48:14.000000000 -0400 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device * struct kvec iov; sigset_t blocked, oldset; @@ -24933,30 +25295,9 @@ diff -urNp linux-3.0.7/drivers/block/nbd.c linux-3.0.7/drivers/block/nbd.c switch (cmd) { case NBD_DISCONNECT: { struct request sreq; -diff -urNp linux-3.0.7/drivers/char/Kconfig linux-3.0.7/drivers/char/Kconfig ---- linux-3.0.7/drivers/char/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/Kconfig 2011-08-23 21:48:14.000000000 -0400 -@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig" - - config DEVKMEM - bool "/dev/kmem virtual device support" -- default y -+ default n -+ depends on !GRKERNSEC_KMEM - help - Say Y here if you want to support the /dev/kmem device. The - /dev/kmem device is rarely used, but can be used for certain -@@ -596,6 +597,7 @@ config DEVPORT - bool - depends on !M68K - depends on ISA || PCI -+ depends on !GRKERNSEC_KMEM - default y - - source "drivers/s390/char/Kconfig" -diff -urNp linux-3.0.7/drivers/char/agp/frontend.c linux-3.0.7/drivers/char/agp/frontend.c ---- linux-3.0.7/drivers/char/agp/frontend.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/agp/frontend.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/agp/frontend.c linux-3.0.8/drivers/char/agp/frontend.c +--- linux-3.0.8/drivers/char/agp/frontend.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/agp/frontend.c 2011-08-23 21:47:55.000000000 -0400 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -24966,9 +25307,9 @@ diff -urNp linux-3.0.7/drivers/char/agp/frontend.c linux-3.0.7/drivers/char/agp/ return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-3.0.7/drivers/char/briq_panel.c linux-3.0.7/drivers/char/briq_panel.c ---- linux-3.0.7/drivers/char/briq_panel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/briq_panel.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/briq_panel.c linux-3.0.8/drivers/char/briq_panel.c +--- linux-3.0.8/drivers/char/briq_panel.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/briq_panel.c 2011-08-23 21:48:14.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/types.h> #include <linux/errno.h> @@ -25010,9 +25351,9 @@ diff -urNp linux-3.0.7/drivers/char/briq_panel.c linux-3.0.7/drivers/char/briq_p return len; } -diff -urNp linux-3.0.7/drivers/char/genrtc.c linux-3.0.7/drivers/char/genrtc.c ---- linux-3.0.7/drivers/char/genrtc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/genrtc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/genrtc.c linux-3.0.8/drivers/char/genrtc.c +--- linux-3.0.8/drivers/char/genrtc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/genrtc.c 2011-08-23 21:48:14.000000000 -0400 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi switch (cmd) { @@ -25021,9 +25362,9 @@ diff -urNp linux-3.0.7/drivers/char/genrtc.c linux-3.0.7/drivers/char/genrtc.c if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-3.0.7/drivers/char/hpet.c linux-3.0.7/drivers/char/hpet.c ---- linux-3.0.7/drivers/char/hpet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/hpet.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/hpet.c linux-3.0.8/drivers/char/hpet.c +--- linux-3.0.8/drivers/char/hpet.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/hpet.c 2011-08-23 21:47:55.000000000 -0400 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di } @@ -25033,9 +25374,9 @@ diff -urNp linux-3.0.7/drivers/char/hpet.c linux-3.0.7/drivers/char/hpet.c struct hpet_info *info) { struct hpet_timer __iomem *timer; -diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c ---- linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c +--- linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c 2011-08-23 21:48:14.000000000 -0400 @@ -415,7 +415,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -25075,9 +25416,9 @@ diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.7/drivers/c si = (struct ipmi_system_interface_addr *) &addr; si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel = IPMI_BMC_CHANNEL; -diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c ---- linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c +--- linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c 2011-08-23 21:47:55.000000000 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -25108,9 +25449,30 @@ diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.7/drivers/char new_smi->interrupt_disabled = 1; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-3.0.7/drivers/char/mbcs.c linux-3.0.7/drivers/char/mbcs.c ---- linux-3.0.7/drivers/char/mbcs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/mbcs.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/Kconfig linux-3.0.8/drivers/char/Kconfig +--- linux-3.0.8/drivers/char/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/Kconfig 2011-08-23 21:48:14.000000000 -0400 +@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig" + + config DEVKMEM + bool "/dev/kmem virtual device support" +- default y ++ default n ++ depends on !GRKERNSEC_KMEM + help + Say Y here if you want to support the /dev/kmem device. The + /dev/kmem device is rarely used, but can be used for certain +@@ -596,6 +597,7 @@ config DEVPORT + bool + depends on !M68K + depends on ISA || PCI ++ depends on !GRKERNSEC_KMEM + default y + + source "drivers/s390/char/Kconfig" +diff -urNp linux-3.0.8/drivers/char/mbcs.c linux-3.0.8/drivers/char/mbcs.c +--- linux-3.0.8/drivers/char/mbcs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/mbcs.c 2011-10-11 10:44:33.000000000 -0400 @@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de return 0; } @@ -25120,9 +25482,9 @@ diff -urNp linux-3.0.7/drivers/char/mbcs.c linux-3.0.7/drivers/char/mbcs.c { .part_num = MBCS_PART_NUM, .mfg_num = MBCS_MFG_NUM, -diff -urNp linux-3.0.7/drivers/char/mem.c linux-3.0.7/drivers/char/mem.c ---- linux-3.0.7/drivers/char/mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/mem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/mem.c linux-3.0.8/drivers/char/mem.c +--- linux-3.0.8/drivers/char/mem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/mem.c 2011-08-23 21:48:14.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -25255,9 +25617,9 @@ diff -urNp linux-3.0.7/drivers/char/mem.c linux-3.0.7/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-3.0.7/drivers/char/nvram.c linux-3.0.7/drivers/char/nvram.c ---- linux-3.0.7/drivers/char/nvram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/nvram.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/nvram.c linux-3.0.8/drivers/char/nvram.c +--- linux-3.0.8/drivers/char/nvram.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/nvram.c 2011-08-23 21:47:55.000000000 -0400 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f spin_unlock_irq(&rtc_lock); @@ -25267,9 +25629,9 @@ diff -urNp linux-3.0.7/drivers/char/nvram.c linux-3.0.7/drivers/char/nvram.c return -EFAULT; *ppos = i; -diff -urNp linux-3.0.7/drivers/char/random.c linux-3.0.7/drivers/char/random.c ---- linux-3.0.7/drivers/char/random.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/char/random.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/random.c linux-3.0.8/drivers/char/random.c +--- linux-3.0.8/drivers/char/random.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/char/random.c 2011-08-23 21:48:14.000000000 -0400 @@ -261,8 +261,13 @@ /* * Configuration information @@ -25320,9 +25682,9 @@ diff -urNp linux-3.0.7/drivers/char/random.c linux-3.0.7/drivers/char/random.c static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-3.0.7/drivers/char/sonypi.c linux-3.0.7/drivers/char/sonypi.c ---- linux-3.0.7/drivers/char/sonypi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/sonypi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/sonypi.c linux-3.0.8/drivers/char/sonypi.c +--- linux-3.0.8/drivers/char/sonypi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/sonypi.c 2011-08-23 21:47:55.000000000 -0400 @@ -55,6 +55,7 @@ #include <asm/uaccess.h> #include <asm/io.h> @@ -25361,30 +25723,9 @@ diff -urNp linux-3.0.7/drivers/char/sonypi.c linux-3.0.7/drivers/char/sonypi.c mutex_unlock(&sonypi_device.lock); return 0; -diff -urNp linux-3.0.7/drivers/char/tpm/tpm.c linux-3.0.7/drivers/char/tpm/tpm.c ---- linux-3.0.7/drivers/char/tpm/tpm.c 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/drivers/char/tpm/tpm.c 2011-10-16 21:55:27.000000000 -0400 -@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c - chip->vendor.req_complete_val) - goto out_recv; - -- if ((status == chip->vendor.req_canceled)) { -+ if (status == chip->vendor.req_canceled) { - dev_err(chip->dev, "Operation Canceled\n"); - rc = -ECANCELED; - goto out; -@@ -847,6 +847,8 @@ ssize_t tpm_show_pubek(struct device *de - - struct tpm_chip *chip = dev_get_drvdata(dev); - -+ pax_track_stack(); -+ - tpm_cmd.header.in = tpm_readpubek_header; - err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, - "attempting to read the PUBEK"); -diff -urNp linux-3.0.7/drivers/char/tpm/tpm_bios.c linux-3.0.7/drivers/char/tpm/tpm_bios.c ---- linux-3.0.7/drivers/char/tpm/tpm_bios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/tpm/tpm_bios.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/tpm/tpm_bios.c linux-3.0.8/drivers/char/tpm/tpm_bios.c +--- linux-3.0.8/drivers/char/tpm/tpm_bios.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/tpm/tpm_bios.c 2011-10-06 04:17:55.000000000 -0400 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -25428,9 +25769,30 @@ diff -urNp linux-3.0.7/drivers/char/tpm/tpm_bios.c linux-3.0.7/drivers/char/tpm/ acpi_os_unmap_memory(virt, len); return 0; -diff -urNp linux-3.0.7/drivers/char/virtio_console.c linux-3.0.7/drivers/char/virtio_console.c ---- linux-3.0.7/drivers/char/virtio_console.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/char/virtio_console.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/char/tpm/tpm.c linux-3.0.8/drivers/char/tpm/tpm.c +--- linux-3.0.8/drivers/char/tpm/tpm.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/char/tpm/tpm.c 2011-10-16 21:55:27.000000000 -0400 +@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c + chip->vendor.req_complete_val) + goto out_recv; + +- if ((status == chip->vendor.req_canceled)) { ++ if (status == chip->vendor.req_canceled) { + dev_err(chip->dev, "Operation Canceled\n"); + rc = -ECANCELED; + goto out; +@@ -847,6 +847,8 @@ ssize_t tpm_show_pubek(struct device *de + + struct tpm_chip *chip = dev_get_drvdata(dev); + ++ pax_track_stack(); ++ + tpm_cmd.header.in = tpm_readpubek_header; + err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, + "attempting to read the PUBEK"); +diff -urNp linux-3.0.8/drivers/char/virtio_console.c linux-3.0.8/drivers/char/virtio_console.c +--- linux-3.0.8/drivers/char/virtio_console.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/char/virtio_console.c 2011-10-06 04:17:55.000000000 -0400 @@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port if (to_user) { ssize_t ret; @@ -25449,9 +25811,9 @@ diff -urNp linux-3.0.7/drivers/char/virtio_console.c linux-3.0.7/drivers/char/vi } static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, -diff -urNp linux-3.0.7/drivers/crypto/hifn_795x.c linux-3.0.7/drivers/crypto/hifn_795x.c ---- linux-3.0.7/drivers/crypto/hifn_795x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/crypto/hifn_795x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/crypto/hifn_795x.c linux-3.0.8/drivers/crypto/hifn_795x.c +--- linux-3.0.8/drivers/crypto/hifn_795x.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/crypto/hifn_795x.c 2011-08-23 21:48:14.000000000 -0400 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; @@ -25461,9 +25823,9 @@ diff -urNp linux-3.0.7/drivers/crypto/hifn_795x.c linux-3.0.7/drivers/crypto/hif memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); -diff -urNp linux-3.0.7/drivers/crypto/padlock-aes.c linux-3.0.7/drivers/crypto/padlock-aes.c ---- linux-3.0.7/drivers/crypto/padlock-aes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/crypto/padlock-aes.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/crypto/padlock-aes.c linux-3.0.8/drivers/crypto/padlock-aes.c +--- linux-3.0.8/drivers/crypto/padlock-aes.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/crypto/padlock-aes.c 2011-08-23 21:48:14.000000000 -0400 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm struct crypto_aes_ctx gen_aes; int cpu; @@ -25473,9 +25835,9 @@ diff -urNp linux-3.0.7/drivers/crypto/padlock-aes.c linux-3.0.7/drivers/crypto/p if (key_len % 8) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; -diff -urNp linux-3.0.7/drivers/dma/ioat/dma_v3.c linux-3.0.7/drivers/dma/ioat/dma_v3.c ---- linux-3.0.7/drivers/dma/ioat/dma_v3.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/dma/ioat/dma_v3.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/dma/ioat/dma_v3.c linux-3.0.8/drivers/dma/ioat/dma_v3.c +--- linux-3.0.8/drivers/dma/ioat/dma_v3.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/dma/ioat/dma_v3.c 2011-10-11 10:44:33.000000000 -0400 @@ -73,10 +73,10 @@ /* provide a lookup table for setting the source address in the base or * extended descriptor of an xor or pq descriptor @@ -25491,9 +25853,9 @@ diff -urNp linux-3.0.7/drivers/dma/ioat/dma_v3.c linux-3.0.7/drivers/dma/ioat/dm static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx) { -diff -urNp linux-3.0.7/drivers/edac/amd64_edac.c linux-3.0.7/drivers/edac/amd64_edac.c ---- linux-3.0.7/drivers/edac/amd64_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/amd64_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/amd64_edac.c linux-3.0.8/drivers/edac/amd64_edac.c +--- linux-3.0.8/drivers/edac/amd64_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/amd64_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i * PCI core identifies what devices are on a system during boot, and then * inquiry this table to see if this driver is for a given device found. @@ -25503,9 +25865,9 @@ diff -urNp linux-3.0.7/drivers/edac/amd64_edac.c linux-3.0.7/drivers/edac/amd64_ { .vendor = PCI_VENDOR_ID_AMD, .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL, -diff -urNp linux-3.0.7/drivers/edac/amd76x_edac.c linux-3.0.7/drivers/edac/amd76x_edac.c ---- linux-3.0.7/drivers/edac/amd76x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/amd76x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/amd76x_edac.c linux-3.0.8/drivers/edac/amd76x_edac.c +--- linux-3.0.8/drivers/edac/amd76x_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/amd76x_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one( edac_mc_free(mci); } @@ -25515,9 +25877,9 @@ diff -urNp linux-3.0.7/drivers/edac/amd76x_edac.c linux-3.0.7/drivers/edac/amd76 { PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD762}, -diff -urNp linux-3.0.7/drivers/edac/e752x_edac.c linux-3.0.7/drivers/edac/e752x_edac.c ---- linux-3.0.7/drivers/edac/e752x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/e752x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/e752x_edac.c linux-3.0.8/drivers/edac/e752x_edac.c +--- linux-3.0.8/drivers/edac/e752x_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/e752x_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s edac_mc_free(mci); } @@ -25527,9 +25889,9 @@ diff -urNp linux-3.0.7/drivers/edac/e752x_edac.c linux-3.0.7/drivers/edac/e752x_ { PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, E7520}, -diff -urNp linux-3.0.7/drivers/edac/e7xxx_edac.c linux-3.0.7/drivers/edac/e7xxx_edac.c ---- linux-3.0.7/drivers/edac/e7xxx_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/e7xxx_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/e7xxx_edac.c linux-3.0.8/drivers/edac/e7xxx_edac.c +--- linux-3.0.8/drivers/edac/e7xxx_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/e7xxx_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s edac_mc_free(mci); } @@ -25539,9 +25901,9 @@ diff -urNp linux-3.0.7/drivers/edac/e7xxx_edac.c linux-3.0.7/drivers/edac/e7xxx_ { PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, E7205}, -diff -urNp linux-3.0.7/drivers/edac/edac_pci_sysfs.c linux-3.0.7/drivers/edac/edac_pci_sysfs.c ---- linux-3.0.7/drivers/edac/edac_pci_sysfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/edac_pci_sysfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/edac_pci_sysfs.c linux-3.0.8/drivers/edac/edac_pci_sysfs.c +--- linux-3.0.8/drivers/edac/edac_pci_sysfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/edac_pci_sysfs.c 2011-08-23 21:47:55.000000000 -0400 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ @@ -25625,9 +25987,9 @@ diff -urNp linux-3.0.7/drivers/edac/edac_pci_sysfs.c linux-3.0.7/drivers/edac/ed panic("EDAC: PCI Parity Error"); } } -diff -urNp linux-3.0.7/drivers/edac/i3000_edac.c linux-3.0.7/drivers/edac/i3000_edac.c ---- linux-3.0.7/drivers/edac/i3000_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i3000_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i3000_edac.c linux-3.0.8/drivers/edac/i3000_edac.c +--- linux-3.0.8/drivers/edac/i3000_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i3000_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s edac_mc_free(mci); } @@ -25637,9 +25999,9 @@ diff -urNp linux-3.0.7/drivers/edac/i3000_edac.c linux-3.0.7/drivers/edac/i3000_ { PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I3000}, -diff -urNp linux-3.0.7/drivers/edac/i3200_edac.c linux-3.0.7/drivers/edac/i3200_edac.c ---- linux-3.0.7/drivers/edac/i3200_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i3200_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i3200_edac.c linux-3.0.8/drivers/edac/i3200_edac.c +--- linux-3.0.8/drivers/edac/i3200_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i3200_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s edac_mc_free(mci); } @@ -25649,9 +26011,9 @@ diff -urNp linux-3.0.7/drivers/edac/i3200_edac.c linux-3.0.7/drivers/edac/i3200_ { PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I3200}, -diff -urNp linux-3.0.7/drivers/edac/i5000_edac.c linux-3.0.7/drivers/edac/i5000_edac.c ---- linux-3.0.7/drivers/edac/i5000_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i5000_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i5000_edac.c linux-3.0.8/drivers/edac/i5000_edac.c +--- linux-3.0.8/drivers/edac/i5000_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i5000_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s * * The "E500P" device is the first device supported. @@ -25661,9 +26023,9 @@ diff -urNp linux-3.0.7/drivers/edac/i5000_edac.c linux-3.0.7/drivers/edac/i5000_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16), .driver_data = I5000P}, -diff -urNp linux-3.0.7/drivers/edac/i5100_edac.c linux-3.0.7/drivers/edac/i5100_edac.c ---- linux-3.0.7/drivers/edac/i5100_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i5100_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i5100_edac.c linux-3.0.8/drivers/edac/i5100_edac.c +--- linux-3.0.8/drivers/edac/i5100_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i5100_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s edac_mc_free(mci); } @@ -25673,9 +26035,9 @@ diff -urNp linux-3.0.7/drivers/edac/i5100_edac.c linux-3.0.7/drivers/edac/i5100_ /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) }, { 0, } -diff -urNp linux-3.0.7/drivers/edac/i5400_edac.c linux-3.0.7/drivers/edac/i5400_edac.c ---- linux-3.0.7/drivers/edac/i5400_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i5400_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i5400_edac.c linux-3.0.8/drivers/edac/i5400_edac.c +--- linux-3.0.8/drivers/edac/i5400_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i5400_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s * * The "E500P" device is the first device supported. @@ -25685,9 +26047,9 @@ diff -urNp linux-3.0.7/drivers/edac/i5400_edac.c linux-3.0.7/drivers/edac/i5400_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)}, {0,} /* 0 terminated list. */ }; -diff -urNp linux-3.0.7/drivers/edac/i7300_edac.c linux-3.0.7/drivers/edac/i7300_edac.c ---- linux-3.0.7/drivers/edac/i7300_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i7300_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i7300_edac.c linux-3.0.8/drivers/edac/i7300_edac.c +--- linux-3.0.8/drivers/edac/i7300_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i7300_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s * * Has only 8086:360c PCI ID @@ -25697,9 +26059,9 @@ diff -urNp linux-3.0.7/drivers/edac/i7300_edac.c linux-3.0.7/drivers/edac/i7300_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)}, {0,} /* 0 terminated list. */ }; -diff -urNp linux-3.0.7/drivers/edac/i7core_edac.c linux-3.0.7/drivers/edac/i7core_edac.c ---- linux-3.0.7/drivers/edac/i7core_edac.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i7core_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i7core_edac.c linux-3.0.8/drivers/edac/i7core_edac.c +--- linux-3.0.8/drivers/edac/i7core_edac.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i7core_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev /* * pci_device_id table for which devices we are looking for @@ -25709,9 +26071,9 @@ diff -urNp linux-3.0.7/drivers/edac/i7core_edac.c linux-3.0.7/drivers/edac/i7cor {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)}, {0,} /* 0 terminated list. */ -diff -urNp linux-3.0.7/drivers/edac/i82443bxgx_edac.c linux-3.0.7/drivers/edac/i82443bxgx_edac.c ---- linux-3.0.7/drivers/edac/i82443bxgx_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i82443bxgx_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i82443bxgx_edac.c linux-3.0.8/drivers/edac/i82443bxgx_edac.c +--- linux-3.0.8/drivers/edac/i82443bxgx_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i82443bxgx_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one); @@ -25721,9 +26083,9 @@ diff -urNp linux-3.0.7/drivers/edac/i82443bxgx_edac.c linux-3.0.7/drivers/edac/i {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)}, -diff -urNp linux-3.0.7/drivers/edac/i82860_edac.c linux-3.0.7/drivers/edac/i82860_edac.c ---- linux-3.0.7/drivers/edac/i82860_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i82860_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i82860_edac.c linux-3.0.8/drivers/edac/i82860_edac.c +--- linux-3.0.8/drivers/edac/i82860_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i82860_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -270,7 +270,7 @@ static void __devexit i82860_remove_one( edac_mc_free(mci); } @@ -25733,9 +26095,9 @@ diff -urNp linux-3.0.7/drivers/edac/i82860_edac.c linux-3.0.7/drivers/edac/i8286 { PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82860}, -diff -urNp linux-3.0.7/drivers/edac/i82875p_edac.c linux-3.0.7/drivers/edac/i82875p_edac.c ---- linux-3.0.7/drivers/edac/i82875p_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i82875p_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i82875p_edac.c linux-3.0.8/drivers/edac/i82875p_edac.c +--- linux-3.0.8/drivers/edac/i82875p_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i82875p_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one edac_mc_free(mci); } @@ -25745,9 +26107,9 @@ diff -urNp linux-3.0.7/drivers/edac/i82875p_edac.c linux-3.0.7/drivers/edac/i828 { PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82875P}, -diff -urNp linux-3.0.7/drivers/edac/i82975x_edac.c linux-3.0.7/drivers/edac/i82975x_edac.c ---- linux-3.0.7/drivers/edac/i82975x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/i82975x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/i82975x_edac.c linux-3.0.8/drivers/edac/i82975x_edac.c +--- linux-3.0.8/drivers/edac/i82975x_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/i82975x_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one edac_mc_free(mci); } @@ -25757,9 +26119,9 @@ diff -urNp linux-3.0.7/drivers/edac/i82975x_edac.c linux-3.0.7/drivers/edac/i829 { PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82975X -diff -urNp linux-3.0.7/drivers/edac/mce_amd.h linux-3.0.7/drivers/edac/mce_amd.h ---- linux-3.0.7/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/mce_amd.h linux-3.0.8/drivers/edac/mce_amd.h +--- linux-3.0.8/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400 @@ -83,7 +83,7 @@ struct amd_decoder_ops { bool (*dc_mce)(u16, u8); bool (*ic_mce)(u16, u8); @@ -25769,9 +26131,9 @@ diff -urNp linux-3.0.7/drivers/edac/mce_amd.h linux-3.0.7/drivers/edac/mce_amd.h void amd_report_gart_errors(bool); void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32)); -diff -urNp linux-3.0.7/drivers/edac/r82600_edac.c linux-3.0.7/drivers/edac/r82600_edac.c ---- linux-3.0.7/drivers/edac/r82600_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/r82600_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/r82600_edac.c linux-3.0.8/drivers/edac/r82600_edac.c +--- linux-3.0.8/drivers/edac/r82600_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/r82600_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -373,7 +373,7 @@ static void __devexit r82600_remove_one( edac_mc_free(mci); } @@ -25781,9 +26143,9 @@ diff -urNp linux-3.0.7/drivers/edac/r82600_edac.c linux-3.0.7/drivers/edac/r8260 { PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID) }, -diff -urNp linux-3.0.7/drivers/edac/x38_edac.c linux-3.0.7/drivers/edac/x38_edac.c ---- linux-3.0.7/drivers/edac/x38_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/edac/x38_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/edac/x38_edac.c linux-3.0.8/drivers/edac/x38_edac.c +--- linux-3.0.8/drivers/edac/x38_edac.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/edac/x38_edac.c 2011-10-11 10:44:33.000000000 -0400 @@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str edac_mc_free(mci); } @@ -25793,9 +26155,9 @@ diff -urNp linux-3.0.7/drivers/edac/x38_edac.c linux-3.0.7/drivers/edac/x38_edac { PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, X38}, -diff -urNp linux-3.0.7/drivers/firewire/core-card.c linux-3.0.7/drivers/firewire/core-card.c ---- linux-3.0.7/drivers/firewire/core-card.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/firewire/core-card.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/firewire/core-card.c linux-3.0.8/drivers/firewire/core-card.c +--- linux-3.0.8/drivers/firewire/core-card.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/firewire/core-card.c 2011-08-23 21:47:55.000000000 -0400 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref) void fw_core_remove_card(struct fw_card *card) @@ -25805,9 +26167,9 @@ diff -urNp linux-3.0.7/drivers/firewire/core-card.c linux-3.0.7/drivers/firewire card->driver->update_phy_reg(card, 4, PHY_LINK_ACTIVE | PHY_CONTENDER, 0); -diff -urNp linux-3.0.7/drivers/firewire/core-cdev.c linux-3.0.7/drivers/firewire/core-cdev.c ---- linux-3.0.7/drivers/firewire/core-cdev.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/firewire/core-cdev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/firewire/core-cdev.c linux-3.0.8/drivers/firewire/core-cdev.c +--- linux-3.0.8/drivers/firewire/core-cdev.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/firewire/core-cdev.c 2011-08-23 21:47:55.000000000 -0400 @@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie int ret; @@ -25818,9 +26180,20 @@ diff -urNp linux-3.0.7/drivers/firewire/core-cdev.c linux-3.0.7/drivers/firewire return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-3.0.7/drivers/firewire/core-transaction.c linux-3.0.7/drivers/firewire/core-transaction.c ---- linux-3.0.7/drivers/firewire/core-transaction.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/firewire/core-transaction.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/firewire/core.h linux-3.0.8/drivers/firewire/core.h +--- linux-3.0.8/drivers/firewire/core.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/firewire/core.h 2011-08-23 21:47:55.000000000 -0400 +@@ -101,6 +101,7 @@ struct fw_card_driver { + + int (*stop_iso)(struct fw_iso_context *ctx); + }; ++typedef struct fw_card_driver __no_const fw_card_driver_no_const; + + void fw_card_initialize(struct fw_card *card, + const struct fw_card_driver *driver, struct device *device); +diff -urNp linux-3.0.8/drivers/firewire/core-transaction.c linux-3.0.8/drivers/firewire/core-transaction.c +--- linux-3.0.8/drivers/firewire/core-transaction.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/firewire/core-transaction.c 2011-08-23 21:48:14.000000000 -0400 @@ -37,6 +37,7 @@ #include <linux/timer.h> #include <linux/types.h> @@ -25838,20 +26211,9 @@ diff -urNp linux-3.0.7/drivers/firewire/core-transaction.c linux-3.0.7/drivers/f init_timer_on_stack(&t.split_timeout_timer); init_completion(&d.done); d.payload = payload; -diff -urNp linux-3.0.7/drivers/firewire/core.h linux-3.0.7/drivers/firewire/core.h ---- linux-3.0.7/drivers/firewire/core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/firewire/core.h 2011-08-23 21:47:55.000000000 -0400 -@@ -101,6 +101,7 @@ struct fw_card_driver { - - int (*stop_iso)(struct fw_iso_context *ctx); - }; -+typedef struct fw_card_driver __no_const fw_card_driver_no_const; - - void fw_card_initialize(struct fw_card *card, - const struct fw_card_driver *driver, struct device *device); -diff -urNp linux-3.0.7/drivers/firmware/dmi_scan.c linux-3.0.7/drivers/firmware/dmi_scan.c ---- linux-3.0.7/drivers/firmware/dmi_scan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/firmware/dmi_scan.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/firmware/dmi_scan.c linux-3.0.8/drivers/firmware/dmi_scan.c +--- linux-3.0.8/drivers/firmware/dmi_scan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/firmware/dmi_scan.c 2011-10-06 04:17:55.000000000 -0400 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } @@ -25873,9 +26235,9 @@ diff -urNp linux-3.0.7/drivers/firmware/dmi_scan.c linux-3.0.7/drivers/firmware/ iounmap(buf); return 0; -diff -urNp linux-3.0.7/drivers/gpio/vr41xx_giu.c linux-3.0.7/drivers/gpio/vr41xx_giu.c ---- linux-3.0.7/drivers/gpio/vr41xx_giu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpio/vr41xx_giu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpio/vr41xx_giu.c linux-3.0.8/drivers/gpio/vr41xx_giu.c +--- linux-3.0.8/drivers/gpio/vr41xx_giu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpio/vr41xx_giu.c 2011-08-23 21:47:55.000000000 -0400 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); @@ -25885,9 +26247,9 @@ diff -urNp linux-3.0.7/drivers/gpio/vr41xx_giu.c linux-3.0.7/drivers/gpio/vr41xx return -EINVAL; } -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc.c linux-3.0.7/drivers/gpu/drm/drm_crtc.c ---- linux-3.0.7/drivers/gpu/drm/drm_crtc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_crtc.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc.c linux-3.0.8/drivers/gpu/drm/drm_crtc.c +--- linux-3.0.8/drivers/gpu/drm/drm_crtc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_crtc.c 2011-10-06 04:17:55.000000000 -0400 @@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_dev */ if ((out_resp->count_modes >= mode_count) && mode_count) { @@ -25980,9 +26342,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc.c linux-3.0.7/drivers/gpu/drm/dr if (copy_to_user(blob_ptr, blob->data, blob->length)){ ret = -EFAULT; goto done; -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c ---- linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c +--- linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c 2011-08-23 21:48:14.000000000 -0400 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask = 1; @@ -26001,9 +26363,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.7/drivers/gpu crtc->enabled = drm_helper_crtc_in_use(crtc); if (!crtc->enabled) return true; -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_drv.c linux-3.0.7/drivers/gpu/drm/drm_drv.c ---- linux-3.0.7/drivers/gpu/drm/drm_drv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_drv.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_drv.c linux-3.0.8/drivers/gpu/drm/drm_drv.c +--- linux-3.0.8/drivers/gpu/drm/drm_drv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_drv.c 2011-10-06 04:17:55.000000000 -0400 @@ -307,7 +307,7 @@ module_exit(drm_core_exit); /** * Copy and IOCTL return string to user space @@ -26022,9 +26384,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_drv.c linux-3.0.7/drivers/gpu/drm/drm ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_fops.c linux-3.0.7/drivers/gpu/drm/drm_fops.c ---- linux-3.0.7/drivers/gpu/drm/drm_fops.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_fops.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_fops.c linux-3.0.8/drivers/gpu/drm/drm_fops.c +--- linux-3.0.8/drivers/gpu/drm/drm_fops.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_fops.c 2011-08-23 21:47:55.000000000 -0400 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * } @@ -26074,9 +26436,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_fops.c linux-3.0.7/drivers/gpu/drm/dr if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_global.c linux-3.0.7/drivers/gpu/drm/drm_global.c ---- linux-3.0.7/drivers/gpu/drm/drm_global.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_global.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_global.c linux-3.0.8/drivers/gpu/drm/drm_global.c +--- linux-3.0.8/drivers/gpu/drm/drm_global.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_global.c 2011-08-23 21:47:55.000000000 -0400 @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; @@ -26134,9 +26496,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_global.c linux-3.0.7/drivers/gpu/drm/ ref->release(ref); item->object = NULL; } -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_info.c linux-3.0.7/drivers/gpu/drm/drm_info.c ---- linux-3.0.7/drivers/gpu/drm/drm_info.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_info.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_info.c linux-3.0.8/drivers/gpu/drm/drm_info.c +--- linux-3.0.8/drivers/gpu/drm/drm_info.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_info.c 2011-08-23 21:48:14.000000000 -0400 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -26177,9 +26539,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_info.c linux-3.0.7/drivers/gpu/drm/dr #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioc32.c linux-3.0.7/drivers/gpu/drm/drm_ioc32.c ---- linux-3.0.7/drivers/gpu/drm/drm_ioc32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_ioc32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioc32.c linux-3.0.8/drivers/gpu/drm/drm_ioc32.c +--- linux-3.0.8/drivers/gpu/drm/drm_ioc32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_ioc32.c 2011-10-06 04:17:55.000000000 -0400 @@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi request = compat_alloc_user_space(nbytes); if (!access_ok(VERIFY_WRITE, request, nbytes)) @@ -26198,9 +26560,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioc32.c linux-3.0.7/drivers/gpu/drm/d if (__put_user(count, &request->count) || __put_user(list, &request->list)) -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioctl.c linux-3.0.7/drivers/gpu/drm/drm_ioctl.c ---- linux-3.0.7/drivers/gpu/drm/drm_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioctl.c linux-3.0.8/drivers/gpu/drm/drm_ioctl.c +--- linux-3.0.8/drivers/gpu/drm/drm_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_ioctl.c 2011-08-23 21:47:55.000000000 -0400 @@ -256,7 +256,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); @@ -26210,9 +26572,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioctl.c linux-3.0.7/drivers/gpu/drm/d stats->data[i].type = dev->types[i]; } -diff -urNp linux-3.0.7/drivers/gpu/drm/drm_lock.c linux-3.0.7/drivers/gpu/drm/drm_lock.c ---- linux-3.0.7/drivers/gpu/drm/drm_lock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/drm_lock.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/drm_lock.c linux-3.0.8/drivers/gpu/drm/drm_lock.c +--- linux-3.0.8/drivers/gpu/drm/drm_lock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/drm_lock.c 2011-08-23 21:47:55.000000000 -0400 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -26231,9 +26593,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/drm_lock.c linux-3.0.7/drivers/gpu/drm/dr if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ -diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c ---- linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c +--- linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c 2011-08-23 21:47:55.000000000 -0400 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -26256,9 +26618,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c linux-3.0.7/drivers/gpu/d sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h ---- linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h +--- linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; @@ -26270,9 +26632,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h linux-3.0.7/drivers/gpu/d int front_offset; } drm_i810_private_t; -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c ---- linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c +--- linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c 2011-10-06 04:17:55.000000000 -0400 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se I915_READ(GTIMR)); } @@ -26291,9 +26653,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.7/drivers/g mutex_unlock(&dev->struct_mutex); -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c ---- linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c +--- linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c 2011-08-23 21:47:55.000000000 -0400 @@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s bool can_switch; @@ -26303,9 +26665,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c linux-3.0.7/drivers/gpu/d spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h ---- linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h +--- linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs { /* render clock increase/decrease */ /* display clock increase/decrease */ @@ -26342,9 +26704,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h linux-3.0.7/drivers/gpu/d { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-08-23 21:47:55.000000000 -0400 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct i915_gem_clflush_object(obj); @@ -26354,9 +26716,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.7/dr /* The actual obj->write_domain will be updated with * pending_write_domain after we emit the accumulated flush for all -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c ---- linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c +--- linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir; struct drm_i915_master_private *master_priv; @@ -26402,9 +26764,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c linux-3.0.7/drivers/gpu/d INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -diff -urNp linux-3.0.7/drivers/gpu/drm/i915/intel_display.c linux-3.0.7/drivers/gpu/drm/i915/intel_display.c ---- linux-3.0.7/drivers/gpu/drm/i915/intel_display.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/i915/intel_display.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/i915/intel_display.c linux-3.0.8/drivers/gpu/drm/i915/intel_display.c +--- linux-3.0.8/drivers/gpu/drm/i915/intel_display.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/i915/intel_display.c 2011-08-23 21:47:55.000000000 -0400 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt wait_event(dev_priv->pending_flip_queue, @@ -26450,9 +26812,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/i915/intel_display.c linux-3.0.7/drivers/ cleanup_objs: drm_gem_object_unreference(&work->old_fb_obj->base); drm_gem_object_unreference(&obj->base); -diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h ---- linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h +--- linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; @@ -26465,9 +26827,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h linux-3.0.7/drivers/gpu/drm u32 next_fence_to_post; unsigned int fb_cpp; -diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c ---- linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c +--- linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -26504,9 +26866,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c linux-3.0.7/drivers/gpu/drm - *sequence) <= (1 << 23))); *sequence = cur_fence; -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c ---- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c +--- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-26 19:49:56.000000000 -0400 @@ -200,7 +200,7 @@ struct methods { const char desc[8]; void (*loadbios)(struct drm_device *, uint8_t *); @@ -26525,9 +26887,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.7/driver #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry }) -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h ---- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h +--- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -227,7 +227,7 @@ struct nouveau_channel { struct list_head pending; uint32_t sequence; @@ -26580,9 +26942,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.7/drivers } ttm; struct { -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c ---- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c +--- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-08-23 21:47:55.000000000 -0400 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan if (USE_REFCNT(dev)) sequence = nvchan_rd32(chan, 0x48); @@ -26601,9 +26963,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.7/drive return 0; } -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c ---- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c +--- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-08-23 21:47:55.000000000 -0400 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch int trycnt = 0; int ret, i; @@ -26613,9 +26975,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.7/drivers retry: if (++trycnt > 100000) { NV_ERROR(dev, "%s failed and gave up.\n", __func__); -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c ---- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c +--- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c 2011-08-23 21:47:55.000000000 -0400 @@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc bool can_switch; @@ -26625,9 +26987,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.7/drive spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c ---- linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c +--- linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c 2011-08-23 21:47:55.000000000 -0400 @@ -560,7 +560,7 @@ static int nv04_graph_mthd_set_ref(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data) @@ -26637,9 +26999,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.7/drivers/ return 0; } -diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c ---- linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c +--- linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c 2011-08-23 21:47:55.000000000 -0400 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d /* GH: Simple idle check. @@ -26649,9 +27011,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c linux-3.0.7/drivers/gpu/d /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring -diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h ---- linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h +--- linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; @@ -26669,9 +27031,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h linux-3.0.7/drivers/gpu/d u32 color_fmt; unsigned int front_offset; -diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c ---- linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c +--- linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d if (crtc != 0) return 0; @@ -26690,9 +27052,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c linux-3.0.7/drivers/gpu/d drm_handle_vblank(dev, 0); return IRQ_HANDLED; } -diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_state.c linux-3.0.7/drivers/gpu/drm/r128/r128_state.c ---- linux-3.0.7/drivers/gpu/drm/r128/r128_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/r128/r128_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_state.c linux-3.0.8/drivers/gpu/drm/r128/r128_state.c +--- linux-3.0.8/drivers/gpu/drm/r128/r128_state.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/r128/r128_state.c 2011-08-23 21:47:55.000000000 -0400 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv) @@ -26706,10 +27068,10 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_state.c linux-3.0.7/drivers/gpu } #endif -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/atom.c linux-3.0.7/drivers/gpu/drm/radeon/atom.c ---- linux-3.0.7/drivers/gpu/drm/radeon/atom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/atom.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/atom.c linux-3.0.8/drivers/gpu/drm/radeon/atom.c +--- linux-3.0.8/drivers/gpu/drm/radeon/atom.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/atom.c 2011-10-25 09:10:41.000000000 -0400 +@@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c char name[512]; int i; @@ -26718,9 +27080,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/atom.c linux-3.0.7/drivers/gpu/drm ctx->card = card; ctx->bios = bios; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c ---- linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c +--- linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c 2011-08-23 21:47:55.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -26738,30 +27100,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.7/drivers/g if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon.h linux-3.0.7/drivers/gpu/drm/radeon/radeon.h ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon.h 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon.h 2011-10-16 21:55:27.000000000 -0400 -@@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d - */ - struct radeon_fence_driver { - uint32_t scratch_reg; -- atomic_t seq; -+ atomic_unchecked_t seq; - uint32_t last_seq; - unsigned long last_jiffies; - unsigned long last_timeout; -@@ -961,7 +961,7 @@ struct radeon_asic { - void (*pre_page_flip)(struct radeon_device *rdev, int crtc); - u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base); - void (*post_page_flip)(struct radeon_device *rdev, int crtc); --}; -+} __no_const; - - /* - * Asic structures -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c 2011-08-23 21:48:14.000000000 -0400 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from struct radeon_gpio_rec gpio; struct radeon_hpd hpd; @@ -26771,9 +27112,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.7/driv if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) return false; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400 @@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch bool can_switch; @@ -26783,9 +27124,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.7/driver spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c 2011-08-23 21:48:14.000000000 -0400 @@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra uint32_t post_div; u32 pll_out_min, pll_out_max; @@ -26795,9 +27136,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.7/drive DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); freq = freq * 1000; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private { /* SW interrupt */ @@ -26807,9 +27148,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.7/drivers/g int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c 2011-08-23 21:47:55.000000000 -0400 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; @@ -26828,9 +27169,30 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.7/drivers INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon.h linux-3.0.8/drivers/gpu/drm/radeon/radeon.h +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon.h 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon.h 2011-10-16 21:55:27.000000000 -0400 +@@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d + */ + struct radeon_fence_driver { + uint32_t scratch_reg; +- atomic_t seq; ++ atomic_unchecked_t seq; + uint32_t last_seq; + unsigned long last_jiffies; + unsigned long last_timeout; +@@ -961,7 +961,7 @@ struct radeon_asic { + void (*pre_page_flip)(struct radeon_device *rdev, int crtc); + u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base); + void (*post_page_flip)(struct radeon_device *rdev, int crtc); +-}; ++} __no_const; + + /* + * Asic structures +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-08-23 21:47:55.000000000 -0400 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str request = compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) @@ -26840,9 +27202,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.7/drivers &request->value)) return -EFAULT; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de unsigned int ret; RING_LOCALS; @@ -26863,9 +27225,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.7/drivers/g DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); dev->max_vblank_count = 0x001fffff; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c 2011-08-23 21:47:55.000000000 -0400 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS; @@ -26884,9 +27246,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.7/drivers DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-16 21:54:53.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-16 21:55:27.000000000 -0400 @@ -649,8 +649,10 @@ int radeon_mmap(struct file *filp, struc } if (unlikely(ttm_vm_ops == NULL)) { @@ -26900,9 +27262,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.7/drivers/g } vma->vm_ops = &radeon_ttm_vm_ops; return 0; -diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/rs690.c linux-3.0.7/drivers/gpu/drm/radeon/rs690.c ---- linux-3.0.7/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/rs690.c linux-3.0.8/drivers/gpu/drm/radeon/rs690.c +--- linux-3.0.8/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -26916,9 +27278,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/rs690.c linux-3.0.7/drivers/gpu/dr } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c ---- linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c +--- linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-08-23 21:47:55.000000000 -0400 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages static int ttm_pool_mm_shrink(struct shrinker *shrink, struct shrink_control *sc) @@ -26931,9 +27293,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.7/drivers/ struct ttm_page_pool *pool; int shrink_pages = sc->nr_to_scan; -diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_drv.h linux-3.0.7/drivers/gpu/drm/via/via_drv.h ---- linux-3.0.7/drivers/gpu/drm/via/via_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/via/via_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_drv.h linux-3.0.8/drivers/gpu/drm/via/via_drv.h +--- linux-3.0.8/drivers/gpu/drm/via/via_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/via/via_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; @@ -26952,9 +27314,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_drv.h linux-3.0.7/drivers/gpu/drm drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; -diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_irq.c linux-3.0.7/drivers/gpu/drm/via/via_irq.c ---- linux-3.0.7/drivers/gpu/drm/via/via_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/via/via_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_irq.c linux-3.0.8/drivers/gpu/drm/via/via_irq.c +--- linux-3.0.8/drivers/gpu/drm/via/via_irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/via/via_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -27025,9 +27387,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_irq.c linux-3.0.7/drivers/gpu/drm irqwait->request.type &= ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; -diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h ---- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +--- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-08-23 21:47:55.000000000 -0400 @@ -240,7 +240,7 @@ struct vmw_private { * Fencing and IRQs. */ @@ -27037,9 +27399,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.7/drivers/g wait_queue_head_t fence_queue; wait_queue_head_t fifo_queue; atomic_t fence_queue_waiters; -diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c ---- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +--- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-10-06 04:17:55.000000000 -0400 @@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device struct drm_vmw_fence_rep fence_rep; struct drm_vmw_fence_rep __user *user_fence_rep; @@ -27049,9 +27411,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.7/drive void *cmd; uint32_t sequence; struct vmw_sw_context *sw_context = &dev_priv->ctx; -diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c ---- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +--- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-08-23 21:47:55.000000000 -0400 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev while (!vmw_lag_lt(queue, us)) { spin_lock(&queue->lock); @@ -27061,9 +27423,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.7/drivers else { fence = list_first_entry(&queue->head, struct vmw_fence, head); -diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ---- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +--- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-10-06 04:17:55.000000000 -0400 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de (unsigned int) min, (unsigned int) fifo->capabilities); @@ -27100,9 +27462,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.7/drivers/ } while (*sequence == 0); if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) { -diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c ---- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +--- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-08-23 21:47:55.000000000 -0400 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva * emitted. Then the fence is stale and signaled. */ @@ -27121,9 +27483,9 @@ diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.7/drivers/g ret = 0; for (;;) { -diff -urNp linux-3.0.7/drivers/hid/hid-core.c linux-3.0.7/drivers/hid/hid-core.c ---- linux-3.0.7/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/hid/hid-core.c linux-3.0.8/drivers/hid/hid-core.c +--- linux-3.0.8/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400 @@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device int hid_add_device(struct hid_device *hdev) @@ -27142,9 +27504,9 @@ diff -urNp linux-3.0.7/drivers/hid/hid-core.c linux-3.0.7/drivers/hid/hid-core.c hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); -diff -urNp linux-3.0.7/drivers/hid/usbhid/hiddev.c linux-3.0.7/drivers/hid/usbhid/hiddev.c ---- linux-3.0.7/drivers/hid/usbhid/hiddev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/hid/usbhid/hiddev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/hid/usbhid/hiddev.c linux-3.0.8/drivers/hid/usbhid/hiddev.c +--- linux-3.0.8/drivers/hid/usbhid/hiddev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/hid/usbhid/hiddev.c 2011-08-23 21:47:55.000000000 -0400 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi break; @@ -27154,9 +27516,9 @@ diff -urNp linux-3.0.7/drivers/hid/usbhid/hiddev.c linux-3.0.7/drivers/hid/usbhi break; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-3.0.7/drivers/hwmon/acpi_power_meter.c linux-3.0.7/drivers/hwmon/acpi_power_meter.c ---- linux-3.0.7/drivers/hwmon/acpi_power_meter.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/hwmon/acpi_power_meter.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/hwmon/acpi_power_meter.c linux-3.0.8/drivers/hwmon/acpi_power_meter.c +--- linux-3.0.8/drivers/hwmon/acpi_power_meter.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/hwmon/acpi_power_meter.c 2011-08-23 21:47:55.000000000 -0400 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d return res; @@ -27166,9 +27528,9 @@ diff -urNp linux-3.0.7/drivers/hwmon/acpi_power_meter.c linux-3.0.7/drivers/hwmo mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-3.0.7/drivers/hwmon/sht15.c linux-3.0.7/drivers/hwmon/sht15.c ---- linux-3.0.7/drivers/hwmon/sht15.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/hwmon/sht15.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/hwmon/sht15.c linux-3.0.8/drivers/hwmon/sht15.c +--- linux-3.0.8/drivers/hwmon/sht15.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/hwmon/sht15.c 2011-08-23 21:47:55.000000000 -0400 @@ -166,7 +166,7 @@ struct sht15_data { int supply_uV; bool supply_uV_valid; @@ -27217,9 +27579,9 @@ diff -urNp linux-3.0.7/drivers/hwmon/sht15.c linux-3.0.7/drivers/hwmon/sht15.c return; } -diff -urNp linux-3.0.7/drivers/hwmon/w83791d.c linux-3.0.7/drivers/hwmon/w83791d.c ---- linux-3.0.7/drivers/hwmon/w83791d.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/hwmon/w83791d.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/hwmon/w83791d.c linux-3.0.8/drivers/hwmon/w83791d.c +--- linux-3.0.8/drivers/hwmon/w83791d.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/hwmon/w83791d.c 2011-08-23 21:47:55.000000000 -0400 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -27231,9 +27593,9 @@ diff -urNp linux-3.0.7/drivers/hwmon/w83791d.c linux-3.0.7/drivers/hwmon/w83791d static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c ---- linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c +--- linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:47:55.000000000 -0400 @@ -43,7 +43,7 @@ extern struct i2c_adapter amd756_smbus; @@ -27243,9 +27605,9 @@ diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.7/drivers /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(amd756_lock); -diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c ---- linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c +--- linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400 @@ -41,7 +41,7 @@ extern struct i2c_adapter *nforce2_smbus; @@ -27255,9 +27617,9 @@ diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.7/driver /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(nforce2_lock); -diff -urNp linux-3.0.7/drivers/i2c/i2c-mux.c linux-3.0.7/drivers/i2c/i2c-mux.c ---- linux-3.0.7/drivers/i2c/i2c-mux.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/i2c/i2c-mux.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/i2c/i2c-mux.c linux-3.0.8/drivers/i2c/i2c-mux.c +--- linux-3.0.8/drivers/i2c/i2c-mux.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/i2c/i2c-mux.c 2011-08-23 21:47:55.000000000 -0400 @@ -28,7 +28,7 @@ /* multiplexer per channel data */ struct i2c_mux_priv { @@ -27267,9 +27629,9 @@ diff -urNp linux-3.0.7/drivers/i2c/i2c-mux.c linux-3.0.7/drivers/i2c/i2c-mux.c struct i2c_adapter *parent; void *mux_dev; /* the mux chip/device */ -diff -urNp linux-3.0.7/drivers/ide/aec62xx.c linux-3.0.7/drivers/ide/aec62xx.c ---- linux-3.0.7/drivers/ide/aec62xx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/aec62xx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/aec62xx.c linux-3.0.8/drivers/ide/aec62xx.c +--- linux-3.0.8/drivers/ide/aec62xx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/aec62xx.c 2011-10-11 10:44:33.000000000 -0400 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_ .cable_detect = atp86x_cable_detect, }; @@ -27279,9 +27641,9 @@ diff -urNp linux-3.0.7/drivers/ide/aec62xx.c linux-3.0.7/drivers/ide/aec62xx.c { /* 0: AEC6210 */ .name = DRV_NAME, .init_chipset = init_chipset_aec62xx, -diff -urNp linux-3.0.7/drivers/ide/alim15x3.c linux-3.0.7/drivers/ide/alim15x3.c ---- linux-3.0.7/drivers/ide/alim15x3.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/alim15x3.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/alim15x3.c linux-3.0.8/drivers/ide/alim15x3.c +--- linux-3.0.8/drivers/ide/alim15x3.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/alim15x3.c 2011-10-11 10:44:33.000000000 -0400 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27291,9 +27653,9 @@ diff -urNp linux-3.0.7/drivers/ide/alim15x3.c linux-3.0.7/drivers/ide/alim15x3.c .name = DRV_NAME, .init_chipset = init_chipset_ali15x3, .init_hwif = init_hwif_ali15x3, -diff -urNp linux-3.0.7/drivers/ide/amd74xx.c linux-3.0.7/drivers/ide/amd74xx.c ---- linux-3.0.7/drivers/ide/amd74xx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/amd74xx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/amd74xx.c linux-3.0.8/drivers/ide/amd74xx.c +--- linux-3.0.8/drivers/ide/amd74xx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/amd74xx.c 2011-10-11 10:44:33.000000000 -0400 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por .udma_mask = udma, \ } @@ -27303,9 +27665,9 @@ diff -urNp linux-3.0.7/drivers/ide/amd74xx.c linux-3.0.7/drivers/ide/amd74xx.c /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2), /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4), /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), -diff -urNp linux-3.0.7/drivers/ide/atiixp.c linux-3.0.7/drivers/ide/atiixp.c ---- linux-3.0.7/drivers/ide/atiixp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/atiixp.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/atiixp.c linux-3.0.8/drivers/ide/atiixp.c +--- linux-3.0.8/drivers/ide/atiixp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/atiixp.c 2011-10-11 10:44:33.000000000 -0400 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_ .cable_detect = atiixp_cable_detect, }; @@ -27315,9 +27677,9 @@ diff -urNp linux-3.0.7/drivers/ide/atiixp.c linux-3.0.7/drivers/ide/atiixp.c { /* 0: IXP200/300/400/700 */ .name = DRV_NAME, .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, -diff -urNp linux-3.0.7/drivers/ide/cmd64x.c linux-3.0.7/drivers/ide/cmd64x.c ---- linux-3.0.7/drivers/ide/cmd64x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/cmd64x.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/cmd64x.c linux-3.0.8/drivers/ide/cmd64x.c +--- linux-3.0.8/drivers/ide/cmd64x.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/cmd64x.c 2011-10-11 10:44:33.000000000 -0400 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27327,9 +27689,9 @@ diff -urNp linux-3.0.7/drivers/ide/cmd64x.c linux-3.0.7/drivers/ide/cmd64x.c { /* 0: CMD643 */ .name = DRV_NAME, .init_chipset = init_chipset_cmd64x, -diff -urNp linux-3.0.7/drivers/ide/cs5520.c linux-3.0.7/drivers/ide/cs5520.c ---- linux-3.0.7/drivers/ide/cs5520.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/cs5520.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/cs5520.c linux-3.0.8/drivers/ide/cs5520.c +--- linux-3.0.8/drivers/ide/cs5520.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/cs5520.c 2011-10-11 10:44:33.000000000 -0400 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_ .set_dma_mode = cs5520_set_dma_mode, }; @@ -27339,9 +27701,9 @@ diff -urNp linux-3.0.7/drivers/ide/cs5520.c linux-3.0.7/drivers/ide/cs5520.c .name = DRV_NAME, .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } }, .port_ops = &cs5520_port_ops, -diff -urNp linux-3.0.7/drivers/ide/cs5530.c linux-3.0.7/drivers/ide/cs5530.c ---- linux-3.0.7/drivers/ide/cs5530.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/cs5530.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/cs5530.c linux-3.0.8/drivers/ide/cs5530.c +--- linux-3.0.8/drivers/ide/cs5530.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/cs5530.c 2011-10-11 10:44:33.000000000 -0400 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_ .udma_filter = cs5530_udma_filter, }; @@ -27351,9 +27713,9 @@ diff -urNp linux-3.0.7/drivers/ide/cs5530.c linux-3.0.7/drivers/ide/cs5530.c .name = DRV_NAME, .init_chipset = init_chipset_cs5530, .init_hwif = init_hwif_cs5530, -diff -urNp linux-3.0.7/drivers/ide/cs5535.c linux-3.0.7/drivers/ide/cs5535.c ---- linux-3.0.7/drivers/ide/cs5535.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/cs5535.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/cs5535.c linux-3.0.8/drivers/ide/cs5535.c +--- linux-3.0.8/drivers/ide/cs5535.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/cs5535.c 2011-10-11 10:44:33.000000000 -0400 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_ .cable_detect = cs5535_cable_detect, }; @@ -27363,9 +27725,9 @@ diff -urNp linux-3.0.7/drivers/ide/cs5535.c linux-3.0.7/drivers/ide/cs5535.c .name = DRV_NAME, .port_ops = &cs5535_port_ops, .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE, -diff -urNp linux-3.0.7/drivers/ide/cy82c693.c linux-3.0.7/drivers/ide/cy82c693.c ---- linux-3.0.7/drivers/ide/cy82c693.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/cy82c693.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/cy82c693.c linux-3.0.8/drivers/ide/cy82c693.c +--- linux-3.0.8/drivers/ide/cy82c693.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/cy82c693.c 2011-10-11 10:44:33.000000000 -0400 @@ -161,7 +161,7 @@ static const struct ide_port_ops cy82c69 .set_dma_mode = cy82c693_set_dma_mode, }; @@ -27375,9 +27737,9 @@ diff -urNp linux-3.0.7/drivers/ide/cy82c693.c linux-3.0.7/drivers/ide/cy82c693.c .name = DRV_NAME, .init_iops = init_iops_cy82c693, .port_ops = &cy82c693_port_ops, -diff -urNp linux-3.0.7/drivers/ide/hpt366.c linux-3.0.7/drivers/ide/hpt366.c ---- linux-3.0.7/drivers/ide/hpt366.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/hpt366.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/hpt366.c linux-3.0.8/drivers/ide/hpt366.c +--- linux-3.0.8/drivers/ide/hpt366.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/hpt366.c 2011-10-11 10:44:33.000000000 -0400 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings } }; @@ -27486,9 +27848,9 @@ diff -urNp linux-3.0.7/drivers/ide/hpt366.c linux-3.0.7/drivers/ide/hpt366.c { /* 0: HPT36x */ .name = DRV_NAME, .init_chipset = init_chipset_hpt366, -diff -urNp linux-3.0.7/drivers/ide/ide-cd.c linux-3.0.7/drivers/ide/ide-cd.c ---- linux-3.0.7/drivers/ide/ide-cd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/ide-cd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/ide-cd.c linux-3.0.8/drivers/ide/ide-cd.c +--- linux-3.0.8/drivers/ide/ide-cd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/ide-cd.c 2011-08-23 21:47:55.000000000 -0400 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -27498,9 +27860,9 @@ diff -urNp linux-3.0.7/drivers/ide/ide-cd.c linux-3.0.7/drivers/ide/ide-cd.c drive->dma = 0; } } -diff -urNp linux-3.0.7/drivers/ide/ide-floppy.c linux-3.0.7/drivers/ide/ide-floppy.c ---- linux-3.0.7/drivers/ide/ide-floppy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/ide-floppy.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/ide-floppy.c linux-3.0.8/drivers/ide/ide-floppy.c +--- linux-3.0.8/drivers/ide/ide-floppy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/ide-floppy.c 2011-08-23 21:48:14.000000000 -0400 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d u8 pc_buf[256], header_len, desc_cnt; int i, rc = 1, blocks, length; @@ -27510,9 +27872,9 @@ diff -urNp linux-3.0.7/drivers/ide/ide-floppy.c linux-3.0.7/drivers/ide/ide-flop ide_debug_log(IDE_DBG_FUNC, "enter"); drive->bios_cyl = 0; -diff -urNp linux-3.0.7/drivers/ide/ide-pci-generic.c linux-3.0.7/drivers/ide/ide-pci-generic.c ---- linux-3.0.7/drivers/ide/ide-pci-generic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/ide-pci-generic.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/ide-pci-generic.c linux-3.0.8/drivers/ide/ide-pci-generic.c +--- linux-3.0.8/drivers/ide/ide-pci-generic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/ide-pci-generic.c 2011-10-11 10:44:33.000000000 -0400 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell .udma_mask = ATA_UDMA6, \ } @@ -27522,9 +27884,9 @@ diff -urNp linux-3.0.7/drivers/ide/ide-pci-generic.c linux-3.0.7/drivers/ide/ide /* 0: Unknown */ DECLARE_GENERIC_PCI_DEV(0), -diff -urNp linux-3.0.7/drivers/ide/it8172.c linux-3.0.7/drivers/ide/it8172.c ---- linux-3.0.7/drivers/ide/it8172.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/it8172.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/it8172.c linux-3.0.8/drivers/ide/it8172.c +--- linux-3.0.8/drivers/ide/it8172.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/it8172.c 2011-10-11 10:44:33.000000000 -0400 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_ .set_dma_mode = it8172_set_dma_mode, }; @@ -27534,9 +27896,9 @@ diff -urNp linux-3.0.7/drivers/ide/it8172.c linux-3.0.7/drivers/ide/it8172.c .name = DRV_NAME, .port_ops = &it8172_port_ops, .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} }, -diff -urNp linux-3.0.7/drivers/ide/it8213.c linux-3.0.7/drivers/ide/it8213.c ---- linux-3.0.7/drivers/ide/it8213.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/it8213.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/it8213.c linux-3.0.8/drivers/ide/it8213.c +--- linux-3.0.8/drivers/ide/it8213.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/it8213.c 2011-10-11 10:44:33.000000000 -0400 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_ .cable_detect = it8213_cable_detect, }; @@ -27546,9 +27908,9 @@ diff -urNp linux-3.0.7/drivers/ide/it8213.c linux-3.0.7/drivers/ide/it8213.c .name = DRV_NAME, .enablebits = { {0x41, 0x80, 0x80} }, .port_ops = &it8213_port_ops, -diff -urNp linux-3.0.7/drivers/ide/it821x.c linux-3.0.7/drivers/ide/it821x.c ---- linux-3.0.7/drivers/ide/it821x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/it821x.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/it821x.c linux-3.0.8/drivers/ide/it821x.c +--- linux-3.0.8/drivers/ide/it821x.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/it821x.c 2011-10-11 10:44:33.000000000 -0400 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_ .cable_detect = it821x_cable_detect, }; @@ -27558,9 +27920,9 @@ diff -urNp linux-3.0.7/drivers/ide/it821x.c linux-3.0.7/drivers/ide/it821x.c .name = DRV_NAME, .init_chipset = init_chipset_it821x, .init_hwif = init_hwif_it821x, -diff -urNp linux-3.0.7/drivers/ide/jmicron.c linux-3.0.7/drivers/ide/jmicron.c ---- linux-3.0.7/drivers/ide/jmicron.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/jmicron.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/jmicron.c linux-3.0.8/drivers/ide/jmicron.c +--- linux-3.0.8/drivers/ide/jmicron.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/jmicron.c 2011-10-11 10:44:33.000000000 -0400 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron .cable_detect = jmicron_cable_detect, }; @@ -27570,9 +27932,9 @@ diff -urNp linux-3.0.7/drivers/ide/jmicron.c linux-3.0.7/drivers/ide/jmicron.c .name = DRV_NAME, .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, .port_ops = &jmicron_port_ops, -diff -urNp linux-3.0.7/drivers/ide/ns87415.c linux-3.0.7/drivers/ide/ns87415.c ---- linux-3.0.7/drivers/ide/ns87415.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/ns87415.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/ns87415.c linux-3.0.8/drivers/ide/ns87415.c +--- linux-3.0.8/drivers/ide/ns87415.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/ns87415.c 2011-10-11 10:44:33.000000000 -0400 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_ .dma_sff_read_status = superio_dma_sff_read_status, }; @@ -27582,9 +27944,9 @@ diff -urNp linux-3.0.7/drivers/ide/ns87415.c linux-3.0.7/drivers/ide/ns87415.c .name = DRV_NAME, .init_hwif = init_hwif_ns87415, .tp_ops = &ns87415_tp_ops, -diff -urNp linux-3.0.7/drivers/ide/opti621.c linux-3.0.7/drivers/ide/opti621.c ---- linux-3.0.7/drivers/ide/opti621.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/opti621.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/opti621.c linux-3.0.8/drivers/ide/opti621.c +--- linux-3.0.8/drivers/ide/opti621.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/opti621.c 2011-10-11 10:44:33.000000000 -0400 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621 .set_pio_mode = opti621_set_pio_mode, }; @@ -27594,9 +27956,9 @@ diff -urNp linux-3.0.7/drivers/ide/opti621.c linux-3.0.7/drivers/ide/opti621.c .name = DRV_NAME, .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, .port_ops = &opti621_port_ops, -diff -urNp linux-3.0.7/drivers/ide/pdc202xx_new.c linux-3.0.7/drivers/ide/pdc202xx_new.c ---- linux-3.0.7/drivers/ide/pdc202xx_new.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/pdc202xx_new.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/pdc202xx_new.c linux-3.0.8/drivers/ide/pdc202xx_new.c +--- linux-3.0.8/drivers/ide/pdc202xx_new.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/pdc202xx_new.c 2011-10-11 10:44:33.000000000 -0400 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_ .udma_mask = udma, \ } @@ -27606,9 +27968,9 @@ diff -urNp linux-3.0.7/drivers/ide/pdc202xx_new.c linux-3.0.7/drivers/ide/pdc202 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5), /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6), }; -diff -urNp linux-3.0.7/drivers/ide/pdc202xx_old.c linux-3.0.7/drivers/ide/pdc202xx_old.c ---- linux-3.0.7/drivers/ide/pdc202xx_old.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/pdc202xx_old.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/pdc202xx_old.c linux-3.0.8/drivers/ide/pdc202xx_old.c +--- linux-3.0.8/drivers/ide/pdc202xx_old.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/pdc202xx_old.c 2011-10-11 10:44:33.000000000 -0400 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x .max_sectors = sectors, \ } @@ -27618,9 +27980,9 @@ diff -urNp linux-3.0.7/drivers/ide/pdc202xx_old.c linux-3.0.7/drivers/ide/pdc202 { /* 0: PDC20246 */ .name = DRV_NAME, .init_chipset = init_chipset_pdc202xx, -diff -urNp linux-3.0.7/drivers/ide/piix.c linux-3.0.7/drivers/ide/piix.c ---- linux-3.0.7/drivers/ide/piix.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/piix.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/piix.c linux-3.0.8/drivers/ide/piix.c +--- linux-3.0.8/drivers/ide/piix.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/piix.c 2011-10-11 10:44:33.000000000 -0400 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por .udma_mask = udma, \ } @@ -27630,9 +27992,9 @@ diff -urNp linux-3.0.7/drivers/ide/piix.c linux-3.0.7/drivers/ide/piix.c /* 0: MPIIX */ { /* * MPIIX actually has only a single IDE channel mapped to -diff -urNp linux-3.0.7/drivers/ide/rz1000.c linux-3.0.7/drivers/ide/rz1000.c ---- linux-3.0.7/drivers/ide/rz1000.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/rz1000.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/rz1000.c linux-3.0.8/drivers/ide/rz1000.c +--- linux-3.0.8/drivers/ide/rz1000.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/rz1000.c 2011-10-11 10:44:33.000000000 -0400 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read } } @@ -27642,9 +28004,9 @@ diff -urNp linux-3.0.7/drivers/ide/rz1000.c linux-3.0.7/drivers/ide/rz1000.c .name = DRV_NAME, .host_flags = IDE_HFLAG_NO_DMA, }; -diff -urNp linux-3.0.7/drivers/ide/sc1200.c linux-3.0.7/drivers/ide/sc1200.c ---- linux-3.0.7/drivers/ide/sc1200.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/sc1200.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/sc1200.c linux-3.0.8/drivers/ide/sc1200.c +--- linux-3.0.8/drivers/ide/sc1200.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/sc1200.c 2011-10-11 10:44:33.000000000 -0400 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27654,9 +28016,9 @@ diff -urNp linux-3.0.7/drivers/ide/sc1200.c linux-3.0.7/drivers/ide/sc1200.c .name = DRV_NAME, .port_ops = &sc1200_port_ops, .dma_ops = &sc1200_dma_ops, -diff -urNp linux-3.0.7/drivers/ide/scc_pata.c linux-3.0.7/drivers/ide/scc_pata.c ---- linux-3.0.7/drivers/ide/scc_pata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/scc_pata.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/scc_pata.c linux-3.0.8/drivers/ide/scc_pata.c +--- linux-3.0.8/drivers/ide/scc_pata.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/scc_pata.c 2011-10-11 10:44:33.000000000 -0400 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ .dma_sff_read_status = scc_dma_sff_read_status, }; @@ -27666,9 +28028,9 @@ diff -urNp linux-3.0.7/drivers/ide/scc_pata.c linux-3.0.7/drivers/ide/scc_pata.c .name = "sccIDE", .init_iops = init_iops_scc, .init_dma = scc_init_dma, -diff -urNp linux-3.0.7/drivers/ide/serverworks.c linux-3.0.7/drivers/ide/serverworks.c ---- linux-3.0.7/drivers/ide/serverworks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/serverworks.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/serverworks.c linux-3.0.8/drivers/ide/serverworks.c +--- linux-3.0.8/drivers/ide/serverworks.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/serverworks.c 2011-10-11 10:44:33.000000000 -0400 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p .cable_detect = svwks_cable_detect, }; @@ -27678,9 +28040,9 @@ diff -urNp linux-3.0.7/drivers/ide/serverworks.c linux-3.0.7/drivers/ide/serverw { /* 0: OSB4 */ .name = DRV_NAME, .init_chipset = init_chipset_svwks, -diff -urNp linux-3.0.7/drivers/ide/setup-pci.c linux-3.0.7/drivers/ide/setup-pci.c ---- linux-3.0.7/drivers/ide/setup-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/setup-pci.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/setup-pci.c linux-3.0.8/drivers/ide/setup-pci.c +--- linux-3.0.8/drivers/ide/setup-pci.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/setup-pci.c 2011-08-23 21:48:14.000000000 -0400 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev int ret, i, n_ports = dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL }; @@ -27690,9 +28052,9 @@ diff -urNp linux-3.0.7/drivers/ide/setup-pci.c linux-3.0.7/drivers/ide/setup-pci for (i = 0; i < n_ports / 2; i++) { ret = ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) -diff -urNp linux-3.0.7/drivers/ide/siimage.c linux-3.0.7/drivers/ide/siimage.c ---- linux-3.0.7/drivers/ide/siimage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/siimage.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/siimage.c linux-3.0.8/drivers/ide/siimage.c +--- linux-3.0.8/drivers/ide/siimage.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/siimage.c 2011-10-11 10:44:33.000000000 -0400 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ .udma_mask = ATA_UDMA6, \ } @@ -27702,9 +28064,9 @@ diff -urNp linux-3.0.7/drivers/ide/siimage.c linux-3.0.7/drivers/ide/siimage.c /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops), /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops) }; -diff -urNp linux-3.0.7/drivers/ide/sis5513.c linux-3.0.7/drivers/ide/sis5513.c ---- linux-3.0.7/drivers/ide/sis5513.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/sis5513.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/sis5513.c linux-3.0.8/drivers/ide/sis5513.c +--- linux-3.0.8/drivers/ide/sis5513.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/sis5513.c 2011-10-11 10:44:33.000000000 -0400 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata .cable_detect = sis_cable_detect, }; @@ -27714,9 +28076,9 @@ diff -urNp linux-3.0.7/drivers/ide/sis5513.c linux-3.0.7/drivers/ide/sis5513.c .name = DRV_NAME, .init_chipset = init_chipset_sis5513, .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} }, -diff -urNp linux-3.0.7/drivers/ide/sl82c105.c linux-3.0.7/drivers/ide/sl82c105.c ---- linux-3.0.7/drivers/ide/sl82c105.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/sl82c105.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/sl82c105.c linux-3.0.8/drivers/ide/sl82c105.c +--- linux-3.0.8/drivers/ide/sl82c105.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/sl82c105.c 2011-10-11 10:44:33.000000000 -0400 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105 .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27726,9 +28088,9 @@ diff -urNp linux-3.0.7/drivers/ide/sl82c105.c linux-3.0.7/drivers/ide/sl82c105.c .name = DRV_NAME, .init_chipset = init_chipset_sl82c105, .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}}, -diff -urNp linux-3.0.7/drivers/ide/slc90e66.c linux-3.0.7/drivers/ide/slc90e66.c ---- linux-3.0.7/drivers/ide/slc90e66.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/slc90e66.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/slc90e66.c linux-3.0.8/drivers/ide/slc90e66.c +--- linux-3.0.8/drivers/ide/slc90e66.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/slc90e66.c 2011-10-11 10:44:33.000000000 -0400 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6 .cable_detect = slc90e66_cable_detect, }; @@ -27738,9 +28100,9 @@ diff -urNp linux-3.0.7/drivers/ide/slc90e66.c linux-3.0.7/drivers/ide/slc90e66.c .name = DRV_NAME, .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, .port_ops = &slc90e66_port_ops, -diff -urNp linux-3.0.7/drivers/ide/tc86c001.c linux-3.0.7/drivers/ide/tc86c001.c ---- linux-3.0.7/drivers/ide/tc86c001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/tc86c001.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/tc86c001.c linux-3.0.8/drivers/ide/tc86c001.c +--- linux-3.0.8/drivers/ide/tc86c001.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/tc86c001.c 2011-10-11 10:44:33.000000000 -0400 @@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001 .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27750,9 +28112,9 @@ diff -urNp linux-3.0.7/drivers/ide/tc86c001.c linux-3.0.7/drivers/ide/tc86c001.c .name = DRV_NAME, .init_hwif = init_hwif_tc86c001, .port_ops = &tc86c001_port_ops, -diff -urNp linux-3.0.7/drivers/ide/triflex.c linux-3.0.7/drivers/ide/triflex.c ---- linux-3.0.7/drivers/ide/triflex.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/triflex.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/triflex.c linux-3.0.8/drivers/ide/triflex.c +--- linux-3.0.8/drivers/ide/triflex.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/triflex.c 2011-10-11 10:44:33.000000000 -0400 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex .set_dma_mode = triflex_set_mode, }; @@ -27762,9 +28124,9 @@ diff -urNp linux-3.0.7/drivers/ide/triflex.c linux-3.0.7/drivers/ide/triflex.c .name = DRV_NAME, .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, .port_ops = &triflex_port_ops, -diff -urNp linux-3.0.7/drivers/ide/trm290.c linux-3.0.7/drivers/ide/trm290.c ---- linux-3.0.7/drivers/ide/trm290.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/trm290.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/trm290.c linux-3.0.8/drivers/ide/trm290.c +--- linux-3.0.8/drivers/ide/trm290.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/trm290.c 2011-10-11 10:44:33.000000000 -0400 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops .dma_check = trm290_dma_check, }; @@ -27774,9 +28136,9 @@ diff -urNp linux-3.0.7/drivers/ide/trm290.c linux-3.0.7/drivers/ide/trm290.c .name = DRV_NAME, .init_hwif = init_hwif_trm290, .tp_ops = &trm290_tp_ops, -diff -urNp linux-3.0.7/drivers/ide/via82cxxx.c linux-3.0.7/drivers/ide/via82cxxx.c ---- linux-3.0.7/drivers/ide/via82cxxx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/ide/via82cxxx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/ide/via82cxxx.c linux-3.0.8/drivers/ide/via82cxxx.c +--- linux-3.0.8/drivers/ide/via82cxxx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/ide/via82cxxx.c 2011-10-11 10:44:33.000000000 -0400 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_por .cable_detect = via82cxxx_cable_detect, }; @@ -27786,9 +28148,9 @@ diff -urNp linux-3.0.7/drivers/ide/via82cxxx.c linux-3.0.7/drivers/ide/via82cxxx .name = DRV_NAME, .init_chipset = init_chipset_via82cxxx, .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } }, -diff -urNp linux-3.0.7/drivers/infiniband/core/cm.c linux-3.0.7/drivers/infiniband/core/cm.c ---- linux-3.0.7/drivers/infiniband/core/cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/core/cm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/core/cm.c linux-3.0.8/drivers/infiniband/core/cm.c +--- linux-3.0.8/drivers/infiniband/core/cm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/core/cm.c 2011-08-23 21:47:55.000000000 -0400 @@ -113,7 +113,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -27928,9 +28290,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/core/cm.c linux-3.0.7/drivers/infiniba } static const struct sysfs_ops cm_counter_ops = { -diff -urNp linux-3.0.7/drivers/infiniband/core/fmr_pool.c linux-3.0.7/drivers/infiniband/core/fmr_pool.c ---- linux-3.0.7/drivers/infiniband/core/fmr_pool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/core/fmr_pool.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/core/fmr_pool.c linux-3.0.8/drivers/infiniband/core/fmr_pool.c +--- linux-3.0.8/drivers/infiniband/core/fmr_pool.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/core/fmr_pool.c 2011-08-23 21:47:55.000000000 -0400 @@ -97,8 +97,8 @@ struct ib_fmr_pool { struct task_struct *thread; @@ -27998,9 +28360,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/core/fmr_pool.c linux-3.0.7/drivers/in wake_up_process(pool->thread); } } -diff -urNp linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c ---- linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c +--- linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c 2011-08-23 21:47:55.000000000 -0400 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r int err; struct fw_ri_tpte tpt; @@ -28019,9 +28381,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.7/drivers/inf } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", __func__, stag_state, type, pdid, stag_idx); -diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c ---- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c +--- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru struct infinipath_counters counters; struct ipath_devdata *dd; @@ -28031,9 +28393,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.7/driver dd = file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); -diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c ---- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c +--- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de struct ib_atomic_eth *ateth; struct ipath_ack_entry *e; @@ -28057,9 +28419,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.7/driver (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, be64_to_cpu(ateth->compare_data), sdata); -diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c ---- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c +--- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-08-23 21:47:55.000000000 -0400 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip unsigned long flags; struct ib_wc wc; @@ -28083,9 +28445,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.7/drive (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, sdata, wqe->wr.wr.atomic.swap); goto send_comp; -diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes.c linux-3.0.7/drivers/infiniband/hw/nes/nes.c ---- linux-3.0.7/drivers/infiniband/hw/nes/nes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/nes/nes.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.c linux-3.0.8/drivers/infiniband/hw/nes/nes.c +--- linux-3.0.8/drivers/infiniband/hw/nes/nes.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/nes/nes.c 2011-08-23 21:47:55.000000000 -0400 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); @@ -28104,63 +28466,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes.c linux-3.0.7/drivers/infin /* Free the control structures */ -diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes.h linux-3.0.7/drivers/infiniband/hw/nes/nes.h ---- linux-3.0.7/drivers/infiniband/hw/nes/nes.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/nes/nes.h 2011-08-23 21:47:55.000000000 -0400 -@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; - extern unsigned int wqm_quanta; - extern struct list_head nes_adapter_list; - --extern atomic_t cm_connects; --extern atomic_t cm_accepts; --extern atomic_t cm_disconnects; --extern atomic_t cm_closes; --extern atomic_t cm_connecteds; --extern atomic_t cm_connect_reqs; --extern atomic_t cm_rejects; --extern atomic_t mod_qp_timouts; --extern atomic_t qps_created; --extern atomic_t qps_destroyed; --extern atomic_t sw_qps_destroyed; -+extern atomic_unchecked_t cm_connects; -+extern atomic_unchecked_t cm_accepts; -+extern atomic_unchecked_t cm_disconnects; -+extern atomic_unchecked_t cm_closes; -+extern atomic_unchecked_t cm_connecteds; -+extern atomic_unchecked_t cm_connect_reqs; -+extern atomic_unchecked_t cm_rejects; -+extern atomic_unchecked_t mod_qp_timouts; -+extern atomic_unchecked_t qps_created; -+extern atomic_unchecked_t qps_destroyed; -+extern atomic_unchecked_t sw_qps_destroyed; - extern u32 mh_detected; - extern u32 mh_pauses_sent; - extern u32 cm_packets_sent; -@@ -194,14 +194,14 @@ extern u32 cm_packets_created; - extern u32 cm_packets_received; - extern u32 cm_packets_dropped; - extern u32 cm_packets_retrans; --extern atomic_t cm_listens_created; --extern atomic_t cm_listens_destroyed; -+extern atomic_unchecked_t cm_listens_created; -+extern atomic_unchecked_t cm_listens_destroyed; - extern u32 cm_backlog_drops; --extern atomic_t cm_loopbacks; --extern atomic_t cm_nodes_created; --extern atomic_t cm_nodes_destroyed; --extern atomic_t cm_accel_dropped_pkts; --extern atomic_t cm_resets_recvd; -+extern atomic_unchecked_t cm_loopbacks; -+extern atomic_unchecked_t cm_nodes_created; -+extern atomic_unchecked_t cm_nodes_destroyed; -+extern atomic_unchecked_t cm_accel_dropped_pkts; -+extern atomic_unchecked_t cm_resets_recvd; - - extern u32 int_mod_timer_init; - extern u32 int_mod_cq_depth_256; -diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c ---- linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c +--- linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c 2011-08-23 21:47:55.000000000 -0400 @@ -68,14 +68,14 @@ u32 cm_packets_dropped; u32 cm_packets_retrans; u32 cm_packets_created; @@ -28357,9 +28665,63 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.7/drivers/in nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c ---- linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.h linux-3.0.8/drivers/infiniband/hw/nes/nes.h +--- linux-3.0.8/drivers/infiniband/hw/nes/nes.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/nes/nes.h 2011-08-23 21:47:55.000000000 -0400 +@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; + extern unsigned int wqm_quanta; + extern struct list_head nes_adapter_list; + +-extern atomic_t cm_connects; +-extern atomic_t cm_accepts; +-extern atomic_t cm_disconnects; +-extern atomic_t cm_closes; +-extern atomic_t cm_connecteds; +-extern atomic_t cm_connect_reqs; +-extern atomic_t cm_rejects; +-extern atomic_t mod_qp_timouts; +-extern atomic_t qps_created; +-extern atomic_t qps_destroyed; +-extern atomic_t sw_qps_destroyed; ++extern atomic_unchecked_t cm_connects; ++extern atomic_unchecked_t cm_accepts; ++extern atomic_unchecked_t cm_disconnects; ++extern atomic_unchecked_t cm_closes; ++extern atomic_unchecked_t cm_connecteds; ++extern atomic_unchecked_t cm_connect_reqs; ++extern atomic_unchecked_t cm_rejects; ++extern atomic_unchecked_t mod_qp_timouts; ++extern atomic_unchecked_t qps_created; ++extern atomic_unchecked_t qps_destroyed; ++extern atomic_unchecked_t sw_qps_destroyed; + extern u32 mh_detected; + extern u32 mh_pauses_sent; + extern u32 cm_packets_sent; +@@ -194,14 +194,14 @@ extern u32 cm_packets_created; + extern u32 cm_packets_received; + extern u32 cm_packets_dropped; + extern u32 cm_packets_retrans; +-extern atomic_t cm_listens_created; +-extern atomic_t cm_listens_destroyed; ++extern atomic_unchecked_t cm_listens_created; ++extern atomic_unchecked_t cm_listens_destroyed; + extern u32 cm_backlog_drops; +-extern atomic_t cm_loopbacks; +-extern atomic_t cm_nodes_created; +-extern atomic_t cm_nodes_destroyed; +-extern atomic_t cm_accel_dropped_pkts; +-extern atomic_t cm_resets_recvd; ++extern atomic_unchecked_t cm_loopbacks; ++extern atomic_unchecked_t cm_nodes_created; ++extern atomic_unchecked_t cm_nodes_destroyed; ++extern atomic_unchecked_t cm_accel_dropped_pkts; ++extern atomic_unchecked_t cm_resets_recvd; + + extern u32 int_mod_timer_init; + extern u32 int_mod_cq_depth_256; +diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c +--- linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c 2011-08-23 21:47:55.000000000 -0400 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats target_stat_values[++index] = mh_detected; target_stat_values[++index] = mh_pauses_sent; @@ -28410,9 +28772,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.7/drivers/i target_stat_values[++index] = nesadapter->free_4kpbl; target_stat_values[++index] = nesadapter->free_256pbl; target_stat_values[++index] = int_mod_timer_init; -diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c ---- linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c +--- linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c 2011-08-23 21:47:55.000000000 -0400 @@ -46,9 +46,9 @@ #include <rdma/ib_umem.h> @@ -28444,9 +28806,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.7/drivers nesqp->destroyed = 1; /* Blow away the connection if it exists. */ -diff -urNp linux-3.0.7/drivers/infiniband/hw/qib/qib.h linux-3.0.7/drivers/infiniband/hw/qib/qib.h ---- linux-3.0.7/drivers/infiniband/hw/qib/qib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/infiniband/hw/qib/qib.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/infiniband/hw/qib/qib.h linux-3.0.8/drivers/infiniband/hw/qib/qib.h +--- linux-3.0.8/drivers/infiniband/hw/qib/qib.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/infiniband/hw/qib/qib.h 2011-08-23 21:47:55.000000000 -0400 @@ -51,6 +51,7 @@ #include <linux/completion.h> #include <linux/kref.h> @@ -28455,9 +28817,9 @@ diff -urNp linux-3.0.7/drivers/infiniband/hw/qib/qib.h linux-3.0.7/drivers/infin #include "qib_common.h" #include "qib_verbs.h" -diff -urNp linux-3.0.7/drivers/input/gameport/gameport.c linux-3.0.7/drivers/input/gameport/gameport.c ---- linux-3.0.7/drivers/input/gameport/gameport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/gameport/gameport.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/gameport/gameport.c linux-3.0.8/drivers/input/gameport/gameport.c +--- linux-3.0.8/drivers/input/gameport/gameport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/gameport/gameport.c 2011-08-23 21:47:55.000000000 -0400 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) @@ -28475,9 +28837,9 @@ diff -urNp linux-3.0.7/drivers/input/gameport/gameport.c linux-3.0.7/drivers/inp gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) -diff -urNp linux-3.0.7/drivers/input/input.c linux-3.0.7/drivers/input/input.c ---- linux-3.0.7/drivers/input/input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/input.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/input.c linux-3.0.8/drivers/input/input.c +--- linux-3.0.8/drivers/input/input.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/input.c 2011-08-23 21:47:55.000000000 -0400 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc */ int input_register_device(struct input_dev *dev) @@ -28496,9 +28858,9 @@ diff -urNp linux-3.0.7/drivers/input/input.c linux-3.0.7/drivers/input/input.c error = device_add(&dev->dev); if (error) -diff -urNp linux-3.0.7/drivers/input/joystick/sidewinder.c linux-3.0.7/drivers/input/joystick/sidewinder.c ---- linux-3.0.7/drivers/input/joystick/sidewinder.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/joystick/sidewinder.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/joystick/sidewinder.c linux-3.0.8/drivers/input/joystick/sidewinder.c +--- linux-3.0.8/drivers/input/joystick/sidewinder.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/joystick/sidewinder.c 2011-08-23 21:48:14.000000000 -0400 @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/module.h> @@ -28516,9 +28878,9 @@ diff -urNp linux-3.0.7/drivers/input/joystick/sidewinder.c linux-3.0.7/drivers/i i = sw_read_packet(sw->gameport, buf, sw->length, 0); if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */ -diff -urNp linux-3.0.7/drivers/input/joystick/xpad.c linux-3.0.7/drivers/input/joystick/xpad.c ---- linux-3.0.7/drivers/input/joystick/xpad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/joystick/xpad.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/joystick/xpad.c linux-3.0.8/drivers/input/joystick/xpad.c +--- linux-3.0.8/drivers/input/joystick/xpad.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/joystick/xpad.c 2011-08-23 21:47:55.000000000 -0400 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas static int xpad_led_probe(struct usb_xpad *xpad) @@ -28537,9 +28899,9 @@ diff -urNp linux-3.0.7/drivers/input/joystick/xpad.c linux-3.0.7/drivers/input/j snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad = xpad; -diff -urNp linux-3.0.7/drivers/input/mousedev.c linux-3.0.7/drivers/input/mousedev.c ---- linux-3.0.7/drivers/input/mousedev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/mousedev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/mousedev.c linux-3.0.8/drivers/input/mousedev.c +--- linux-3.0.8/drivers/input/mousedev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/mousedev.c 2011-08-23 21:47:55.000000000 -0400 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file spin_unlock_irq(&client->packet_lock); @@ -28549,9 +28911,9 @@ diff -urNp linux-3.0.7/drivers/input/mousedev.c linux-3.0.7/drivers/input/moused return -EFAULT; return count; -diff -urNp linux-3.0.7/drivers/input/serio/serio.c linux-3.0.7/drivers/input/serio/serio.c ---- linux-3.0.7/drivers/input/serio/serio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/input/serio/serio.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/input/serio/serio.c linux-3.0.8/drivers/input/serio/serio.c +--- linux-3.0.8/drivers/input/serio/serio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/input/serio/serio.c 2011-08-23 21:47:55.000000000 -0400 @@ -497,7 +497,7 @@ static void serio_release_port(struct de */ static void serio_init_port(struct serio *serio) @@ -28570,9 +28932,9 @@ diff -urNp linux-3.0.7/drivers/input/serio/serio.c linux-3.0.7/drivers/input/ser serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; serio->dev.groups = serio_device_attr_groups; -diff -urNp linux-3.0.7/drivers/isdn/capi/capi.c linux-3.0.7/drivers/isdn/capi/capi.c ---- linux-3.0.7/drivers/isdn/capi/capi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/capi/capi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/capi/capi.c linux-3.0.8/drivers/isdn/capi/capi.c +--- linux-3.0.8/drivers/isdn/capi/capi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/capi/capi.c 2011-08-23 21:47:55.000000000 -0400 @@ -83,8 +83,8 @@ struct capiminor { struct capi20_appl *ap; @@ -28610,9 +28972,9 @@ diff -urNp linux-3.0.7/drivers/isdn/capi/capi.c linux-3.0.7/drivers/isdn/capi/ca capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */ capimsg_setu16(skb->data, 16, len); /* Data length */ -diff -urNp linux-3.0.7/drivers/isdn/gigaset/common.c linux-3.0.7/drivers/isdn/gigaset/common.c ---- linux-3.0.7/drivers/isdn/gigaset/common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/gigaset/common.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/gigaset/common.c linux-3.0.8/drivers/isdn/gigaset/common.c +--- linux-3.0.8/drivers/isdn/gigaset/common.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/gigaset/common.c 2011-08-23 21:47:55.000000000 -0400 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -28622,9 +28984,9 @@ diff -urNp linux-3.0.7/drivers/isdn/gigaset/common.c linux-3.0.7/drivers/isdn/gi cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-3.0.7/drivers/isdn/gigaset/gigaset.h linux-3.0.7/drivers/isdn/gigaset/gigaset.h ---- linux-3.0.7/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/gigaset/gigaset.h linux-3.0.8/drivers/isdn/gigaset/gigaset.h +--- linux-3.0.8/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400 @@ -35,6 +35,7 @@ #include <linux/tty_driver.h> #include <linux/list.h> @@ -28642,9 +29004,9 @@ diff -urNp linux-3.0.7/drivers/isdn/gigaset/gigaset.h linux-3.0.7/drivers/isdn/g struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-3.0.7/drivers/isdn/gigaset/interface.c linux-3.0.7/drivers/isdn/gigaset/interface.c ---- linux-3.0.7/drivers/isdn/gigaset/interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/gigaset/interface.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/gigaset/interface.c linux-3.0.8/drivers/isdn/gigaset/interface.c +--- linux-3.0.8/drivers/isdn/gigaset/interface.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/gigaset/interface.c 2011-08-23 21:47:55.000000000 -0400 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt } tty->driver_data = cs; @@ -28732,9 +29094,9 @@ diff -urNp linux-3.0.7/drivers/isdn/gigaset/interface.c linux-3.0.7/drivers/isdn dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-3.0.7/drivers/isdn/hardware/avm/b1.c linux-3.0.7/drivers/isdn/hardware/avm/b1.c ---- linux-3.0.7/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/avm/b1.c linux-3.0.8/drivers/isdn/hardware/avm/b1.c +--- linux-3.0.8/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -28753,9 +29115,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/avm/b1.c linux-3.0.7/drivers/isdn/h return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; @@ -28764,9 +29126,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.7/driver if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -28776,9 +29138,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.7/driver DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -28788,9 +29150,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.7/driver DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c 2011-08-23 21:48:14.000000000 -0400 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -28800,9 +29162,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.7/drive DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h ---- linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h +--- linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter { } diva_didd_add_adapter_t; typedef struct _diva_didd_remove_adapter { @@ -28812,9 +29174,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h linux-3.0.7/driver typedef struct _diva_didd_read_adapter_array { void * buffer; dword length; -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c 2011-08-23 21:48:14.000000000 -0400 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -28824,9 +29186,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.7/drivers DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/message.c linux-3.0.7/drivers/isdn/hardware/eicon/message.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/message.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/message.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/message.c linux-3.0.8/drivers/isdn/hardware/eicon/message.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/message.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/message.c 2011-08-23 21:48:14.000000000 -0400 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci) dword d; word w; @@ -28863,9 +29225,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/message.c linux-3.0.7/drivers set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */ if(!a->group_optimization_enabled) -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c ---- linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c +--- linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c 2011-08-23 21:48:14.000000000 -0400 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -28875,9 +29237,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.7/drivers DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h ---- linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h +--- linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-23 21:47:55.000000000 -0400 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t { typedef struct _diva_os_idi_adapter_interface { diva_init_card_proc_t cleanup_adapter_proc; @@ -28887,9 +29249,9 @@ diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.7/dri typedef struct _diva_os_xdi_adapter { struct list_head link; -diff -urNp linux-3.0.7/drivers/isdn/i4l/isdn_common.c linux-3.0.7/drivers/isdn/i4l/isdn_common.c ---- linux-3.0.7/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/i4l/isdn_common.c linux-3.0.8/drivers/isdn/i4l/isdn_common.c +--- linux-3.0.8/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, } iocpar; void __user *argp = (void __user *)arg; @@ -28899,9 +29261,9 @@ diff -urNp linux-3.0.7/drivers/isdn/i4l/isdn_common.c linux-3.0.7/drivers/isdn/i #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts -diff -urNp linux-3.0.7/drivers/isdn/icn/icn.c linux-3.0.7/drivers/isdn/icn/icn.c ---- linux-3.0.7/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/isdn/icn/icn.c linux-3.0.8/drivers/isdn/icn/icn.c +--- linux-3.0.8/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -28911,9 +29273,9 @@ diff -urNp linux-3.0.7/drivers/isdn/icn/icn.c linux-3.0.7/drivers/isdn/icn/icn.c return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-3.0.7/drivers/lguest/core.c linux-3.0.7/drivers/lguest/core.c ---- linux-3.0.7/drivers/lguest/core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/lguest/core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/lguest/core.c linux-3.0.8/drivers/lguest/core.c +--- linux-3.0.8/drivers/lguest/core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/lguest/core.c 2011-08-23 21:47:55.000000000 -0400 @@ -92,9 +92,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. @@ -28941,9 +29303,9 @@ diff -urNp linux-3.0.7/drivers/lguest/core.c linux-3.0.7/drivers/lguest/core.c end_switcher_text - start_switcher_text); printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-3.0.7/drivers/lguest/x86/core.c linux-3.0.7/drivers/lguest/x86/core.c ---- linux-3.0.7/drivers/lguest/x86/core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/lguest/x86/core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/lguest/x86/core.c linux-3.0.8/drivers/lguest/x86/core.c +--- linux-3.0.8/drivers/lguest/x86/core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/lguest/x86/core.c 2011-08-23 21:47:55.000000000 -0400 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it */ static unsigned long switcher_offset(void) @@ -28985,9 +29347,9 @@ diff -urNp linux-3.0.7/drivers/lguest/x86/core.c linux-3.0.7/drivers/lguest/x86/ lguest_entry.segment = LGUEST_CS; /* -diff -urNp linux-3.0.7/drivers/lguest/x86/switcher_32.S linux-3.0.7/drivers/lguest/x86/switcher_32.S ---- linux-3.0.7/drivers/lguest/x86/switcher_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/lguest/x86/switcher_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/lguest/x86/switcher_32.S linux-3.0.8/drivers/lguest/x86/switcher_32.S +--- linux-3.0.8/drivers/lguest/x86/switcher_32.S 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/lguest/x86/switcher_32.S 2011-08-23 21:47:55.000000000 -0400 @@ -87,6 +87,7 @@ #include <asm/page.h> #include <asm/segment.h> @@ -29046,9 +29408,9 @@ diff -urNp linux-3.0.7/drivers/lguest/x86/switcher_32.S linux-3.0.7/drivers/lgue // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-3.0.7/drivers/macintosh/macio_asic.c linux-3.0.7/drivers/macintosh/macio_asic.c ---- linux-3.0.7/drivers/macintosh/macio_asic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/macintosh/macio_asic.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/macintosh/macio_asic.c linux-3.0.8/drivers/macintosh/macio_asic.c +--- linux-3.0.8/drivers/macintosh/macio_asic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/macintosh/macio_asic.c 2011-10-11 10:44:33.000000000 -0400 @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s * MacIO is matched against any Apple ID, it's probe() function * will then decide wether it applies or not @@ -29058,9 +29420,66 @@ diff -urNp linux-3.0.7/drivers/macintosh/macio_asic.c linux-3.0.7/drivers/macint .vendor = PCI_VENDOR_ID_APPLE, .device = PCI_ANY_ID, .subvendor = PCI_ANY_ID, -diff -urNp linux-3.0.7/drivers/md/dm-ioctl.c linux-3.0.7/drivers/md/dm-ioctl.c ---- linux-3.0.7/drivers/md/dm-ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/md/dm-ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/dm.c linux-3.0.8/drivers/md/dm.c +--- linux-3.0.8/drivers/md/dm.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/md/dm.c 2011-08-23 21:47:55.000000000 -0400 +@@ -164,9 +164,9 @@ struct mapped_device { + /* + * Event handling. + */ +- atomic_t event_nr; ++ atomic_unchecked_t event_nr; + wait_queue_head_t eventq; +- atomic_t uevent_seq; ++ atomic_unchecked_t uevent_seq; + struct list_head uevent_list; + spinlock_t uevent_lock; /* Protect access to uevent_list */ + +@@ -1842,8 +1842,8 @@ static struct mapped_device *alloc_dev(i + rwlock_init(&md->map_lock); + atomic_set(&md->holders, 1); + atomic_set(&md->open_count, 0); +- atomic_set(&md->event_nr, 0); +- atomic_set(&md->uevent_seq, 0); ++ atomic_set_unchecked(&md->event_nr, 0); ++ atomic_set_unchecked(&md->uevent_seq, 0); + INIT_LIST_HEAD(&md->uevent_list); + spin_lock_init(&md->uevent_lock); + +@@ -1977,7 +1977,7 @@ static void event_callback(void *context + + dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); + +- atomic_inc(&md->event_nr); ++ atomic_inc_unchecked(&md->event_nr); + wake_up(&md->eventq); + } + +@@ -2553,18 +2553,18 @@ int dm_kobject_uevent(struct mapped_devi + + uint32_t dm_next_uevent_seq(struct mapped_device *md) + { +- return atomic_add_return(1, &md->uevent_seq); ++ return atomic_add_return_unchecked(1, &md->uevent_seq); + } + + uint32_t dm_get_event_nr(struct mapped_device *md) + { +- return atomic_read(&md->event_nr); ++ return atomic_read_unchecked(&md->event_nr); + } + + int dm_wait_event(struct mapped_device *md, int event_nr) + { + return wait_event_interruptible(md->eventq, +- (event_nr != atomic_read(&md->event_nr))); ++ (event_nr != atomic_read_unchecked(&md->event_nr))); + } + + void dm_uevent_add(struct mapped_device *md, struct list_head *elist) +diff -urNp linux-3.0.8/drivers/md/dm-ioctl.c linux-3.0.8/drivers/md/dm-ioctl.c +--- linux-3.0.8/drivers/md/dm-ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/md/dm-ioctl.c 2011-08-23 21:47:55.000000000 -0400 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -29070,9 +29489,9 @@ diff -urNp linux-3.0.7/drivers/md/dm-ioctl.c linux-3.0.7/drivers/md/dm-ioctl.c if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-3.0.7/drivers/md/dm-raid1.c linux-3.0.7/drivers/md/dm-raid1.c ---- linux-3.0.7/drivers/md/dm-raid1.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/md/dm-raid1.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/dm-raid1.c linux-3.0.8/drivers/md/dm-raid1.c +--- linux-3.0.8/drivers/md/dm-raid1.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/md/dm-raid1.c 2011-08-23 21:47:55.000000000 -0400 @@ -40,7 +40,7 @@ enum dm_raid1_error { struct mirror { @@ -29145,9 +29564,9 @@ diff -urNp linux-3.0.7/drivers/md/dm-raid1.c linux-3.0.7/drivers/md/dm-raid1.c return 'A'; return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : -diff -urNp linux-3.0.7/drivers/md/dm-stripe.c linux-3.0.7/drivers/md/dm-stripe.c ---- linux-3.0.7/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/dm-stripe.c linux-3.0.8/drivers/md/dm-stripe.c +--- linux-3.0.8/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400 @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -29186,9 +29605,9 @@ diff -urNp linux-3.0.7/drivers/md/dm-stripe.c linux-3.0.7/drivers/md/dm-stripe.c DM_IO_ERROR_THRESHOLD) schedule_work(&sc->trigger_event); } -diff -urNp linux-3.0.7/drivers/md/dm-table.c linux-3.0.7/drivers/md/dm-table.c ---- linux-3.0.7/drivers/md/dm-table.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/dm-table.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/dm-table.c linux-3.0.8/drivers/md/dm-table.c +--- linux-3.0.8/drivers/md/dm-table.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/dm-table.c 2011-10-17 23:17:19.000000000 -0400 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -29198,66 +29617,9 @@ diff -urNp linux-3.0.7/drivers/md/dm-table.c linux-3.0.7/drivers/md/dm-table.c 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-3.0.7/drivers/md/dm.c linux-3.0.7/drivers/md/dm.c ---- linux-3.0.7/drivers/md/dm.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/md/dm.c 2011-08-23 21:47:55.000000000 -0400 -@@ -164,9 +164,9 @@ struct mapped_device { - /* - * Event handling. - */ -- atomic_t event_nr; -+ atomic_unchecked_t event_nr; - wait_queue_head_t eventq; -- atomic_t uevent_seq; -+ atomic_unchecked_t uevent_seq; - struct list_head uevent_list; - spinlock_t uevent_lock; /* Protect access to uevent_list */ - -@@ -1842,8 +1842,8 @@ static struct mapped_device *alloc_dev(i - rwlock_init(&md->map_lock); - atomic_set(&md->holders, 1); - atomic_set(&md->open_count, 0); -- atomic_set(&md->event_nr, 0); -- atomic_set(&md->uevent_seq, 0); -+ atomic_set_unchecked(&md->event_nr, 0); -+ atomic_set_unchecked(&md->uevent_seq, 0); - INIT_LIST_HEAD(&md->uevent_list); - spin_lock_init(&md->uevent_lock); - -@@ -1977,7 +1977,7 @@ static void event_callback(void *context - - dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); - -- atomic_inc(&md->event_nr); -+ atomic_inc_unchecked(&md->event_nr); - wake_up(&md->eventq); - } - -@@ -2553,18 +2553,18 @@ int dm_kobject_uevent(struct mapped_devi - - uint32_t dm_next_uevent_seq(struct mapped_device *md) - { -- return atomic_add_return(1, &md->uevent_seq); -+ return atomic_add_return_unchecked(1, &md->uevent_seq); - } - - uint32_t dm_get_event_nr(struct mapped_device *md) - { -- return atomic_read(&md->event_nr); -+ return atomic_read_unchecked(&md->event_nr); - } - - int dm_wait_event(struct mapped_device *md, int event_nr) - { - return wait_event_interruptible(md->eventq, -- (event_nr != atomic_read(&md->event_nr))); -+ (event_nr != atomic_read_unchecked(&md->event_nr))); - } - - void dm_uevent_add(struct mapped_device *md, struct list_head *elist) -diff -urNp linux-3.0.7/drivers/md/md.c linux-3.0.7/drivers/md/md.c ---- linux-3.0.7/drivers/md/md.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/md.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/md.c linux-3.0.8/drivers/md/md.c +--- linux-3.0.8/drivers/md/md.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/md.c 2011-10-17 23:17:19.000000000 -0400 @@ -231,10 +231,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev); * start build, activate spare */ @@ -29372,9 +29734,9 @@ diff -urNp linux-3.0.7/drivers/md/md.c linux-3.0.7/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-3.0.7/drivers/md/md.h linux-3.0.7/drivers/md/md.h ---- linux-3.0.7/drivers/md/md.h 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/md.h 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/md.h linux-3.0.8/drivers/md/md.h +--- linux-3.0.8/drivers/md/md.h 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/md.h 2011-10-17 23:17:19.000000000 -0400 @@ -97,13 +97,13 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal @@ -29400,30 +29762,9 @@ diff -urNp linux-3.0.7/drivers/md/md.h linux-3.0.7/drivers/md/md.h } struct mdk_personality -diff -urNp linux-3.0.7/drivers/md/raid1.c linux-3.0.7/drivers/md/raid1.c ---- linux-3.0.7/drivers/md/raid1.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/raid1.c 2011-10-17 23:17:19.000000000 -0400 -@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t * - rdev_dec_pending(rdev, mddev); - md_error(mddev, rdev); - } else -- atomic_add(s, &rdev->corrected_errors); -+ atomic_add_unchecked(s, &rdev->corrected_errors); - } - d = start; - while (d != r1_bio->read_disk) { -@@ -1492,7 +1492,7 @@ static void fix_read_error(conf_t *conf, - /* Well, this device is dead */ - md_error(mddev, rdev); - else { -- atomic_add(s, &rdev->corrected_errors); -+ atomic_add_unchecked(s, &rdev->corrected_errors); - printk(KERN_INFO - "md/raid1:%s: read error corrected " - "(%d sectors at %llu on %s)\n", -diff -urNp linux-3.0.7/drivers/md/raid10.c linux-3.0.7/drivers/md/raid10.c ---- linux-3.0.7/drivers/md/raid10.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/raid10.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/raid10.c linux-3.0.8/drivers/md/raid10.c +--- linux-3.0.8/drivers/md/raid10.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/raid10.c 2011-10-17 23:17:19.000000000 -0400 @@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); @@ -29483,9 +29824,30 @@ diff -urNp linux-3.0.7/drivers/md/raid10.c linux-3.0.7/drivers/md/raid10.c if (sync_page_io(rdev, r10_bio->devs[sl].addr + sect, -diff -urNp linux-3.0.7/drivers/md/raid5.c linux-3.0.7/drivers/md/raid5.c ---- linux-3.0.7/drivers/md/raid5.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/md/raid5.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/md/raid1.c linux-3.0.8/drivers/md/raid1.c +--- linux-3.0.8/drivers/md/raid1.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/raid1.c 2011-10-17 23:17:19.000000000 -0400 +@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t * + rdev_dec_pending(rdev, mddev); + md_error(mddev, rdev); + } else +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + } + d = start; + while (d != r1_bio->read_disk) { +@@ -1492,7 +1492,7 @@ static void fix_read_error(conf_t *conf, + /* Well, this device is dead */ + md_error(mddev, rdev); + else { +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + printk(KERN_INFO + "md/raid1:%s: read error corrected " + "(%d sectors at %llu on %s)\n", +diff -urNp linux-3.0.8/drivers/md/raid5.c linux-3.0.8/drivers/md/raid5.c +--- linux-3.0.8/drivers/md/raid5.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/md/raid5.c 2011-10-17 23:17:19.000000000 -0400 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea bi->bi_next = NULL; if ((rw & WRITE) && @@ -29531,9 +29893,9 @@ diff -urNp linux-3.0.7/drivers/md/raid5.c linux-3.0.7/drivers/md/raid5.c chunk_offset = sector_div(new_sector, sectors_per_chunk); stripe = new_sector; -diff -urNp linux-3.0.7/drivers/media/common/saa7146_hlp.c linux-3.0.7/drivers/media/common/saa7146_hlp.c ---- linux-3.0.7/drivers/media/common/saa7146_hlp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/common/saa7146_hlp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/common/saa7146_hlp.c linux-3.0.8/drivers/media/common/saa7146_hlp.c +--- linux-3.0.8/drivers/media/common/saa7146_hlp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/common/saa7146_hlp.c 2011-08-23 21:48:14.000000000 -0400 @@ -353,6 +353,8 @@ static void calculate_clipping_registers int x[32], y[32], w[32], h[32]; @@ -29543,9 +29905,9 @@ diff -urNp linux-3.0.7/drivers/media/common/saa7146_hlp.c linux-3.0.7/drivers/me /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +--- linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-08-23 21:48:14.000000000 -0400 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru u8 buf[HOST_LINK_BUF_SIZE]; int i; @@ -29564,9 +29926,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.7/d dprintk("%s\n", __func__); /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */ -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h ---- linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h +--- linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400 @@ -68,12 +68,12 @@ struct dvb_demux_feed { union { struct dmx_ts_feed ts; @@ -29582,9 +29944,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.7/driver struct dvb_demux *demux; void *priv; -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-24 18:24:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-24 18:24:19.000000000 -0400 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -29594,9 +29956,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.7/drivers/m struct device *clsdev; int minor; int id; -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c ---- linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-24 18:26:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c +--- linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-24 18:26:33.000000000 -0400 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di struct dib0700_adapter_state { int (*set_param_save) (struct dvb_frontend *, @@ -29606,9 +29968,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.7/drivers/med static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c +--- linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-08-23 21:48:14.000000000 -0400 @@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb if (!buf) return -ENOMEM; @@ -29618,9 +29980,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.7/driv while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", hx.addr, hx.len, hx.chk); -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h ---- linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h 2011-08-24 18:27:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h +--- linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h 2011-08-24 18:27:27.000000000 -0400 @@ -97,7 +97,7 @@ #define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02 @@ -29630,9 +29992,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.7/drivers/me int mt2060_present; u8 tuner_addr; }; -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c ---- linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c 2011-08-24 18:27:45.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c +--- linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c 2011-08-24 18:27:45.000000000 -0400 @@ -95,7 +95,7 @@ struct su3000_state { struct s6x0_state { @@ -29642,9 +30004,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.7/drivers/me /* debug */ static int dvb_usb_dw2102_debug; -diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c ---- linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c +--- linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c 2011-08-23 21:48:14.000000000 -0400 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000); @@ -29662,9 +30024,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.7/drivers/m data[0] = 0x0a; len_in = 1; info("FRM Firmware Cold Reset"); -diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000.h linux-3.0.7/drivers/media/dvb/frontends/dib3000.h ---- linux-3.0.7/drivers/media/dvb/frontends/dib3000.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/frontends/dib3000.h 2011-10-07 19:07:39.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000.h linux-3.0.8/drivers/media/dvb/frontends/dib3000.h +--- linux-3.0.8/drivers/media/dvb/frontends/dib3000.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/frontends/dib3000.h 2011-10-07 19:07:39.000000000 -0400 @@ -40,10 +40,11 @@ struct dib_fe_xfer_ops int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff); int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl); @@ -29678,9 +30040,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000.h linux-3.0.7/drivers #else static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops) -diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c ---- linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c 2011-08-24 18:28:42.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c +--- linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c 2011-08-24 18:28:42.000000000 -0400 @@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str static struct dvb_frontend_ops dib3000mb_ops; @@ -29690,9 +30052,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.7/drive { struct dib3000_state* state = NULL; -diff -urNp linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c ---- linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c +--- linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c 2011-08-23 21:48:14.000000000 -0400 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16 int ret = -1; int sync; @@ -29702,9 +30064,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c linux-3.0.7/drivers dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate); fcp = 3000; -diff -urNp linux-3.0.7/drivers/media/dvb/frontends/or51211.c linux-3.0.7/drivers/media/dvb/frontends/or51211.c ---- linux-3.0.7/drivers/media/dvb/frontends/or51211.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/frontends/or51211.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/frontends/or51211.c linux-3.0.8/drivers/media/dvb/frontends/or51211.c +--- linux-3.0.8/drivers/media/dvb/frontends/or51211.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/frontends/or51211.c 2011-08-23 21:48:14.000000000 -0400 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct u8 tudata[585]; int i; @@ -29714,9 +30076,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/frontends/or51211.c linux-3.0.7/drivers dprintk("Firmware is %zd bytes\n",fw->size); /* Get eprom data */ -diff -urNp linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c ---- linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c +--- linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c 2011-10-11 10:44:33.000000000 -0400 @@ -379,7 +379,7 @@ static struct ngene_info ngene_info_m780 /****************************************************************************/ @@ -29726,9 +30088,9 @@ diff -urNp linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.7/drivers NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2), NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2), NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2), -diff -urNp linux-3.0.7/drivers/media/video/cx18/cx18-driver.c linux-3.0.7/drivers/media/video/cx18/cx18-driver.c ---- linux-3.0.7/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/cx18/cx18-driver.c linux-3.0.8/drivers/media/video/cx18/cx18-driver.c +--- linux-3.0.8/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s struct i2c_client c; u8 eedata[256]; @@ -29738,9 +30100,9 @@ diff -urNp linux-3.0.7/drivers/media/video/cx18/cx18-driver.c linux-3.0.7/driver memset(&c, 0, sizeof(c)); strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); c.adapter = &cx->i2c_adap[0]; -diff -urNp linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c ---- linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c +--- linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c 2011-08-23 21:48:14.000000000 -0400 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur bool handle = false; struct ir_raw_event ir_core_event[64]; @@ -29750,9 +30112,9 @@ diff -urNp linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c linux-3.0.7/d do { num = 0; v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event, -diff -urNp linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c ---- linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c +--- linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c 2011-10-11 10:44:33.000000000 -0400 @@ -764,7 +764,7 @@ static struct snd_kcontrol_new snd_cx88_ * Only boards with eeprom and byte 1 at eeprom=1 have it */ @@ -29762,9 +30124,9 @@ diff -urNp linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c linux-3.0.7/drivers/ {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0, } -diff -urNp linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ---- linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +--- linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-08-23 21:48:14.000000000 -0400 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw u8 *eeprom; struct tveeprom tvdata; @@ -29774,9 +30136,9 @@ diff -urNp linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.7/ memset(&tvdata,0,sizeof(tvdata)); eeprom = pvr2_eeprom_fetch(hdw); -diff -urNp linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c ---- linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c +--- linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c 2011-08-23 21:48:14.000000000 -0400 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su unsigned char localPAT[256]; unsigned char localPMT[256]; @@ -29786,9 +30148,9 @@ diff -urNp linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c linux-3.0.7/drive /* Set video format - must be done first as it resets other settings */ set_reg8(client, 0x41, h->video_format); -diff -urNp linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c +--- linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c 2011-08-23 21:48:14.000000000 -0400 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -29807,9 +30169,9 @@ diff -urNp linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.7/dri while (loop) { struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 }; -diff -urNp linux-3.0.7/drivers/media/video/timblogiw.c linux-3.0.7/drivers/media/video/timblogiw.c ---- linux-3.0.7/drivers/media/video/timblogiw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/timblogiw.c 2011-08-24 18:29:20.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/timblogiw.c linux-3.0.8/drivers/media/video/timblogiw.c +--- linux-3.0.8/drivers/media/video/timblogiw.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/timblogiw.c 2011-08-24 18:29:20.000000000 -0400 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f /* Platform device functions */ @@ -29819,9 +30181,9 @@ diff -urNp linux-3.0.7/drivers/media/video/timblogiw.c linux-3.0.7/drivers/media .vidioc_querycap = timblogiw_querycap, .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt, .vidioc_g_fmt_vid_cap = timblogiw_g_fmt, -diff -urNp linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c ---- linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c +--- linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_ unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; @@ -29831,9 +30193,9 @@ diff -urNp linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c linux-3.0. frame = usbvision->cur_frame; image_size = frame->frmwidth * frame->frmheight; if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) || -diff -urNp linux-3.0.7/drivers/media/video/videobuf-dma-sg.c linux-3.0.7/drivers/media/video/videobuf-dma-sg.c ---- linux-3.0.7/drivers/media/video/videobuf-dma-sg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/media/video/videobuf-dma-sg.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/media/video/videobuf-dma-sg.c linux-3.0.8/drivers/media/video/videobuf-dma-sg.c +--- linux-3.0.8/drivers/media/video/videobuf-dma-sg.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/media/video/videobuf-dma-sg.c 2011-08-23 21:48:14.000000000 -0400 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; @@ -29843,9 +30205,9 @@ diff -urNp linux-3.0.7/drivers/media/video/videobuf-dma-sg.c linux-3.0.7/drivers /* Required to make generic handler to call __videobuf_alloc */ q.int_ops = &sg_ops; -diff -urNp linux-3.0.7/drivers/message/fusion/mptbase.c linux-3.0.7/drivers/message/fusion/mptbase.c ---- linux-3.0.7/drivers/message/fusion/mptbase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/fusion/mptbase.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/fusion/mptbase.c linux-3.0.8/drivers/message/fusion/mptbase.c +--- linux-3.0.8/drivers/message/fusion/mptbase.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/fusion/mptbase.c 2011-08-23 21:48:14.000000000 -0400 @@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); @@ -29860,9 +30222,9 @@ diff -urNp linux-3.0.7/drivers/message/fusion/mptbase.c linux-3.0.7/drivers/mess /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-3.0.7/drivers/message/fusion/mptsas.c linux-3.0.7/drivers/message/fusion/mptsas.c ---- linux-3.0.7/drivers/message/fusion/mptsas.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/fusion/mptsas.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/fusion/mptsas.c linux-3.0.8/drivers/message/fusion/mptsas.c +--- linux-3.0.8/drivers/message/fusion/mptsas.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/fusion/mptsas.c 2011-08-23 21:47:55.000000000 -0400 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -29911,9 +30273,9 @@ diff -urNp linux-3.0.7/drivers/message/fusion/mptsas.c linux-3.0.7/drivers/messa static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-3.0.7/drivers/message/fusion/mptscsih.c linux-3.0.7/drivers/message/fusion/mptscsih.c ---- linux-3.0.7/drivers/message/fusion/mptscsih.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/fusion/mptscsih.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/fusion/mptscsih.c linux-3.0.8/drivers/message/fusion/mptscsih.c +--- linux-3.0.8/drivers/message/fusion/mptscsih.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/fusion/mptscsih.c 2011-08-23 21:47:55.000000000 -0400 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) h = shost_priv(SChost); @@ -29939,9 +30301,9 @@ diff -urNp linux-3.0.7/drivers/message/fusion/mptscsih.c linux-3.0.7/drivers/mes return h->info_kbuf; } -diff -urNp linux-3.0.7/drivers/message/i2o/i2o_config.c linux-3.0.7/drivers/message/i2o/i2o_config.c ---- linux-3.0.7/drivers/message/i2o/i2o_config.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/i2o/i2o_config.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/i2o/i2o_config.c linux-3.0.8/drivers/message/i2o/i2o_config.c +--- linux-3.0.8/drivers/message/i2o/i2o_config.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/i2o/i2o_config.c 2011-08-23 21:48:14.000000000 -0400 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon struct i2o_message *msg; unsigned int iop; @@ -29951,9 +30313,9 @@ diff -urNp linux-3.0.7/drivers/message/i2o/i2o_config.c linux-3.0.7/drivers/mess if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; -diff -urNp linux-3.0.7/drivers/message/i2o/i2o_proc.c linux-3.0.7/drivers/message/i2o/i2o_proc.c ---- linux-3.0.7/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/i2o/i2o_proc.c linux-3.0.8/drivers/message/i2o/i2o_proc.c +--- linux-3.0.8/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400 @@ -255,13 +255,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -30040,9 +30402,9 @@ diff -urNp linux-3.0.7/drivers/message/i2o/i2o_proc.c linux-3.0.7/drivers/messag return 0; } -diff -urNp linux-3.0.7/drivers/message/i2o/iop.c linux-3.0.7/drivers/message/i2o/iop.c ---- linux-3.0.7/drivers/message/i2o/iop.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/message/i2o/iop.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/message/i2o/iop.c linux-3.0.8/drivers/message/i2o/iop.c +--- linux-3.0.8/drivers/message/i2o/iop.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/message/i2o/iop.c 2011-08-23 21:47:55.000000000 -0400 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro spin_lock_irqsave(&c->context_list_lock, flags); @@ -30066,9 +30428,9 @@ diff -urNp linux-3.0.7/drivers/message/i2o/iop.c linux-3.0.7/drivers/message/i2o INIT_LIST_HEAD(&c->context_list); #endif -diff -urNp linux-3.0.7/drivers/mfd/ab3100-core.c linux-3.0.7/drivers/mfd/ab3100-core.c ---- linux-3.0.7/drivers/mfd/ab3100-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mfd/ab3100-core.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mfd/ab3100-core.c linux-3.0.8/drivers/mfd/ab3100-core.c +--- linux-3.0.8/drivers/mfd/ab3100-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mfd/ab3100-core.c 2011-10-11 10:44:33.000000000 -0400 @@ -809,7 +809,7 @@ struct ab_family_id { char *name; }; @@ -30078,9 +30440,9 @@ diff -urNp linux-3.0.7/drivers/mfd/ab3100-core.c linux-3.0.7/drivers/mfd/ab3100- /* AB3100 */ { .id = 0xc0, -diff -urNp linux-3.0.7/drivers/mfd/abx500-core.c linux-3.0.7/drivers/mfd/abx500-core.c ---- linux-3.0.7/drivers/mfd/abx500-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mfd/abx500-core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mfd/abx500-core.c linux-3.0.8/drivers/mfd/abx500-core.c +--- linux-3.0.8/drivers/mfd/abx500-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mfd/abx500-core.c 2011-08-23 21:47:55.000000000 -0400 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list); struct abx500_device_entry { @@ -30090,9 +30452,9 @@ diff -urNp linux-3.0.7/drivers/mfd/abx500-core.c linux-3.0.7/drivers/mfd/abx500- struct device *dev; }; -diff -urNp linux-3.0.7/drivers/mfd/janz-cmodio.c linux-3.0.7/drivers/mfd/janz-cmodio.c ---- linux-3.0.7/drivers/mfd/janz-cmodio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mfd/janz-cmodio.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mfd/janz-cmodio.c linux-3.0.8/drivers/mfd/janz-cmodio.c +--- linux-3.0.8/drivers/mfd/janz-cmodio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mfd/janz-cmodio.c 2011-08-23 21:47:55.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/kernel.h> @@ -30101,9 +30463,9 @@ diff -urNp linux-3.0.7/drivers/mfd/janz-cmodio.c linux-3.0.7/drivers/mfd/janz-cm #include <linux/init.h> #include <linux/pci.h> #include <linux/interrupt.h> -diff -urNp linux-3.0.7/drivers/mfd/wm8350-i2c.c linux-3.0.7/drivers/mfd/wm8350-i2c.c ---- linux-3.0.7/drivers/mfd/wm8350-i2c.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mfd/wm8350-i2c.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mfd/wm8350-i2c.c linux-3.0.8/drivers/mfd/wm8350-i2c.c +--- linux-3.0.8/drivers/mfd/wm8350-i2c.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mfd/wm8350-i2c.c 2011-08-23 21:48:14.000000000 -0400 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; @@ -30113,9 +30475,9 @@ diff -urNp linux-3.0.7/drivers/mfd/wm8350-i2c.c linux-3.0.7/drivers/mfd/wm8350-i if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; -diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c ---- linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c +--- linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-17 23:17:19.000000000 -0400 @@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in * the lid is closed. This leads to interrupts as soon as a little move * is done. @@ -30152,9 +30514,9 @@ diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.7/drivers/mi return POLLIN | POLLRDNORM; return 0; } -diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h ---- linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h +--- linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h 2011-08-23 21:47:55.000000000 -0400 @@ -265,7 +265,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ struct platform_device *pdev; /* platform device */ @@ -30164,9 +30526,9 @@ diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.7/drivers/mi union axis_conversion ac; /* hw -> logical axis */ int mapped_btns[3]; -diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c ---- linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c +--- linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c 2011-08-23 21:47:55.000000000 -0400 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op unsigned long nsec; @@ -30178,9 +30540,9 @@ diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c linux-3.0.7/drivers/mis if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max = nsec; } -diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c ---- linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c +--- linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c 2011-08-23 21:47:55.000000000 -0400 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -30204,9 +30566,9 @@ diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.7/drivers/misc 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-3.0.7/drivers/misc/sgi-gru/grutables.h linux-3.0.7/drivers/misc/sgi-gru/grutables.h ---- linux-3.0.7/drivers/misc/sgi-gru/grutables.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-gru/grutables.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-gru/grutables.h linux-3.0.8/drivers/misc/sgi-gru/grutables.h +--- linux-3.0.8/drivers/misc/sgi-gru/grutables.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-gru/grutables.h 2011-08-23 21:47:55.000000000 -0400 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -30386,21 +30748,9 @@ diff -urNp linux-3.0.7/drivers/misc/sgi-gru/grutables.h linux-3.0.7/drivers/misc } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xp.h linux-3.0.7/drivers/misc/sgi-xp/xp.h ---- linux-3.0.7/drivers/misc/sgi-xp/xp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-xp/xp.h 2011-08-23 21:47:55.000000000 -0400 -@@ -289,7 +289,7 @@ struct xpc_interface { - xpc_notify_func, void *); - void (*received) (short, int, void *); - enum xp_retval (*partid_to_nasids) (short, void *); --}; -+} __no_const; - - extern struct xpc_interface xpc_interface; - -diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc.h linux-3.0.7/drivers/misc/sgi-xp/xpc.h ---- linux-3.0.7/drivers/misc/sgi-xp/xpc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-xp/xpc.h 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc.h linux-3.0.8/drivers/misc/sgi-xp/xpc.h +--- linux-3.0.8/drivers/misc/sgi-xp/xpc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-xp/xpc.h 2011-10-11 10:44:33.000000000 -0400 @@ -835,6 +835,7 @@ struct xpc_arch_operations { void (*received_payload) (struct xpc_channel *, void *); void (*notify_senders_of_disconnect) (struct xpc_channel *); @@ -30418,9 +30768,9 @@ diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc.h linux-3.0.7/drivers/misc/sgi-xp extern int xpc_disengage_timelimit; extern int xpc_disengage_timedout; extern int xpc_activate_IRQ_rcvd; -diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c ---- linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c +--- linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c 2011-10-11 10:44:33.000000000 -0400 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not .notifier_call = xpc_system_die, }; @@ -30430,9 +30780,21 @@ diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c linux-3.0.7/drivers/misc/s /* * Timer function to enforce the timelimit on the partition disengage. -diff -urNp linux-3.0.7/drivers/mmc/host/sdhci-pci.c linux-3.0.7/drivers/mmc/host/sdhci-pci.c ---- linux-3.0.7/drivers/mmc/host/sdhci-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mmc/host/sdhci-pci.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xp.h linux-3.0.8/drivers/misc/sgi-xp/xp.h +--- linux-3.0.8/drivers/misc/sgi-xp/xp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/misc/sgi-xp/xp.h 2011-08-23 21:47:55.000000000 -0400 +@@ -289,7 +289,7 @@ struct xpc_interface { + xpc_notify_func, void *); + void (*received) (short, int, void *); + enum xp_retval (*partid_to_nasids) (short, void *); +-}; ++} __no_const; + + extern struct xpc_interface xpc_interface; + +diff -urNp linux-3.0.8/drivers/mmc/host/sdhci-pci.c linux-3.0.8/drivers/mmc/host/sdhci-pci.c +--- linux-3.0.8/drivers/mmc/host/sdhci-pci.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mmc/host/sdhci-pci.c 2011-10-11 10:44:33.000000000 -0400 @@ -524,7 +524,7 @@ static const struct sdhci_pci_fixes sdhc .probe = via_probe, }; @@ -30442,9 +30804,9 @@ diff -urNp linux-3.0.7/drivers/mmc/host/sdhci-pci.c linux-3.0.7/drivers/mmc/host { .vendor = PCI_VENDOR_ID_RICOH, .device = PCI_DEVICE_ID_RICOH_R5C822, -diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c 2011-08-23 21:48:14.000000000 -0400 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info * struct cfi_pri_intelext *cfip = cfi->cmdset_priv; unsigned long timeo = jiffies + HZ; @@ -30472,9 +30834,9 @@ diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.7/drivers/m adr += chip->start; retry: -diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c ---- linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c +--- linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c 2011-08-23 21:48:14.000000000 -0400 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct unsigned long cmd_addr; struct cfi_private *cfi = map->fldrv_priv; @@ -30520,9 +30882,9 @@ diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.7/drivers/m adr += chip->start; /* Let's determine this according to the interleave only once */ -diff -urNp linux-3.0.7/drivers/mtd/devices/doc2000.c linux-3.0.7/drivers/mtd/devices/doc2000.c ---- linux-3.0.7/drivers/mtd/devices/doc2000.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/devices/doc2000.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/devices/doc2000.c linux-3.0.8/drivers/mtd/devices/doc2000.c +--- linux-3.0.8/drivers/mtd/devices/doc2000.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/devices/doc2000.c 2011-08-23 21:47:55.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 */ @@ -30532,9 +30894,9 @@ diff -urNp linux-3.0.7/drivers/mtd/devices/doc2000.c linux-3.0.7/drivers/mtd/dev printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-3.0.7/drivers/mtd/devices/doc2001.c linux-3.0.7/drivers/mtd/devices/doc2001.c ---- linux-3.0.7/drivers/mtd/devices/doc2001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/devices/doc2001.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/devices/doc2001.c linux-3.0.8/drivers/mtd/devices/doc2001.c +--- linux-3.0.8/drivers/mtd/devices/doc2001.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/devices/doc2001.c 2011-08-23 21:47:55.000000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -30544,9 +30906,9 @@ diff -urNp linux-3.0.7/drivers/mtd/devices/doc2001.c linux-3.0.7/drivers/mtd/dev return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-3.0.7/drivers/mtd/ftl.c linux-3.0.7/drivers/mtd/ftl.c ---- linux-3.0.7/drivers/mtd/ftl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/ftl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/ftl.c linux-3.0.8/drivers/mtd/ftl.c +--- linux-3.0.8/drivers/mtd/ftl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/ftl.c 2011-08-23 21:48:14.000000000 -0400 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * loff_t offset; uint16_t srcunitswap = cpu_to_le16(srcunit); @@ -30556,9 +30918,9 @@ diff -urNp linux-3.0.7/drivers/mtd/ftl.c linux-3.0.7/drivers/mtd/ftl.c eun = &part->EUNInfo[srcunit]; xfer = &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", -diff -urNp linux-3.0.7/drivers/mtd/inftlcore.c linux-3.0.7/drivers/mtd/inftlcore.c ---- linux-3.0.7/drivers/mtd/inftlcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/inftlcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/inftlcore.c linux-3.0.8/drivers/mtd/inftlcore.c +--- linux-3.0.8/drivers/mtd/inftlcore.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/inftlcore.c 2011-08-23 21:48:14.000000000 -0400 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr struct inftl_oob oob; size_t retlen; @@ -30568,9 +30930,9 @@ diff -urNp linux-3.0.7/drivers/mtd/inftlcore.c linux-3.0.7/drivers/mtd/inftlcore DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d," "pending=%d)\n", inftl, thisVUC, pendingblock); -diff -urNp linux-3.0.7/drivers/mtd/inftlmount.c linux-3.0.7/drivers/mtd/inftlmount.c ---- linux-3.0.7/drivers/mtd/inftlmount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/inftlmount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/inftlmount.c linux-3.0.8/drivers/mtd/inftlmount.c +--- linux-3.0.8/drivers/mtd/inftlmount.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/inftlmount.c 2011-08-23 21:48:14.000000000 -0400 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL struct INFTLPartition *ip; size_t retlen; @@ -30580,9 +30942,9 @@ diff -urNp linux-3.0.7/drivers/mtd/inftlmount.c linux-3.0.7/drivers/mtd/inftlmou DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl); /* -diff -urNp linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c ---- linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c +--- linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c 2011-08-23 21:48:14.000000000 -0400 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map { map_word pfow_val[4]; @@ -30592,9 +30954,9 @@ diff -urNp linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.7/drivers/mtd/l /* Check identification string */ pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); -diff -urNp linux-3.0.7/drivers/mtd/mtdchar.c linux-3.0.7/drivers/mtd/mtdchar.c ---- linux-3.0.7/drivers/mtd/mtdchar.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/mtdchar.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/mtdchar.c linux-3.0.8/drivers/mtd/mtdchar.c +--- linux-3.0.8/drivers/mtd/mtdchar.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/mtdchar.c 2011-08-23 21:48:14.000000000 -0400 @@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, u_long size; struct mtd_info_user info; @@ -30604,9 +30966,9 @@ diff -urNp linux-3.0.7/drivers/mtd/mtdchar.c linux-3.0.7/drivers/mtd/mtdchar.c DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; -diff -urNp linux-3.0.7/drivers/mtd/nand/denali.c linux-3.0.7/drivers/mtd/nand/denali.c ---- linux-3.0.7/drivers/mtd/nand/denali.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/nand/denali.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/nand/denali.c linux-3.0.8/drivers/mtd/nand/denali.c +--- linux-3.0.8/drivers/mtd/nand/denali.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/nand/denali.c 2011-08-23 21:47:55.000000000 -0400 @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/mtd/mtd.h> @@ -30615,9 +30977,9 @@ diff -urNp linux-3.0.7/drivers/mtd/nand/denali.c linux-3.0.7/drivers/mtd/nand/de #include "denali.h" -diff -urNp linux-3.0.7/drivers/mtd/nftlcore.c linux-3.0.7/drivers/mtd/nftlcore.c ---- linux-3.0.7/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/nftlcore.c linux-3.0.8/drivers/mtd/nftlcore.c +--- linux-3.0.8/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre int inplace = 1; size_t retlen; @@ -30627,9 +30989,9 @@ diff -urNp linux-3.0.7/drivers/mtd/nftlcore.c linux-3.0.7/drivers/mtd/nftlcore.c memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); -diff -urNp linux-3.0.7/drivers/mtd/nftlmount.c linux-3.0.7/drivers/mtd/nftlmount.c ---- linux-3.0.7/drivers/mtd/nftlmount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/nftlmount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/nftlmount.c linux-3.0.8/drivers/mtd/nftlmount.c +--- linux-3.0.8/drivers/mtd/nftlmount.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/nftlmount.c 2011-08-23 21:48:14.000000000 -0400 @@ -24,6 +24,7 @@ #include <asm/errno.h> #include <linux/delay.h> @@ -30647,9 +31009,9 @@ diff -urNp linux-3.0.7/drivers/mtd/nftlmount.c linux-3.0.7/drivers/mtd/nftlmount /* Assume logical EraseSize == physical erasesize for starting the scan. We'll sort it out later if we find a MediaHeader which says otherwise */ /* Actually, we won't. The new DiskOnChip driver has already scanned -diff -urNp linux-3.0.7/drivers/mtd/ubi/build.c linux-3.0.7/drivers/mtd/ubi/build.c ---- linux-3.0.7/drivers/mtd/ubi/build.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/mtd/ubi/build.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/mtd/ubi/build.c linux-3.0.8/drivers/mtd/ubi/build.c +--- linux-3.0.8/drivers/mtd/ubi/build.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/mtd/ubi/build.c 2011-08-23 21:47:55.000000000 -0400 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -30689,9 +31051,9 @@ diff -urNp linux-3.0.7/drivers/mtd/ubi/build.c linux-3.0.7/drivers/mtd/ubi/build } /** -diff -urNp linux-3.0.7/drivers/net/atlx/atl2.c linux-3.0.7/drivers/net/atlx/atl2.c ---- linux-3.0.7/drivers/net/atlx/atl2.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/atlx/atl2.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/atlx/atl2.c linux-3.0.8/drivers/net/atlx/atl2.c +--- linux-3.0.8/drivers/net/atlx/atl2.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/atlx/atl2.c 2011-10-11 10:44:33.000000000 -0400 @@ -2840,7 +2840,7 @@ static void atl2_force_ps(struct atl2_hw */ @@ -30701,9 +31063,9 @@ diff -urNp linux-3.0.7/drivers/net/atlx/atl2.c linux-3.0.7/drivers/net/atlx/atl2 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \ MODULE_PARM_DESC(X, desc); #else -diff -urNp linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c ---- linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c +--- linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c 2011-08-23 21:47:55.000000000 -0400 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc); static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode); @@ -30748,9 +31110,9 @@ diff -urNp linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c linux-3.0.7/drivers/net/bna/ ioc->ioc_hwif = &nw_hwif_ct; } -diff -urNp linux-3.0.7/drivers/net/bna/bnad.c linux-3.0.7/drivers/net/bna/bnad.c ---- linux-3.0.7/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/bna/bnad.c linux-3.0.8/drivers/net/bna/bnad.c +--- linux-3.0.8/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400 @@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx struct bna_intr_info *intr_info = &res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info; @@ -30812,9 +31174,9 @@ diff -urNp linux-3.0.7/drivers/net/bna/bnad.c linux-3.0.7/drivers/net/bna/bnad.c /* Get BNA's resource requirement for one Rx object */ spin_lock_irqsave(&bnad->bna_lock, flags); bna_rx_res_req(rx_config, res_info); -diff -urNp linux-3.0.7/drivers/net/bnx2.c linux-3.0.7/drivers/net/bnx2.c ---- linux-3.0.7/drivers/net/bnx2.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/net/bnx2.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/bnx2.c linux-3.0.8/drivers/net/bnx2.c +--- linux-3.0.8/drivers/net/bnx2.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/net/bnx2.c 2011-10-16 21:55:27.000000000 -0400 @@ -5831,6 +5831,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc = 0; u32 magic, csum; @@ -30824,9 +31186,9 @@ diff -urNp linux-3.0.7/drivers/net/bnx2.c linux-3.0.7/drivers/net/bnx2.c if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0) goto test_nvram_done; -diff -urNp linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c ---- linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c +--- linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c 2011-08-23 21:48:14.000000000 -0400 @@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x int i, rc; u32 magic, crc; @@ -30836,9 +31198,9 @@ diff -urNp linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.7/drivers/net if (BP_NOMCP(bp)) return 0; -diff -urNp linux-3.0.7/drivers/net/can/mscan/mscan.c linux-3.0.7/drivers/net/can/mscan/mscan.c ---- linux-3.0.7/drivers/net/can/mscan/mscan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/can/mscan/mscan.c 2011-10-17 02:51:46.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/can/mscan/mscan.c linux-3.0.8/drivers/net/can/mscan/mscan.c +--- linux-3.0.8/drivers/net/can/mscan/mscan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/can/mscan/mscan.c 2011-10-17 02:51:46.000000000 -0400 @@ -261,11 +261,13 @@ static netdev_tx_t mscan_start_xmit(stru void __iomem *data = ®s->tx.dsr1_0; u16 *payload = (u16 *)frame->data; @@ -30870,9 +31232,9 @@ diff -urNp linux-3.0.7/drivers/net/can/mscan/mscan.c linux-3.0.7/drivers/net/can } out_8(®s->canrflg, MSCAN_RXF); -diff -urNp linux-3.0.7/drivers/net/cxgb3/l2t.h linux-3.0.7/drivers/net/cxgb3/l2t.h ---- linux-3.0.7/drivers/net/cxgb3/l2t.h 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/net/cxgb3/l2t.h 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/cxgb3/l2t.h linux-3.0.8/drivers/net/cxgb3/l2t.h +--- linux-3.0.8/drivers/net/cxgb3/l2t.h 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/net/cxgb3/l2t.h 2011-10-16 21:55:27.000000000 -0400 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func) */ struct l2t_skb_cb { @@ -30882,9 +31244,9 @@ diff -urNp linux-3.0.7/drivers/net/cxgb3/l2t.h linux-3.0.7/drivers/net/cxgb3/l2t #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) -diff -urNp linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c ---- linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c +--- linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct unsigned int nchan = adap->params.nports; struct msix_entry entries[MAX_INGQ + 1]; @@ -30894,9 +31256,9 @@ diff -urNp linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c linux-3.0.7/drivers/net/cx for (i = 0; i < ARRAY_SIZE(entries); ++i) entries[i].entry = i; -diff -urNp linux-3.0.7/drivers/net/cxgb4/t4_hw.c linux-3.0.7/drivers/net/cxgb4/t4_hw.c ---- linux-3.0.7/drivers/net/cxgb4/t4_hw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/cxgb4/t4_hw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/cxgb4/t4_hw.c linux-3.0.8/drivers/net/cxgb4/t4_hw.c +--- linux-3.0.8/drivers/net/cxgb4/t4_hw.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/cxgb4/t4_hw.c 2011-08-23 21:48:14.000000000 -0400 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter u8 vpd[VPD_LEN], csum; unsigned int vpdr_len, kw_offset, id_len; @@ -30906,9 +31268,9 @@ diff -urNp linux-3.0.7/drivers/net/cxgb4/t4_hw.c linux-3.0.7/drivers/net/cxgb4/t ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd); if (ret < 0) return ret; -diff -urNp linux-3.0.7/drivers/net/e1000e/82571.c linux-3.0.7/drivers/net/e1000e/82571.c ---- linux-3.0.7/drivers/net/e1000e/82571.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/e1000e/82571.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/e1000e/82571.c linux-3.0.8/drivers/net/e1000e/82571.c +--- linux-3.0.8/drivers/net/e1000e/82571.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/e1000e/82571.c 2011-08-23 21:47:55.000000000 -0400 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -30918,9 +31280,9 @@ diff -urNp linux-3.0.7/drivers/net/e1000e/82571.c linux-3.0.7/drivers/net/e1000e u32 swsm = 0; u32 swsm2 = 0; bool force_clear_smbi = false; -diff -urNp linux-3.0.7/drivers/net/e1000e/es2lan.c linux-3.0.7/drivers/net/e1000e/es2lan.c ---- linux-3.0.7/drivers/net/e1000e/es2lan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/e1000e/es2lan.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/e1000e/es2lan.c linux-3.0.8/drivers/net/e1000e/es2lan.c +--- linux-3.0.8/drivers/net/e1000e/es2lan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/e1000e/es2lan.c 2011-08-23 21:47:55.000000000 -0400 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -30930,9 +31292,9 @@ diff -urNp linux-3.0.7/drivers/net/e1000e/es2lan.c linux-3.0.7/drivers/net/e1000 /* Set media type */ switch (adapter->pdev->device) { -diff -urNp linux-3.0.7/drivers/net/e1000e/hw.h linux-3.0.7/drivers/net/e1000e/hw.h ---- linux-3.0.7/drivers/net/e1000e/hw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/e1000e/hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/e1000e/hw.h linux-3.0.8/drivers/net/e1000e/hw.h +--- linux-3.0.8/drivers/net/e1000e/hw.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/e1000e/hw.h 2011-08-23 21:47:55.000000000 -0400 @@ -776,6 +776,7 @@ struct e1000_mac_operations { void (*write_vfta)(struct e1000_hw *, u32, u32); s32 (*read_mac_addr)(struct e1000_hw *); @@ -30979,9 +31341,9 @@ diff -urNp linux-3.0.7/drivers/net/e1000e/hw.h linux-3.0.7/drivers/net/e1000e/hw enum e1000_nvm_type type; enum e1000_nvm_override override; -diff -urNp linux-3.0.7/drivers/net/fealnx.c linux-3.0.7/drivers/net/fealnx.c ---- linux-3.0.7/drivers/net/fealnx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/fealnx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/fealnx.c linux-3.0.8/drivers/net/fealnx.c +--- linux-3.0.8/drivers/net/fealnx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/fealnx.c 2011-10-11 10:44:33.000000000 -0400 @@ -150,7 +150,7 @@ struct chip_info { int flags; }; @@ -30991,9 +31353,9 @@ diff -urNp linux-3.0.7/drivers/net/fealnx.c linux-3.0.7/drivers/net/fealnx.c { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR }, { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, -diff -urNp linux-3.0.7/drivers/net/hamradio/6pack.c linux-3.0.7/drivers/net/hamradio/6pack.c ---- linux-3.0.7/drivers/net/hamradio/6pack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/hamradio/6pack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/hamradio/6pack.c linux-3.0.8/drivers/net/hamradio/6pack.c +--- linux-3.0.8/drivers/net/hamradio/6pack.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/hamradio/6pack.c 2011-08-23 21:48:14.000000000 -0400 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t unsigned char buf[512]; int count1; @@ -31003,9 +31365,9 @@ diff -urNp linux-3.0.7/drivers/net/hamradio/6pack.c linux-3.0.7/drivers/net/hamr if (!count) return; -diff -urNp linux-3.0.7/drivers/net/igb/e1000_hw.h linux-3.0.7/drivers/net/igb/e1000_hw.h ---- linux-3.0.7/drivers/net/igb/e1000_hw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/igb/e1000_hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/igb/e1000_hw.h linux-3.0.8/drivers/net/igb/e1000_hw.h +--- linux-3.0.8/drivers/net/igb/e1000_hw.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/igb/e1000_hw.h 2011-08-23 21:47:55.000000000 -0400 @@ -314,6 +314,7 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); @@ -31074,9 +31436,9 @@ diff -urNp linux-3.0.7/drivers/net/igb/e1000_hw.h linux-3.0.7/drivers/net/igb/e1 struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.7/drivers/net/igbvf/vf.h linux-3.0.7/drivers/net/igbvf/vf.h ---- linux-3.0.7/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/igbvf/vf.h linux-3.0.8/drivers/net/igbvf/vf.h +--- linux-3.0.8/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400 @@ -189,9 +189,10 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*set_vfta)(struct e1000_hw *, u16, bool); @@ -31106,9 +31468,9 @@ diff -urNp linux-3.0.7/drivers/net/igbvf/vf.h linux-3.0.7/drivers/net/igbvf/vf.h struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_main.c linux-3.0.7/drivers/net/ixgb/ixgb_main.c ---- linux-3.0.7/drivers/net/ixgb/ixgb_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ixgb/ixgb_main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_main.c linux-3.0.8/drivers/net/ixgb/ixgb_main.c +--- linux-3.0.8/drivers/net/ixgb/ixgb_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ixgb/ixgb_main.c 2011-08-23 21:48:14.000000000 -0400 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev u32 rctl; int i; @@ -31118,9 +31480,9 @@ diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_main.c linux-3.0.7/drivers/net/ixgb /* Check for Promiscuous and All Multicast modes */ rctl = IXGB_READ_REG(hw, RCTL); -diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_param.c linux-3.0.7/drivers/net/ixgb/ixgb_param.c ---- linux-3.0.7/drivers/net/ixgb/ixgb_param.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ixgb/ixgb_param.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_param.c linux-3.0.8/drivers/net/ixgb/ixgb_param.c +--- linux-3.0.8/drivers/net/ixgb/ixgb_param.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ixgb/ixgb_param.c 2011-08-23 21:48:14.000000000 -0400 @@ -261,6 +261,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { @@ -31131,9 +31493,9 @@ diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_param.c linux-3.0.7/drivers/net/ixg if (bd >= IXGB_MAX_NIC) { pr_notice("Warning: no configuration for board #%i\n", bd); pr_notice("Using defaults for all values\n"); -diff -urNp linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h ---- linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h +--- linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400 @@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations { s32 (*update_checksum)(struct ixgbe_hw *); u16 (*calc_checksum)(struct ixgbe_hw *); @@ -31197,9 +31559,9 @@ diff -urNp linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h linux-3.0.7/drivers/net/ix struct ixgbe_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.7/drivers/net/ixgbevf/vf.h linux-3.0.7/drivers/net/ixgbevf/vf.h ---- linux-3.0.7/drivers/net/ixgbevf/vf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ixgbevf/vf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ixgbevf/vf.h linux-3.0.8/drivers/net/ixgbevf/vf.h +--- linux-3.0.8/drivers/net/ixgbevf/vf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ixgbevf/vf.h 2011-08-23 21:47:55.000000000 -0400 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations { s32 (*clear_vfta)(struct ixgbe_hw *); s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool); @@ -31234,9 +31596,9 @@ diff -urNp linux-3.0.7/drivers/net/ixgbevf/vf.h linux-3.0.7/drivers/net/ixgbevf/ struct ixgbe_mbx_stats stats; u32 timeout; u32 udelay; -diff -urNp linux-3.0.7/drivers/net/ksz884x.c linux-3.0.7/drivers/net/ksz884x.c ---- linux-3.0.7/drivers/net/ksz884x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ksz884x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ksz884x.c linux-3.0.8/drivers/net/ksz884x.c +--- linux-3.0.8/drivers/net/ksz884x.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ksz884x.c 2011-08-23 21:48:14.000000000 -0400 @@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str int rc; u64 counter[TOTAL_PORT_COUNTER_NUM]; @@ -31246,9 +31608,9 @@ diff -urNp linux-3.0.7/drivers/net/ksz884x.c linux-3.0.7/drivers/net/ksz884x.c mutex_lock(&hw_priv->lock); n = SWITCH_PORT_NUM; for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) { -diff -urNp linux-3.0.7/drivers/net/mlx4/main.c linux-3.0.7/drivers/net/mlx4/main.c ---- linux-3.0.7/drivers/net/mlx4/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/mlx4/main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/mlx4/main.c linux-3.0.8/drivers/net/mlx4/main.c +--- linux-3.0.8/drivers/net/mlx4/main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/mlx4/main.c 2011-08-23 21:48:14.000000000 -0400 @@ -40,6 +40,7 @@ #include <linux/dma-mapping.h> #include <linux/slab.h> @@ -31266,9 +31628,9 @@ diff -urNp linux-3.0.7/drivers/net/mlx4/main.c linux-3.0.7/drivers/net/mlx4/main err = mlx4_QUERY_FW(dev); if (err) { if (err == -EACCES) -diff -urNp linux-3.0.7/drivers/net/niu.c linux-3.0.7/drivers/net/niu.c ---- linux-3.0.7/drivers/net/niu.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/net/niu.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/niu.c linux-3.0.8/drivers/net/niu.c +--- linux-3.0.8/drivers/net/niu.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/net/niu.c 2011-08-23 21:48:14.000000000 -0400 @@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc int i, num_irqs, err; u8 first_ldg; @@ -31278,9 +31640,9 @@ diff -urNp linux-3.0.7/drivers/net/niu.c linux-3.0.7/drivers/net/niu.c first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port; for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] = first_ldg + i; -diff -urNp linux-3.0.7/drivers/net/pcnet32.c linux-3.0.7/drivers/net/pcnet32.c ---- linux-3.0.7/drivers/net/pcnet32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/pcnet32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/pcnet32.c linux-3.0.8/drivers/net/pcnet32.c +--- linux-3.0.8/drivers/net/pcnet32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/pcnet32.c 2011-08-23 21:47:55.000000000 -0400 @@ -82,7 +82,7 @@ static int cards_found; /* * VLB I/O addresses @@ -31903,9 +32265,9 @@ diff -urNp linux-3.0.7/drivers/net/pcnet32.c linux-3.0.7/drivers/net/pcnet32.c } } else { netif_info(lp, link, dev, "link up\n"); -diff -urNp linux-3.0.7/drivers/net/ppp_generic.c linux-3.0.7/drivers/net/ppp_generic.c ---- linux-3.0.7/drivers/net/ppp_generic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/ppp_generic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/ppp_generic.c linux-3.0.8/drivers/net/ppp_generic.c +--- linux-3.0.8/drivers/net/ppp_generic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/ppp_generic.c 2011-08-23 21:47:55.000000000 -0400 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; @@ -31924,9 +32286,9 @@ diff -urNp linux-3.0.7/drivers/net/ppp_generic.c linux-3.0.7/drivers/net/ppp_gen break; err = 0; break; -diff -urNp linux-3.0.7/drivers/net/r8169.c linux-3.0.7/drivers/net/r8169.c ---- linux-3.0.7/drivers/net/r8169.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/net/r8169.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/r8169.c linux-3.0.8/drivers/net/r8169.c +--- linux-3.0.8/drivers/net/r8169.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/net/r8169.c 2011-08-23 21:47:55.000000000 -0400 @@ -645,12 +645,12 @@ struct rtl8169_private { struct mdio_ops { void (*write)(void __iomem *, int, int); @@ -31942,9 +32304,9 @@ diff -urNp linux-3.0.7/drivers/net/r8169.c linux-3.0.7/drivers/net/r8169.c int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv); int (*get_settings)(struct net_device *, struct ethtool_cmd *); -diff -urNp linux-3.0.7/drivers/net/sis190.c linux-3.0.7/drivers/net/sis190.c ---- linux-3.0.7/drivers/net/sis190.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/net/sis190.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/sis190.c linux-3.0.8/drivers/net/sis190.c +--- linux-3.0.8/drivers/net/sis190.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/net/sis190.c 2011-10-11 10:44:33.000000000 -0400 @@ -1623,7 +1623,7 @@ static int __devinit sis190_get_mac_addr static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev, struct net_device *dev) @@ -31954,9 +32316,9 @@ diff -urNp linux-3.0.7/drivers/net/sis190.c linux-3.0.7/drivers/net/sis190.c struct sis190_private *tp = netdev_priv(dev); struct pci_dev *isa_bridge; u8 reg, tmp8; -diff -urNp linux-3.0.7/drivers/net/sundance.c linux-3.0.7/drivers/net/sundance.c ---- linux-3.0.7/drivers/net/sundance.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/sundance.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/sundance.c linux-3.0.8/drivers/net/sundance.c +--- linux-3.0.8/drivers/net/sundance.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/sundance.c 2011-10-11 10:44:33.000000000 -0400 @@ -218,7 +218,7 @@ enum { struct pci_id_info { const char *name; @@ -31966,9 +32328,9 @@ diff -urNp linux-3.0.7/drivers/net/sundance.c linux-3.0.7/drivers/net/sundance.c {"D-Link DFE-550TX FAST Ethernet Adapter"}, {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, {"D-Link DFE-580TX 4 port Server Adapter"}, -diff -urNp linux-3.0.7/drivers/net/tg3.h linux-3.0.7/drivers/net/tg3.h ---- linux-3.0.7/drivers/net/tg3.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tg3.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tg3.h linux-3.0.8/drivers/net/tg3.h +--- linux-3.0.8/drivers/net/tg3.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tg3.h 2011-08-23 21:47:55.000000000 -0400 @@ -134,6 +134,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -31977,9 +32339,9 @@ diff -urNp linux-3.0.7/drivers/net/tg3.h linux-3.0.7/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-3.0.7/drivers/net/tokenring/abyss.c linux-3.0.7/drivers/net/tokenring/abyss.c ---- linux-3.0.7/drivers/net/tokenring/abyss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tokenring/abyss.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tokenring/abyss.c linux-3.0.8/drivers/net/tokenring/abyss.c +--- linux-3.0.8/drivers/net/tokenring/abyss.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tokenring/abyss.c 2011-08-23 21:47:55.000000000 -0400 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = static int __init abyss_init (void) @@ -31996,9 +32358,9 @@ diff -urNp linux-3.0.7/drivers/net/tokenring/abyss.c linux-3.0.7/drivers/net/tok return pci_register_driver(&abyss_driver); } -diff -urNp linux-3.0.7/drivers/net/tokenring/madgemc.c linux-3.0.7/drivers/net/tokenring/madgemc.c ---- linux-3.0.7/drivers/net/tokenring/madgemc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tokenring/madgemc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tokenring/madgemc.c linux-3.0.8/drivers/net/tokenring/madgemc.c +--- linux-3.0.8/drivers/net/tokenring/madgemc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tokenring/madgemc.c 2011-08-23 21:47:55.000000000 -0400 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver static int __init madgemc_init (void) @@ -32014,9 +32376,9 @@ diff -urNp linux-3.0.7/drivers/net/tokenring/madgemc.c linux-3.0.7/drivers/net/t return mca_register_driver (&madgemc_driver); } -diff -urNp linux-3.0.7/drivers/net/tokenring/proteon.c linux-3.0.7/drivers/net/tokenring/proteon.c ---- linux-3.0.7/drivers/net/tokenring/proteon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tokenring/proteon.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tokenring/proteon.c linux-3.0.8/drivers/net/tokenring/proteon.c +--- linux-3.0.8/drivers/net/tokenring/proteon.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tokenring/proteon.c 2011-08-23 21:47:55.000000000 -0400 @@ -353,9 +353,11 @@ static int __init proteon_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -32032,9 +32394,9 @@ diff -urNp linux-3.0.7/drivers/net/tokenring/proteon.c linux-3.0.7/drivers/net/t err = platform_driver_register(&proteon_driver); if (err) -diff -urNp linux-3.0.7/drivers/net/tokenring/skisa.c linux-3.0.7/drivers/net/tokenring/skisa.c ---- linux-3.0.7/drivers/net/tokenring/skisa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tokenring/skisa.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tokenring/skisa.c linux-3.0.8/drivers/net/tokenring/skisa.c +--- linux-3.0.8/drivers/net/tokenring/skisa.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tokenring/skisa.c 2011-08-23 21:47:55.000000000 -0400 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -32050,9 +32412,9 @@ diff -urNp linux-3.0.7/drivers/net/tokenring/skisa.c linux-3.0.7/drivers/net/tok err = platform_driver_register(&sk_isa_driver); if (err) -diff -urNp linux-3.0.7/drivers/net/tulip/de2104x.c linux-3.0.7/drivers/net/tulip/de2104x.c ---- linux-3.0.7/drivers/net/tulip/de2104x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tulip/de2104x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tulip/de2104x.c linux-3.0.8/drivers/net/tulip/de2104x.c +--- linux-3.0.8/drivers/net/tulip/de2104x.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tulip/de2104x.c 2011-08-23 21:48:14.000000000 -0400 @@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i struct de_srom_info_leaf *il; void *bufp; @@ -32062,9 +32424,9 @@ diff -urNp linux-3.0.7/drivers/net/tulip/de2104x.c linux-3.0.7/drivers/net/tulip /* download entire eeprom */ for (i = 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] = -diff -urNp linux-3.0.7/drivers/net/tulip/de4x5.c linux-3.0.7/drivers/net/tulip/de4x5.c ---- linux-3.0.7/drivers/net/tulip/de4x5.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tulip/de4x5.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tulip/de4x5.c linux-3.0.8/drivers/net/tulip/de4x5.c +--- linux-3.0.8/drivers/net/tulip/de4x5.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tulip/de4x5.c 2011-08-23 21:47:55.000000000 -0400 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; @@ -32083,9 +32445,9 @@ diff -urNp linux-3.0.7/drivers/net/tulip/de4x5.c linux-3.0.7/drivers/net/tulip/d return -EFAULT; break; } -diff -urNp linux-3.0.7/drivers/net/tulip/eeprom.c linux-3.0.7/drivers/net/tulip/eeprom.c ---- linux-3.0.7/drivers/net/tulip/eeprom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tulip/eeprom.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tulip/eeprom.c linux-3.0.8/drivers/net/tulip/eeprom.c +--- linux-3.0.8/drivers/net/tulip/eeprom.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tulip/eeprom.c 2011-10-11 10:44:33.000000000 -0400 @@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups {NULL}}; @@ -32095,9 +32457,9 @@ diff -urNp linux-3.0.7/drivers/net/tulip/eeprom.c linux-3.0.7/drivers/net/tulip/ "21140 non-MII", "21140 MII PHY", "21142 Serial PHY", -diff -urNp linux-3.0.7/drivers/net/tulip/winbond-840.c linux-3.0.7/drivers/net/tulip/winbond-840.c ---- linux-3.0.7/drivers/net/tulip/winbond-840.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/tulip/winbond-840.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/tulip/winbond-840.c linux-3.0.8/drivers/net/tulip/winbond-840.c +--- linux-3.0.8/drivers/net/tulip/winbond-840.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/tulip/winbond-840.c 2011-10-11 10:44:33.000000000 -0400 @@ -236,7 +236,7 @@ struct pci_id_info { int drv_flags; /* Driver use, intended as capability flags. */ }; @@ -32107,9 +32469,9 @@ diff -urNp linux-3.0.7/drivers/net/tulip/winbond-840.c linux-3.0.7/drivers/net/t { /* Sometime a Level-One switch card. */ "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII}, { "Winbond W89c840", CanHaveMII | HasBrokenTx}, -diff -urNp linux-3.0.7/drivers/net/usb/hso.c linux-3.0.7/drivers/net/usb/hso.c ---- linux-3.0.7/drivers/net/usb/hso.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/usb/hso.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/usb/hso.c linux-3.0.8/drivers/net/usb/hso.c +--- linux-3.0.8/drivers/net/usb/hso.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/usb/hso.c 2011-08-23 21:47:55.000000000 -0400 @@ -71,7 +71,7 @@ #include <asm/byteorder.h> #include <linux/serial_core.h> @@ -32206,9 +32568,9 @@ diff -urNp linux-3.0.7/drivers/net/usb/hso.c linux-3.0.7/drivers/net/usb/hso.c result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c ---- linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c +--- linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-08-23 21:47:55.000000000 -0400 @@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device * Return with error code if any of the queue indices * is out of range @@ -32219,9 +32581,9 @@ diff -urNp linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.7/drivers return -EINVAL; } -diff -urNp linux-3.0.7/drivers/net/vxge/vxge-config.h linux-3.0.7/drivers/net/vxge/vxge-config.h ---- linux-3.0.7/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/vxge/vxge-config.h linux-3.0.8/drivers/net/vxge/vxge-config.h +--- linux-3.0.8/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400 @@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs { void (*link_down)(struct __vxge_hw_device *devh); void (*crit_err)(struct __vxge_hw_device *devh, @@ -32231,9 +32593,9 @@ diff -urNp linux-3.0.7/drivers/net/vxge/vxge-config.h linux-3.0.7/drivers/net/vx /* * struct __vxge_hw_blockpool_entry - Block private data structure -diff -urNp linux-3.0.7/drivers/net/vxge/vxge-main.c linux-3.0.7/drivers/net/vxge/vxge-main.c ---- linux-3.0.7/drivers/net/vxge/vxge-main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/vxge/vxge-main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/vxge/vxge-main.c linux-3.0.8/drivers/net/vxge/vxge-main.c +--- linux-3.0.8/drivers/net/vxge/vxge-main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/vxge/vxge-main.c 2011-08-23 21:48:14.000000000 -0400 @@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T struct sk_buff *completed[NR_SKB_COMPLETED]; int more; @@ -32252,9 +32614,9 @@ diff -urNp linux-3.0.7/drivers/net/vxge/vxge-main.c linux-3.0.7/drivers/net/vxge /* * Filling * - itable with bucket numbers -diff -urNp linux-3.0.7/drivers/net/vxge/vxge-traffic.h linux-3.0.7/drivers/net/vxge/vxge-traffic.h ---- linux-3.0.7/drivers/net/vxge/vxge-traffic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/vxge/vxge-traffic.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/vxge/vxge-traffic.h linux-3.0.8/drivers/net/vxge/vxge-traffic.h +--- linux-3.0.8/drivers/net/vxge/vxge-traffic.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/vxge/vxge-traffic.h 2011-08-23 21:47:55.000000000 -0400 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs { struct vxge_hw_mempool_dma *dma_object, u32 index, @@ -32264,9 +32626,9 @@ diff -urNp linux-3.0.7/drivers/net/vxge/vxge-traffic.h linux-3.0.7/drivers/net/v #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \ ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next) -diff -urNp linux-3.0.7/drivers/net/wan/cycx_x25.c linux-3.0.7/drivers/net/wan/cycx_x25.c ---- linux-3.0.7/drivers/net/wan/cycx_x25.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wan/cycx_x25.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wan/cycx_x25.c linux-3.0.8/drivers/net/wan/cycx_x25.c +--- linux-3.0.8/drivers/net/wan/cycx_x25.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wan/cycx_x25.c 2011-08-23 21:48:14.000000000 -0400 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned unsigned char hex[1024], * phex = hex; @@ -32276,9 +32638,9 @@ diff -urNp linux-3.0.7/drivers/net/wan/cycx_x25.c linux-3.0.7/drivers/net/wan/cy if (len >= (sizeof(hex) / 2)) len = (sizeof(hex) / 2) - 1; -diff -urNp linux-3.0.7/drivers/net/wan/hdlc_x25.c linux-3.0.7/drivers/net/wan/hdlc_x25.c ---- linux-3.0.7/drivers/net/wan/hdlc_x25.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wan/hdlc_x25.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wan/hdlc_x25.c linux-3.0.8/drivers/net/wan/hdlc_x25.c +--- linux-3.0.8/drivers/net/wan/hdlc_x25.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wan/hdlc_x25.c 2011-08-23 21:47:55.000000000 -0400 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu static int x25_open(struct net_device *dev) @@ -32304,9 +32666,9 @@ diff -urNp linux-3.0.7/drivers/net/wan/hdlc_x25.c linux-3.0.7/drivers/net/wan/hd result = lapb_register(dev, &cb); if (result != LAPB_OK) return result; -diff -urNp linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c ---- linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c +--- linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c 2011-08-23 21:48:14.000000000 -0400 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru int do_autopm = 1; DECLARE_COMPLETION_ONSTACK(notif_completion); @@ -32316,9 +32678,9 @@ diff -urNp linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.7/drivers/net d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack == i2400m->bm_ack_buf); -diff -urNp linux-3.0.7/drivers/net/wireless/airo.c linux-3.0.7/drivers/net/wireless/airo.c ---- linux-3.0.7/drivers/net/wireless/airo.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/airo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/airo.c linux-3.0.8/drivers/net/wireless/airo.c +--- linux-3.0.8/drivers/net/wireless/airo.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/airo.c 2011-08-23 21:48:14.000000000 -0400 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s BSSListElement * loop_net; BSSListElement * tmp_net; @@ -32373,20 +32735,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/airo.c linux-3.0.7/drivers/net/wirel /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath.h linux-3.0.7/drivers/net/wireless/ath/ath.h ---- linux-3.0.7/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400 -@@ -121,6 +121,7 @@ struct ath_ops { - void (*write_flush) (void *); - u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr); - }; -+typedef struct ath_ops __no_const ath_ops_no_const; - - struct ath_common; - struct ath_bus_ops; -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c ---- linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c +--- linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f unsigned int v; u64 tsf; @@ -32450,9 +32801,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.7/driver len += snprintf(buf+len, sizeof(buf)-len, "available txbuffers: %d\n", sc->txbuf_len); -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c ---- linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c +--- linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-08-23 21:48:14.000000000 -0400 @@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro int i, im, j; int nmeasurement; @@ -32462,9 +32813,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.7 for (i = 0; i < AR9300_MAX_CHAINS; i++) { if (ah->txchainmask & (1 << i)) num_chains++; -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c ---- linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +--- linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-08-23 21:48:14.000000000 -0400 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, int theta_low_bin = 0; int i; @@ -32474,9 +32825,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.7 /* disregard any bin that contains <= 16 samples */ thresh_accum_cnt = 16; scale_factor = 5; -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c ---- linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c +--- linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400 @@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc char buf[512]; unsigned int len = 0; @@ -32495,9 +32846,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.7/driver len += snprintf(buf + len, sizeof(buf) - len, "%s (chan=%d center-freq: %d MHz channel-type: %d (%s))\n", wiphy_name(sc->hw->wiphy), -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c ---- linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +--- linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s unsigned int len = 0; int ret = 0; @@ -32552,9 +32903,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0. len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue)); -diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h ---- linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h +--- linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h 2011-08-23 21:47:55.000000000 -0400 @@ -585,7 +585,7 @@ struct ath_hw_private_ops { /* ANI */ @@ -32582,9 +32933,20 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.7/drivers/n struct ieee80211_hw *hw; struct ath_common common; -diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c ---- linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath.h linux-3.0.8/drivers/net/wireless/ath/ath.h +--- linux-3.0.8/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400 +@@ -121,6 +121,7 @@ struct ath_ops { + void (*write_flush) (void *); + u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr); + }; ++typedef struct ath_ops __no_const ath_ops_no_const; + + struct ath_common; + struct ath_bus_ops; +diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c +--- linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2 int err; DECLARE_SSID_BUF(ssid); @@ -32603,9 +32965,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.7/driver IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n", idx, keylen, len); -diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c ---- linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c +--- linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-08-23 21:48:14.000000000 -0400 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons unsigned long flags; DECLARE_SSID_BUF(ssid); @@ -32615,9 +32977,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.7/driv LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), -diff -urNp linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c ---- linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c +--- linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-16 21:55:27.000000000 -0400 @@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_ */ if (iwl3945_mod_params.disable_hw_scan) { @@ -32629,9 +32991,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.7/ } IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n"); -diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ---- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-08-23 21:48:14.000000000 -0400 @@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s struct iwl_station_priv *sta_priv = (void *)sta->drv_priv; struct iwl_rxon_context *ctx = sta_priv->common.ctx; @@ -32650,23 +33012,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.7/dri /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); -diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-08-23 21:47:55.000000000 -0400 -@@ -68,8 +68,8 @@ do { - } while (0) - - #else --#define IWL_DEBUG(__priv, level, fmt, args...) --#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) -+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) -+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) - static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, - const void *p, u32 len) - {} -diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c ---- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c +--- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-08-23 21:48:14.000000000 -0400 @@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str int pos = 0; const size_t bufsz = sizeof(buf); @@ -32685,9 +33033,23 @@ diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.7/dr for_each_context(priv, ctx) { pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid); -diff -urNp linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c ---- linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-08-23 21:47:55.000000000 -0400 +@@ -68,8 +68,8 @@ do { + } while (0) + + #else +-#define IWL_DEBUG(__priv, level, fmt, args...) +-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) ++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) ++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) + static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, + const void *p, u32 len) + {} +diff -urNp linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c +--- linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-08-23 21:48:14.000000000 -0400 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s int buf_len = 512; size_t len = 0; @@ -32697,9 +33059,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.7/d if (*ppos != 0) return 0; if (count < sizeof(buf)) -diff -urNp linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c ---- linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c +--- linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c 2011-08-23 21:47:55.000000000 -0400 @@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo return -EINVAL; @@ -32715,9 +33077,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c linux-3.0.7/drivers } spin_lock_init(&hwsim_radio_lock); -diff -urNp linux-3.0.7/drivers/net/wireless/rndis_wlan.c linux-3.0.7/drivers/net/wireless/rndis_wlan.c ---- linux-3.0.7/drivers/net/wireless/rndis_wlan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/rndis_wlan.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/rndis_wlan.c linux-3.0.8/drivers/net/wireless/rndis_wlan.c +--- linux-3.0.8/drivers/net/wireless/rndis_wlan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/rndis_wlan.c 2011-08-23 21:47:55.000000000 -0400 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); @@ -32727,9 +33089,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/rndis_wlan.c linux-3.0.7/drivers/net rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c ---- linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +--- linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-08-23 21:48:14.000000000 -0400 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st u8 rfpath; u8 num_total_rfpath = rtlphy->num_total_rfpath; @@ -32739,9 +33101,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux- precommoncmdcnt = 0; _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++, MAX_PRECMD_CNT, -diff -urNp linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h ---- linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h +--- linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h 2011-08-23 21:47:55.000000000 -0400 @@ -266,7 +266,7 @@ struct wl1251_if_operations { void (*reset)(struct wl1251 *wl); void (*enable_irq)(struct wl1251 *wl); @@ -32751,9 +33113,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h linux-3.0.7/drivers/ struct wl1251 { struct ieee80211_hw *hw; -diff -urNp linux-3.0.7/drivers/net/wireless/wl12xx/spi.c linux-3.0.7/drivers/net/wireless/wl12xx/spi.c ---- linux-3.0.7/drivers/net/wireless/wl12xx/spi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/net/wireless/wl12xx/spi.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/net/wireless/wl12xx/spi.c linux-3.0.8/drivers/net/wireless/wl12xx/spi.c +--- linux-3.0.8/drivers/net/wireless/wl12xx/spi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/net/wireless/wl12xx/spi.c 2011-08-23 21:48:14.000000000 -0400 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct u32 chunk_len; int i; @@ -32763,9 +33125,9 @@ diff -urNp linux-3.0.7/drivers/net/wireless/wl12xx/spi.c linux-3.0.7/drivers/net WARN_ON(len > WL1271_AGGR_BUFFER_SIZE); spi_message_init(&m); -diff -urNp linux-3.0.7/drivers/oprofile/buffer_sync.c linux-3.0.7/drivers/oprofile/buffer_sync.c ---- linux-3.0.7/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/oprofile/buffer_sync.c linux-3.0.8/drivers/oprofile/buffer_sync.c +--- linux-3.0.8/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -32801,9 +33163,9 @@ diff -urNp linux-3.0.7/drivers/oprofile/buffer_sync.c linux-3.0.7/drivers/oprofi } } release_mm(mm); -diff -urNp linux-3.0.7/drivers/oprofile/event_buffer.c linux-3.0.7/drivers/oprofile/event_buffer.c ---- linux-3.0.7/drivers/oprofile/event_buffer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/event_buffer.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/oprofile/event_buffer.c linux-3.0.8/drivers/oprofile/event_buffer.c +--- linux-3.0.8/drivers/oprofile/event_buffer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/event_buffer.c 2011-08-23 21:47:55.000000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -32813,9 +33175,9 @@ diff -urNp linux-3.0.7/drivers/oprofile/event_buffer.c linux-3.0.7/drivers/oprof return; } -diff -urNp linux-3.0.7/drivers/oprofile/oprof.c linux-3.0.7/drivers/oprofile/oprof.c ---- linux-3.0.7/drivers/oprofile/oprof.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/oprof.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/oprofile/oprof.c linux-3.0.8/drivers/oprofile/oprof.c +--- linux-3.0.8/drivers/oprofile/oprof.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/oprof.c 2011-08-23 21:47:55.000000000 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -32825,9 +33187,21 @@ diff -urNp linux-3.0.7/drivers/oprofile/oprof.c linux-3.0.7/drivers/oprofile/opr start_switch_worker(); } -diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.c linux-3.0.7/drivers/oprofile/oprofile_stats.c ---- linux-3.0.7/drivers/oprofile/oprofile_stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/oprofile_stats.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/oprofile/oprofilefs.c linux-3.0.8/drivers/oprofile/oprofilefs.c +--- linux-3.0.8/drivers/oprofile/oprofilefs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/oprofilefs.c 2011-08-23 21:47:55.000000000 -0400 +@@ -186,7 +186,7 @@ static const struct file_operations atom + + + int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root, +- char const *name, atomic_t *val) ++ char const *name, atomic_unchecked_t *val) + { + return __oprofilefs_create_file(sb, root, name, + &atomic_ro_fops, 0444, val); +diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.c linux-3.0.8/drivers/oprofile/oprofile_stats.c +--- linux-3.0.8/drivers/oprofile/oprofile_stats.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/oprofile_stats.c 2011-08-23 21:47:55.000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -32845,9 +33219,9 @@ diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.c linux-3.0.7/drivers/opr } -diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.h linux-3.0.7/drivers/oprofile/oprofile_stats.h ---- linux-3.0.7/drivers/oprofile/oprofile_stats.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/oprofile_stats.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.h linux-3.0.8/drivers/oprofile/oprofile_stats.h +--- linux-3.0.8/drivers/oprofile/oprofile_stats.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/oprofile/oprofile_stats.h 2011-08-23 21:47:55.000000000 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -32865,21 +33239,9 @@ diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.h linux-3.0.7/drivers/opr }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-3.0.7/drivers/oprofile/oprofilefs.c linux-3.0.7/drivers/oprofile/oprofilefs.c ---- linux-3.0.7/drivers/oprofile/oprofilefs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/oprofile/oprofilefs.c 2011-08-23 21:47:55.000000000 -0400 -@@ -186,7 +186,7 @@ static const struct file_operations atom - - - int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root, -- char const *name, atomic_t *val) -+ char const *name, atomic_unchecked_t *val) - { - return __oprofilefs_create_file(sb, root, name, - &atomic_ro_fops, 0444, val); -diff -urNp linux-3.0.7/drivers/parport/procfs.c linux-3.0.7/drivers/parport/procfs.c ---- linux-3.0.7/drivers/parport/procfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/parport/procfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/parport/procfs.c linux-3.0.8/drivers/parport/procfs.c +--- linux-3.0.8/drivers/parport/procfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/parport/procfs.c 2011-08-23 21:47:55.000000000 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -32898,9 +33260,9 @@ diff -urNp linux-3.0.7/drivers/parport/procfs.c linux-3.0.7/drivers/parport/proc } #endif /* IEEE1284.3 support. */ -diff -urNp linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h ---- linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h +--- linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h 2011-08-23 21:47:55.000000000 -0400 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops { int (*hardware_test) (struct slot* slot, u32 value); u8 (*get_power) (struct slot* slot); @@ -32910,9 +33272,9 @@ diff -urNp linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.7/drivers/pc struct cpci_hp_controller { unsigned int irq; -diff -urNp linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c 2011-08-23 21:47:55.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -32927,9 +33289,9 @@ diff -urNp linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.7/drivers/pc dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-3.0.7/drivers/pci/pcie/aspm.c linux-3.0.7/drivers/pci/pcie/aspm.c ---- linux-3.0.7/drivers/pci/pcie/aspm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/pcie/aspm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/pcie/aspm.c linux-3.0.8/drivers/pci/pcie/aspm.c +--- linux-3.0.8/drivers/pci/pcie/aspm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/pcie/aspm.c 2011-08-23 21:47:55.000000000 -0400 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." @@ -32943,9 +33305,9 @@ diff -urNp linux-3.0.7/drivers/pci/pcie/aspm.c linux-3.0.7/drivers/pci/pcie/aspm #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) -diff -urNp linux-3.0.7/drivers/pci/probe.c linux-3.0.7/drivers/pci/probe.c ---- linux-3.0.7/drivers/pci/probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/probe.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/probe.c linux-3.0.8/drivers/pci/probe.c +--- linux-3.0.8/drivers/pci/probe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/probe.c 2011-08-23 21:47:55.000000000 -0400 @@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev, u32 l, sz, mask; u16 orig_cmd; @@ -32955,9 +33317,9 @@ diff -urNp linux-3.0.7/drivers/pci/probe.c linux-3.0.7/drivers/pci/probe.c if (!dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); -diff -urNp linux-3.0.7/drivers/pci/proc.c linux-3.0.7/drivers/pci/proc.c ---- linux-3.0.7/drivers/pci/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/proc.c linux-3.0.8/drivers/pci/proc.c +--- linux-3.0.8/drivers/pci/proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/proc.c 2011-08-23 21:48:14.000000000 -0400 @@ -476,7 +476,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -32975,9 +33337,9 @@ diff -urNp linux-3.0.7/drivers/pci/proc.c linux-3.0.7/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-3.0.7/drivers/pci/xen-pcifront.c linux-3.0.7/drivers/pci/xen-pcifront.c ---- linux-3.0.7/drivers/pci/xen-pcifront.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pci/xen-pcifront.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pci/xen-pcifront.c linux-3.0.8/drivers/pci/xen-pcifront.c +--- linux-3.0.8/drivers/pci/xen-pcifront.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pci/xen-pcifront.c 2011-08-23 21:48:14.000000000 -0400 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_ struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -33023,9 +33385,9 @@ diff -urNp linux-3.0.7/drivers/pci/xen-pcifront.c linux-3.0.7/drivers/pci/xen-pc err = do_pci_op(pdev, &op); if (likely(!err)) { vector[0] = op.value; -diff -urNp linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c ---- linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c +--- linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c 2011-08-23 21:47:55.000000000 -0400 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void) return 0; } @@ -33035,9 +33397,9 @@ diff -urNp linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c linux-3.0.7/drivers/ { /* log only what the user can fix... */ const u32 wantedmask = hotkey_driver_mask & -diff -urNp linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c ---- linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c +--- linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c 2011-08-23 21:47:55.000000000 -0400 @@ -59,7 +59,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -33094,9 +33456,9 @@ diff -urNp linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c linux-3.0.7/drivers/pnp/p + + pax_close_kernel(); } -diff -urNp linux-3.0.7/drivers/pnp/resource.c linux-3.0.7/drivers/pnp/resource.c ---- linux-3.0.7/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/pnp/resource.c linux-3.0.8/drivers/pnp/resource.c +--- linux-3.0.8/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -33115,9 +33477,9 @@ diff -urNp linux-3.0.7/drivers/pnp/resource.c linux-3.0.7/drivers/pnp/resource.c return 0; /* check if the resource is reserved */ -diff -urNp linux-3.0.7/drivers/power/bq27x00_battery.c linux-3.0.7/drivers/power/bq27x00_battery.c ---- linux-3.0.7/drivers/power/bq27x00_battery.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/power/bq27x00_battery.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/power/bq27x00_battery.c linux-3.0.8/drivers/power/bq27x00_battery.c +--- linux-3.0.8/drivers/power/bq27x00_battery.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/power/bq27x00_battery.c 2011-08-23 21:47:55.000000000 -0400 @@ -67,7 +67,7 @@ struct bq27x00_device_info; struct bq27x00_access_methods { @@ -33127,9 +33489,9 @@ diff -urNp linux-3.0.7/drivers/power/bq27x00_battery.c linux-3.0.7/drivers/power enum bq27x00_chip { BQ27000, BQ27500 }; -diff -urNp linux-3.0.7/drivers/regulator/max8660.c linux-3.0.7/drivers/regulator/max8660.c ---- linux-3.0.7/drivers/regulator/max8660.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/regulator/max8660.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/regulator/max8660.c linux-3.0.8/drivers/regulator/max8660.c +--- linux-3.0.8/drivers/regulator/max8660.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/regulator/max8660.c 2011-08-23 21:47:55.000000000 -0400 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc max8660->shadow_regs[MAX8660_OVER1] = 5; } else { @@ -33143,9 +33505,9 @@ diff -urNp linux-3.0.7/drivers/regulator/max8660.c linux-3.0.7/drivers/regulator } /* -diff -urNp linux-3.0.7/drivers/regulator/mc13892-regulator.c linux-3.0.7/drivers/regulator/mc13892-regulator.c ---- linux-3.0.7/drivers/regulator/mc13892-regulator.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/regulator/mc13892-regulator.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/regulator/mc13892-regulator.c linux-3.0.8/drivers/regulator/mc13892-regulator.c +--- linux-3.0.8/drivers/regulator/mc13892-regulator.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/regulator/mc13892-regulator.c 2011-08-23 21:47:55.000000000 -0400 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p } mc13xxx_unlock(mc13892); @@ -33161,9 +33523,9 @@ diff -urNp linux-3.0.7/drivers/regulator/mc13892-regulator.c linux-3.0.7/drivers for (i = 0; i < pdata->num_regulators; i++) { init_data = &pdata->regulators[i]; priv->regulators[i] = regulator_register( -diff -urNp linux-3.0.7/drivers/rtc/rtc-dev.c linux-3.0.7/drivers/rtc/rtc-dev.c ---- linux-3.0.7/drivers/rtc/rtc-dev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/rtc/rtc-dev.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/rtc/rtc-dev.c linux-3.0.8/drivers/rtc/rtc-dev.c +--- linux-3.0.8/drivers/rtc/rtc-dev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/rtc/rtc-dev.c 2011-08-23 21:48:14.000000000 -0400 @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/rtc.h> @@ -33181,21 +33543,9 @@ diff -urNp linux-3.0.7/drivers/rtc/rtc-dev.c linux-3.0.7/drivers/rtc/rtc-dev.c return rtc_set_time(rtc, &tm); case RTC_PIE_ON: -diff -urNp linux-3.0.7/drivers/scsi/BusLogic.c linux-3.0.7/drivers/scsi/BusLogic.c ---- linux-3.0.7/drivers/scsi/BusLogic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/BusLogic.c 2011-08-23 21:48:14.000000000 -0400 -@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla - static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter - *PrototypeHostAdapter) - { -+ pax_track_stack(); -+ - /* - If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint - Host Adapters; otherwise, default to the standard ISA MultiMaster probe. -diff -urNp linux-3.0.7/drivers/scsi/aacraid/aacraid.h linux-3.0.7/drivers/scsi/aacraid/aacraid.h ---- linux-3.0.7/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/aacraid/aacraid.h linux-3.0.8/drivers/scsi/aacraid/aacraid.h +--- linux-3.0.8/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400 @@ -492,7 +492,7 @@ struct adapter_ops int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd); /* Administrative operations */ @@ -33205,9 +33555,9 @@ diff -urNp linux-3.0.7/drivers/scsi/aacraid/aacraid.h linux-3.0.7/drivers/scsi/a /* * Define which interrupt handler needs to be installed -diff -urNp linux-3.0.7/drivers/scsi/aacraid/commctrl.c linux-3.0.7/drivers/scsi/aacraid/commctrl.c ---- linux-3.0.7/drivers/scsi/aacraid/commctrl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/aacraid/commctrl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/aacraid/commctrl.c linux-3.0.8/drivers/scsi/aacraid/commctrl.c +--- linux-3.0.8/drivers/scsi/aacraid/commctrl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/aacraid/commctrl.c 2011-08-23 21:48:14.000000000 -0400 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d u32 actual_fibsize64, actual_fibsize = 0; int i; @@ -33216,9 +33566,9 @@ diff -urNp linux-3.0.7/drivers/scsi/aacraid/commctrl.c linux-3.0.7/drivers/scsi/ if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); -diff -urNp linux-3.0.7/drivers/scsi/aacraid/linit.c linux-3.0.7/drivers/scsi/aacraid/linit.c ---- linux-3.0.7/drivers/scsi/aacraid/linit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/aacraid/linit.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/aacraid/linit.c linux-3.0.8/drivers/scsi/aacraid/linit.c +--- linux-3.0.8/drivers/scsi/aacraid/linit.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/aacraid/linit.c 2011-10-11 10:44:33.000000000 -0400 @@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_ #elif defined(__devinitconst) static const struct pci_device_id aac_pci_tbl[] __devinitconst = { @@ -33228,9 +33578,9 @@ diff -urNp linux-3.0.7/drivers/scsi/aacraid/linit.c linux-3.0.7/drivers/scsi/aac #endif { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ -diff -urNp linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c 2011-10-11 10:44:33.000000000 -0400 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa .lldd_control_phy = asd_control_phy, }; @@ -33240,21 +33590,21 @@ diff -urNp linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.7/drivers/s {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1}, {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1}, {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1}, -diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa.h linux-3.0.7/drivers/scsi/bfa/bfa.h ---- linux-3.0.7/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400 -@@ -238,7 +238,7 @@ struct bfa_hwif_s { - u32 *nvecs, u32 *maxvec); - void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start, - u32 *end); --}; -+} __no_const; - typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status); +diff -urNp linux-3.0.8/drivers/scsi/bfa/bfad.c linux-3.0.8/drivers/scsi/bfa/bfad.c +--- linux-3.0.8/drivers/scsi/bfa/bfad.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/bfa/bfad.c 2011-08-23 21:48:14.000000000 -0400 +@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) { + struct bfad_vport_s *vport, *vport_new; + struct bfa_fcs_driver_info_s driver_info; - struct bfa_iocfc_s { -diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c ---- linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c 2011-08-23 21:48:14.000000000 -0400 ++ pax_track_stack(); ++ + /* Fill the driver_info info to fcs*/ + memset(&driver_info, 0, sizeof(driver_info)); + strncpy(driver_info.version, BFAD_DRIVER_VERSION, +diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c +--- linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c 2011-08-23 21:48:14.000000000 -0400 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc u16 len, count; u16 templen; @@ -33273,9 +33623,9 @@ diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.7/drivers/scsi /* * get port attributes */ -diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c ---- linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c +--- linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c 2011-08-23 21:48:14.000000000 -0400 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc struct fc_rpsc_speed_info_s speeds; struct bfa_port_attr_s pport_attr; @@ -33285,9 +33635,21 @@ diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.7/drivers/scsi bfa_trc(port->fcs, rx_fchs->s_id); bfa_trc(port->fcs, rx_fchs->d_id); -diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h ---- linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa.h linux-3.0.8/drivers/scsi/bfa/bfa.h +--- linux-3.0.8/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400 +@@ -238,7 +238,7 @@ struct bfa_hwif_s { + u32 *nvecs, u32 *maxvec); + void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start, + u32 *end); +-}; ++} __no_const; + typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status); + + struct bfa_iocfc_s { +diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h +--- linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h 2011-08-23 21:47:55.000000000 -0400 @@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s { bfa_ioc_disable_cbfn_t disable_cbfn; bfa_ioc_hbfail_cbfn_t hbfail_cbfn; @@ -33306,21 +33668,21 @@ diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h linux-3.0.7/drivers/scsi/bfa/b #define bfa_ioc_pcifn(__ioc) ((__ioc)->pcidev.pci_func) #define bfa_ioc_devid(__ioc) ((__ioc)->pcidev.device_id) -diff -urNp linux-3.0.7/drivers/scsi/bfa/bfad.c linux-3.0.7/drivers/scsi/bfa/bfad.c ---- linux-3.0.7/drivers/scsi/bfa/bfad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/bfa/bfad.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) { - struct bfad_vport_s *vport, *vport_new; - struct bfa_fcs_driver_info_s driver_info; - +diff -urNp linux-3.0.8/drivers/scsi/BusLogic.c linux-3.0.8/drivers/scsi/BusLogic.c +--- linux-3.0.8/drivers/scsi/BusLogic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/BusLogic.c 2011-08-23 21:48:14.000000000 -0400 +@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla + static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter + *PrototypeHostAdapter) + { + pax_track_stack(); + - /* Fill the driver_info info to fcs*/ - memset(&driver_info, 0, sizeof(driver_info)); - strncpy(driver_info.version, BFAD_DRIVER_VERSION, -diff -urNp linux-3.0.7/drivers/scsi/dpt_i2o.c linux-3.0.7/drivers/scsi/dpt_i2o.c ---- linux-3.0.7/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400 + /* + If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint + Host Adapters; otherwise, default to the standard ISA MultiMaster probe. +diff -urNp linux-3.0.8/drivers/scsi/dpt_i2o.c linux-3.0.8/drivers/scsi/dpt_i2o.c +--- linux-3.0.8/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p dma_addr_t addr; ulong flags = 0; @@ -33339,9 +33701,9 @@ diff -urNp linux-3.0.7/drivers/scsi/dpt_i2o.c linux-3.0.7/drivers/scsi/dpt_i2o.c memset(msg, 0 , sizeof(msg)); len = scsi_bufflen(cmd); direction = 0x00000000; -diff -urNp linux-3.0.7/drivers/scsi/eata.c linux-3.0.7/drivers/scsi/eata.c ---- linux-3.0.7/drivers/scsi/eata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/eata.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/eata.c linux-3.0.8/drivers/scsi/eata.c +--- linux-3.0.8/drivers/scsi/eata.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/eata.c 2011-08-23 21:48:14.000000000 -0400 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por struct hostdata *ha; char name[16]; @@ -33351,9 +33713,9 @@ diff -urNp linux-3.0.7/drivers/scsi/eata.c linux-3.0.7/drivers/scsi/eata.c sprintf(name, "%s%d", driver_name, j); if (!request_region(port_base, REGION_SIZE, driver_name)) { -diff -urNp linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c ---- linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c +--- linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c 2011-08-23 21:48:14.000000000 -0400 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe } buf; int rc; @@ -33363,9 +33725,9 @@ diff -urNp linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.7/drivers/scsi/fc fiph = (struct fip_header *)skb->data; sub = fiph->fip_subcode; -diff -urNp linux-3.0.7/drivers/scsi/gdth.c linux-3.0.7/drivers/scsi/gdth.c ---- linux-3.0.7/drivers/scsi/gdth.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/gdth.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/gdth.c linux-3.0.8/drivers/scsi/gdth.c +--- linux-3.0.8/drivers/scsi/gdth.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/gdth.c 2011-08-23 21:48:14.000000000 -0400 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg) unsigned long flags; gdth_ha_str *ha; @@ -33403,9 +33765,9 @@ diff -urNp linux-3.0.7/drivers/scsi/gdth.c linux-3.0.7/drivers/scsi/gdth.c memset(cmnd, 0xff, MAX_COMMAND_SIZE); TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); -diff -urNp linux-3.0.7/drivers/scsi/gdth_proc.c linux-3.0.7/drivers/scsi/gdth_proc.c ---- linux-3.0.7/drivers/scsi/gdth_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/gdth_proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/gdth_proc.c linux-3.0.8/drivers/scsi/gdth_proc.c +--- linux-3.0.8/drivers/scsi/gdth_proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/gdth_proc.c 2011-08-23 21:48:14.000000000 -0400 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi u64 paddr; @@ -33425,9 +33787,9 @@ diff -urNp linux-3.0.7/drivers/scsi/gdth_proc.c linux-3.0.7/drivers/scsi/gdth_pr gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr = kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) -diff -urNp linux-3.0.7/drivers/scsi/hosts.c linux-3.0.7/drivers/scsi/hosts.c ---- linux-3.0.7/drivers/scsi/hosts.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/hosts.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/hosts.c linux-3.0.8/drivers/scsi/hosts.c +--- linux-3.0.8/drivers/scsi/hosts.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/hosts.c 2011-08-23 21:47:55.000000000 -0400 @@ -42,7 +42,7 @@ #include "scsi_logging.h" @@ -33446,9 +33808,9 @@ diff -urNp linux-3.0.7/drivers/scsi/hosts.c linux-3.0.7/drivers/scsi/hosts.c shost->dma_channel = 0xff; /* These three are default values which can be overridden */ -diff -urNp linux-3.0.7/drivers/scsi/hpsa.c linux-3.0.7/drivers/scsi/hpsa.c ---- linux-3.0.7/drivers/scsi/hpsa.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/hpsa.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c +--- linux-3.0.8/drivers/scsi/hpsa.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/hpsa.c 2011-10-16 21:55:27.000000000 -0400 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct u32 a; @@ -33563,9 +33925,9 @@ diff -urNp linux-3.0.7/drivers/scsi/hpsa.c linux-3.0.7/drivers/scsi/hpsa.c h->transMethod = CFGTBL_Trans_Performant; } -diff -urNp linux-3.0.7/drivers/scsi/hpsa.h linux-3.0.7/drivers/scsi/hpsa.h ---- linux-3.0.7/drivers/scsi/hpsa.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/hpsa.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/hpsa.h linux-3.0.8/drivers/scsi/hpsa.h +--- linux-3.0.8/drivers/scsi/hpsa.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/hpsa.h 2011-08-23 21:47:55.000000000 -0400 @@ -73,7 +73,7 @@ struct ctlr_info { unsigned int msix_vector; unsigned int msi_vector; @@ -33575,9 +33937,9 @@ diff -urNp linux-3.0.7/drivers/scsi/hpsa.h linux-3.0.7/drivers/scsi/hpsa.h /* queue and queue Info */ struct list_head reqQ; -diff -urNp linux-3.0.7/drivers/scsi/ips.h linux-3.0.7/drivers/scsi/ips.h ---- linux-3.0.7/drivers/scsi/ips.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/ips.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/ips.h linux-3.0.8/drivers/scsi/ips.h +--- linux-3.0.8/drivers/scsi/ips.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/ips.h 2011-08-23 21:47:55.000000000 -0400 @@ -1027,7 +1027,7 @@ typedef struct { int (*intr)(struct ips_ha *); void (*enableint)(struct ips_ha *); @@ -33587,9 +33949,9 @@ diff -urNp linux-3.0.7/drivers/scsi/ips.h linux-3.0.7/drivers/scsi/ips.h typedef struct ips_ha { uint8_t ha_id[IPS_MAX_CHANNELS+1]; -diff -urNp linux-3.0.7/drivers/scsi/libfc/fc_exch.c linux-3.0.7/drivers/scsi/libfc/fc_exch.c ---- linux-3.0.7/drivers/scsi/libfc/fc_exch.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/libfc/fc_exch.c linux-3.0.8/drivers/scsi/libfc/fc_exch.c +--- linux-3.0.8/drivers/scsi/libfc/fc_exch.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:47:55.000000000 -0400 @@ -105,12 +105,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -33711,9 +34073,9 @@ diff -urNp linux-3.0.7/drivers/scsi/libfc/fc_exch.c linux-3.0.7/drivers/scsi/lib fc_frame_free(fp); } -diff -urNp linux-3.0.7/drivers/scsi/libsas/sas_ata.c linux-3.0.7/drivers/scsi/libsas/sas_ata.c ---- linux-3.0.7/drivers/scsi/libsas/sas_ata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/libsas/sas_ata.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/libsas/sas_ata.c linux-3.0.8/drivers/scsi/libsas/sas_ata.c +--- linux-3.0.8/drivers/scsi/libsas/sas_ata.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/libsas/sas_ata.c 2011-08-23 21:47:55.000000000 -0400 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa .postreset = ata_std_postreset, .error_handler = ata_std_error_handler, @@ -33723,41 +34085,9 @@ diff -urNp linux-3.0.7/drivers/scsi/libsas/sas_ata.c linux-3.0.7/drivers/scsi/li .qc_prep = ata_noop_qc_prep, .qc_issue = sas_ata_qc_issue, .qc_fill_rtf = sas_ata_qc_fill_rtf, -diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc.h linux-3.0.7/drivers/scsi/lpfc/lpfc.h ---- linux-3.0.7/drivers/scsi/lpfc/lpfc.h 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/lpfc/lpfc.h 2011-10-16 21:55:27.000000000 -0400 -@@ -425,7 +425,7 @@ struct lpfc_vport { - struct dentry *debug_nodelist; - struct dentry *vport_debugfs_root; - struct lpfc_debugfs_trc *disc_trc; -- atomic_t disc_trc_cnt; -+ atomic_unchecked_t disc_trc_cnt; - #endif - uint8_t stat_data_enabled; - uint8_t stat_data_blocked; -@@ -832,8 +832,8 @@ struct lpfc_hba { - struct timer_list fabric_block_timer; - unsigned long bit_flags; - #define FABRIC_COMANDS_BLOCKED 0 -- atomic_t num_rsrc_err; -- atomic_t num_cmd_success; -+ atomic_unchecked_t num_rsrc_err; -+ atomic_unchecked_t num_cmd_success; - unsigned long last_rsrc_error_time; - unsigned long last_ramp_down_time; - unsigned long last_ramp_up_time; -@@ -847,7 +847,7 @@ struct lpfc_hba { - struct dentry *debug_dumpDif; /* BlockGuard BPL*/ - struct dentry *debug_slow_ring_trc; - struct lpfc_debugfs_trc *slow_ring_trc; -- atomic_t slow_ring_trc_cnt; -+ atomic_unchecked_t slow_ring_trc_cnt; - /* iDiag debugfs sub-directory */ - struct dentry *idiag_root; - struct dentry *idiag_pci_cfg; -diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c ---- linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c +--- linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c 2011-08-23 21:48:14.000000000 -0400 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_ #include <linux/debugfs.h> @@ -33846,9 +34176,41 @@ diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.7/drivers/scsi snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = -diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c ---- linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc.h linux-3.0.8/drivers/scsi/lpfc/lpfc.h +--- linux-3.0.8/drivers/scsi/lpfc/lpfc.h 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/lpfc/lpfc.h 2011-10-16 21:55:27.000000000 -0400 +@@ -425,7 +425,7 @@ struct lpfc_vport { + struct dentry *debug_nodelist; + struct dentry *vport_debugfs_root; + struct lpfc_debugfs_trc *disc_trc; +- atomic_t disc_trc_cnt; ++ atomic_unchecked_t disc_trc_cnt; + #endif + uint8_t stat_data_enabled; + uint8_t stat_data_blocked; +@@ -832,8 +832,8 @@ struct lpfc_hba { + struct timer_list fabric_block_timer; + unsigned long bit_flags; + #define FABRIC_COMANDS_BLOCKED 0 +- atomic_t num_rsrc_err; +- atomic_t num_cmd_success; ++ atomic_unchecked_t num_rsrc_err; ++ atomic_unchecked_t num_cmd_success; + unsigned long last_rsrc_error_time; + unsigned long last_ramp_down_time; + unsigned long last_ramp_up_time; +@@ -847,7 +847,7 @@ struct lpfc_hba { + struct dentry *debug_dumpDif; /* BlockGuard BPL*/ + struct dentry *debug_slow_ring_trc; + struct lpfc_debugfs_trc *slow_ring_trc; +- atomic_t slow_ring_trc_cnt; ++ atomic_unchecked_t slow_ring_trc_cnt; + /* iDiag debugfs sub-directory */ + struct dentry *idiag_root; + struct dentry *idiag_pci_cfg; +diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c +--- linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c 2011-10-16 21:55:27.000000000 -0400 @@ -9971,8 +9971,10 @@ lpfc_init(void) printk(LPFC_COPYRIGHT "\n"); @@ -33862,9 +34224,9 @@ diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c linux-3.0.7/drivers/scsi/lp } lpfc_transport_template = fc_attach_transport(&lpfc_transport_functions); -diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c ---- linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c +--- linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-16 21:55:27.000000000 -0400 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb uint32_t evt_posted; @@ -33916,9 +34278,9 @@ diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.7/drivers/scsi/lp } /** -diff -urNp linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c ---- linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c +--- linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c 2011-08-23 21:48:14.000000000 -0400 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter int rval; int i; @@ -33928,9 +34290,9 @@ diff -urNp linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.7/drivers // Allocate memory for the base list of scb for management module. adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL); -diff -urNp linux-3.0.7/drivers/scsi/osd/osd_initiator.c linux-3.0.7/drivers/scsi/osd/osd_initiator.c ---- linux-3.0.7/drivers/scsi/osd/osd_initiator.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/osd/osd_initiator.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/osd/osd_initiator.c linux-3.0.8/drivers/scsi/osd/osd_initiator.c +--- linux-3.0.8/drivers/scsi/osd/osd_initiator.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/osd/osd_initiator.c 2011-08-23 21:48:14.000000000 -0400 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st int nelem = ARRAY_SIZE(get_attrs), a = 0; int ret; @@ -33940,9 +34302,9 @@ diff -urNp linux-3.0.7/drivers/scsi/osd/osd_initiator.c linux-3.0.7/drivers/scsi or = osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; -diff -urNp linux-3.0.7/drivers/scsi/pmcraid.c linux-3.0.7/drivers/scsi/pmcraid.c ---- linux-3.0.7/drivers/scsi/pmcraid.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/pmcraid.c linux-3.0.8/drivers/scsi/pmcraid.c +--- linux-3.0.8/drivers/scsi/pmcraid.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc res->scsi_dev = scsi_dev; scsi_dev->hostdata = res; @@ -34013,9 +34375,9 @@ diff -urNp linux-3.0.7/drivers/scsi/pmcraid.c linux-3.0.7/drivers/scsi/pmcraid.c schedule_work(&pinstance->worker_q); return rc; -diff -urNp linux-3.0.7/drivers/scsi/pmcraid.h linux-3.0.7/drivers/scsi/pmcraid.h ---- linux-3.0.7/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/pmcraid.h linux-3.0.8/drivers/scsi/pmcraid.h +--- linux-3.0.8/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400 @@ -749,7 +749,7 @@ struct pmcraid_instance { struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS]; @@ -34045,9 +34407,9 @@ diff -urNp linux-3.0.7/drivers/scsi/pmcraid.h linux-3.0.7/drivers/scsi/pmcraid.h /* To indicate add/delete/modify during CCN */ u8 change_detected; -diff -urNp linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h ---- linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h +--- linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400 @@ -2244,7 +2244,7 @@ struct isp_operations { int (*get_flash_version) (struct scsi_qla_host *, void *); int (*start_scsi) (srb_t *); @@ -34057,9 +34419,9 @@ diff -urNp linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h linux-3.0.7/drivers/scsi/q /* MSI-X Support *************************************************************/ -diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h ---- linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h +--- linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400 @@ -256,7 +256,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ @@ -34069,9 +34431,9 @@ diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.7/drivers/scsi/q * retried */ uint16_t port; -diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c ---- linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c +--- linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c 2011-08-23 21:47:56.000000000 -0400 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ ddb_entry->fw_ddb_index = fw_ddb_index; atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); @@ -34090,9 +34452,9 @@ diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.7/drivers/scsi/ atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); iscsi_unblock_session(ddb_entry->sess); -diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c ---- linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c +--- linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c 2011-08-23 21:47:56.000000000 -0400 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED) { @@ -34109,9 +34471,9 @@ diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.7/drivers/scsi/ql relogin_retry_count)) ); start_dpc++; -diff -urNp linux-3.0.7/drivers/scsi/scsi.c linux-3.0.7/drivers/scsi/scsi.c ---- linux-3.0.7/drivers/scsi/scsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi.c linux-3.0.8/drivers/scsi/scsi.c +--- linux-3.0.8/drivers/scsi/scsi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi.c 2011-08-23 21:47:56.000000000 -0400 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * unsigned long timeout; int rtn = 0; @@ -34121,9 +34483,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi.c linux-3.0.7/drivers/scsi/scsi.c /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { -diff -urNp linux-3.0.7/drivers/scsi/scsi_debug.c linux-3.0.7/drivers/scsi/scsi_debug.c ---- linux-3.0.7/drivers/scsi/scsi_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_debug.c linux-3.0.8/drivers/scsi/scsi_debug.c +--- linux-3.0.8/drivers/scsi/scsi_debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_debug.c 2011-08-23 21:48:14.000000000 -0400 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_ unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; @@ -34142,9 +34504,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_debug.c linux-3.0.7/drivers/scsi/scsi_d if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -diff -urNp linux-3.0.7/drivers/scsi/scsi_lib.c linux-3.0.7/drivers/scsi/scsi_lib.c ---- linux-3.0.7/drivers/scsi/scsi_lib.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_lib.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_lib.c linux-3.0.8/drivers/scsi/scsi_lib.c +--- linux-3.0.8/drivers/scsi/scsi_lib.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_lib.c 2011-08-23 21:47:56.000000000 -0400 @@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req shost = sdev->host; scsi_init_cmd_errh(cmd); @@ -34166,9 +34528,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_lib.c linux-3.0.7/drivers/scsi/scsi_lib disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && -diff -urNp linux-3.0.7/drivers/scsi/scsi_sysfs.c linux-3.0.7/drivers/scsi/scsi_sysfs.c ---- linux-3.0.7/drivers/scsi/scsi_sysfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_sysfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_sysfs.c linux-3.0.8/drivers/scsi/scsi_sysfs.c +--- linux-3.0.8/drivers/scsi/scsi_sysfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_sysfs.c 2011-08-23 21:47:56.000000000 -0400 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, char *buf) \ { \ @@ -34178,9 +34540,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_sysfs.c linux-3.0.7/drivers/scsi/scsi_s return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) -diff -urNp linux-3.0.7/drivers/scsi/scsi_tgt_lib.c linux-3.0.7/drivers/scsi/scsi_tgt_lib.c ---- linux-3.0.7/drivers/scsi/scsi_tgt_lib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_tgt_lib.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_tgt_lib.c linux-3.0.8/drivers/scsi/scsi_tgt_lib.c +--- linux-3.0.8/drivers/scsi/scsi_tgt_lib.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_tgt_lib.c 2011-10-06 04:17:55.000000000 -0400 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc int err; @@ -34190,9 +34552,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_tgt_lib.c linux-3.0.7/drivers/scsi/scsi if (err) { /* * TODO: need to fixup sg_tablesize, max_segment_size, -diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_fc.c linux-3.0.7/drivers/scsi/scsi_transport_fc.c ---- linux-3.0.7/drivers/scsi/scsi_transport_fc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_transport_fc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_fc.c linux-3.0.8/drivers/scsi/scsi_transport_fc.c +--- linux-3.0.8/drivers/scsi/scsi_transport_fc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_transport_fc.c 2011-08-23 21:47:56.000000000 -0400 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_ * Netlink Infrastructure */ @@ -34229,9 +34591,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_fc.c linux-3.0.7/drivers/scsi return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 -diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c ---- linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c +--- linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c 2011-08-23 21:47:56.000000000 -0400 @@ -83,7 +83,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; @@ -34259,9 +34621,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c linux-3.0.7/drivers/s err = class_register(&iscsi_transport_class); if (err) -diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_srp.c linux-3.0.7/drivers/scsi/scsi_transport_srp.c ---- linux-3.0.7/drivers/scsi/scsi_transport_srp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/scsi_transport_srp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_srp.c linux-3.0.8/drivers/scsi/scsi_transport_srp.c +--- linux-3.0.8/drivers/scsi/scsi_transport_srp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/scsi_transport_srp.c 2011-08-23 21:47:56.000000000 -0400 @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" @@ -34289,9 +34651,9 @@ diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_srp.c linux-3.0.7/drivers/scs dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); transport_setup_device(&rport->dev); -diff -urNp linux-3.0.7/drivers/scsi/sg.c linux-3.0.7/drivers/scsi/sg.c ---- linux-3.0.7/drivers/scsi/sg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/sg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/sg.c linux-3.0.8/drivers/scsi/sg.c +--- linux-3.0.8/drivers/scsi/sg.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/sg.c 2011-10-06 04:17:55.000000000 -0400 @@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int sdp->disk->disk_name, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), @@ -34319,9 +34681,9 @@ diff -urNp linux-3.0.7/drivers/scsi/sg.c linux-3.0.7/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c ---- linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c +--- linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-08-23 21:48:14.000000000 -0400 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p int do_iounmap = 0; int do_disable_device = 1; @@ -34331,9 +34693,9 @@ diff -urNp linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.7/drivers/s memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev = pdev; -diff -urNp linux-3.0.7/drivers/scsi/vmw_pvscsi.c linux-3.0.7/drivers/scsi/vmw_pvscsi.c ---- linux-3.0.7/drivers/scsi/vmw_pvscsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/scsi/vmw_pvscsi.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/scsi/vmw_pvscsi.c linux-3.0.8/drivers/scsi/vmw_pvscsi.c +--- linux-3.0.8/drivers/scsi/vmw_pvscsi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/scsi/vmw_pvscsi.c 2011-08-23 21:48:14.000000000 -0400 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const dma_addr_t base; unsigned i; @@ -34343,9 +34705,9 @@ diff -urNp linux-3.0.7/drivers/scsi/vmw_pvscsi.c linux-3.0.7/drivers/scsi/vmw_pv cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT; cmd.reqRingNumPages = adapter->req_pages; cmd.cmpRingNumPages = adapter->cmp_pages; -diff -urNp linux-3.0.7/drivers/spi/dw_spi_pci.c linux-3.0.7/drivers/spi/dw_spi_pci.c ---- linux-3.0.7/drivers/spi/dw_spi_pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/spi/dw_spi_pci.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/spi/dw_spi_pci.c linux-3.0.8/drivers/spi/dw_spi_pci.c +--- linux-3.0.8/drivers/spi/dw_spi_pci.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/spi/dw_spi_pci.c 2011-10-11 10:44:33.000000000 -0400 @@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd #define spi_resume NULL #endif @@ -34355,9 +34717,9 @@ diff -urNp linux-3.0.7/drivers/spi/dw_spi_pci.c linux-3.0.7/drivers/spi/dw_spi_p /* Intel MID platform SPI controller 0 */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, {}, -diff -urNp linux-3.0.7/drivers/spi/spi.c linux-3.0.7/drivers/spi/spi.c ---- linux-3.0.7/drivers/spi/spi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/spi/spi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/spi/spi.c linux-3.0.8/drivers/spi/spi.c +--- linux-3.0.8/drivers/spi/spi.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/spi/spi.c 2011-08-23 21:47:56.000000000 -0400 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma EXPORT_SYMBOL_GPL(spi_bus_unlock); @@ -34367,9 +34729,9 @@ diff -urNp linux-3.0.7/drivers/spi/spi.c linux-3.0.7/drivers/spi/spi.c static u8 *buf; -diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c ---- linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c +--- linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-08-23 21:48:14.000000000 -0400 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[ (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0)) @@ -34379,9 +34741,9 @@ diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.7/ .ndo_init = NULL, .ndo_open = ar6000_open, .ndo_stop = ar6000_close, -diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h ---- linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h +--- linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-08-23 21:47:56.000000000 -0400 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void typedef struct ar6k_pal_config_s { @@ -34391,9 +34753,9 @@ diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux- void register_pal_cb(ar6k_pal_config_t *palConfig_p); #endif /* _AR6K_PAL_H_ */ -diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ---- linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +--- linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400 @@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); } @@ -34438,9 +34800,9 @@ diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0. #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) g_bus = bus; -diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h ---- linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +--- linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-08-23 21:47:56.000000000 -0400 @@ -593,7 +593,7 @@ struct phy_func_ptr { initfn_t carrsuppr; rxsigpwrfn_t rxsigpwr; @@ -34450,9 +34812,9 @@ diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu typedef struct phy_func_ptr phy_func_ptr_t; struct phy_info { -diff -urNp linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h ---- linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h +--- linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h 2011-08-23 21:47:56.000000000 -0400 @@ -185,7 +185,7 @@ typedef struct { u16 func, uint bustype, void *regsva, void *param); /* detach from device */ @@ -34462,9 +34824,9 @@ diff -urNp linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.7/dr /* platform specific/high level functions */ extern int bcmsdh_register(bcmsdh_driver_t *driver); -diff -urNp linux-3.0.7/drivers/staging/et131x/et1310_tx.c linux-3.0.7/drivers/staging/et131x/et1310_tx.c ---- linux-3.0.7/drivers/staging/et131x/et1310_tx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/et131x/et1310_tx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/et131x/et1310_tx.c linux-3.0.8/drivers/staging/et131x/et1310_tx.c +--- linux-3.0.8/drivers/staging/et131x/et1310_tx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/et131x/et1310_tx.c 2011-08-23 21:47:56.000000000 -0400 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru struct net_device_stats *stats = &etdev->net_stats; @@ -34480,9 +34842,9 @@ diff -urNp linux-3.0.7/drivers/staging/et131x/et1310_tx.c linux-3.0.7/drivers/st if (tcb->skb) { stats->tx_bytes += tcb->skb->len; -diff -urNp linux-3.0.7/drivers/staging/et131x/et131x_adapter.h linux-3.0.7/drivers/staging/et131x/et131x_adapter.h ---- linux-3.0.7/drivers/staging/et131x/et131x_adapter.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/et131x/et131x_adapter.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/et131x/et131x_adapter.h linux-3.0.8/drivers/staging/et131x/et131x_adapter.h +--- linux-3.0.8/drivers/staging/et131x/et131x_adapter.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/et131x/et131x_adapter.h 2011-08-23 21:47:56.000000000 -0400 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t { * operations */ @@ -34498,9 +34860,9 @@ diff -urNp linux-3.0.7/drivers/staging/et131x/et131x_adapter.h linux-3.0.7/drive u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ -diff -urNp linux-3.0.7/drivers/staging/hv/channel.c linux-3.0.7/drivers/staging/hv/channel.c ---- linux-3.0.7/drivers/staging/hv/channel.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/channel.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/channel.c linux-3.0.8/drivers/staging/hv/channel.c +--- linux-3.0.8/drivers/staging/hv/channel.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/channel.c 2011-08-23 21:47:56.000000000 -0400 @@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c int ret = 0; int t; @@ -34512,9 +34874,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/channel.c linux-3.0.7/drivers/staging/ ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) -diff -urNp linux-3.0.7/drivers/staging/hv/hv.c linux-3.0.7/drivers/staging/hv/hv.c ---- linux-3.0.7/drivers/staging/hv/hv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/hv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/hv.c linux-3.0.8/drivers/staging/hv/hv.c +--- linux-3.0.8/drivers/staging/hv/hv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/hv.c 2011-08-23 21:47:56.000000000 -0400 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi u64 output_address = (output) ? virt_to_phys(output) : 0; u32 output_address_hi = output_address >> 32; @@ -34524,9 +34886,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/hv.c linux-3.0.7/drivers/staging/hv/hv __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi), "=a"(hv_status_lo) : "d" (control_hi), -diff -urNp linux-3.0.7/drivers/staging/hv/hv_mouse.c linux-3.0.7/drivers/staging/hv/hv_mouse.c ---- linux-3.0.7/drivers/staging/hv/hv_mouse.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/hv_mouse.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/hv_mouse.c linux-3.0.8/drivers/staging/hv/hv_mouse.c +--- linux-3.0.8/drivers/staging/hv/hv_mouse.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/hv_mouse.c 2011-08-23 21:47:56.000000000 -0400 @@ -879,8 +879,10 @@ static void reportdesc_callback(struct h if (hid_dev) { DPRINT_INFO(INPUTVSC_DRV, "hid_device created"); @@ -34540,9 +34902,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/hv_mouse.c linux-3.0.7/drivers/staging hid_dev->bus = BUS_VIRTUAL; hid_dev->vendor = input_device_ctx->device_info.vendor; -diff -urNp linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h ---- linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h +--- linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h 2011-08-23 21:47:56.000000000 -0400 @@ -559,7 +559,7 @@ enum vmbus_connect_state { struct vmbus_connection { enum vmbus_connect_state conn_state; @@ -34552,9 +34914,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h linux-3.0.7/drivers/sta /* * Represents channel interrupts. Each bit position represents a -diff -urNp linux-3.0.7/drivers/staging/hv/rndis_filter.c linux-3.0.7/drivers/staging/hv/rndis_filter.c ---- linux-3.0.7/drivers/staging/hv/rndis_filter.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/rndis_filter.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/rndis_filter.c linux-3.0.8/drivers/staging/hv/rndis_filter.c +--- linux-3.0.8/drivers/staging/hv/rndis_filter.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/rndis_filter.c 2011-08-23 21:47:56.000000000 -0400 @@ -43,7 +43,7 @@ struct rndis_device { enum rndis_device_state state; @@ -34582,9 +34944,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/rndis_filter.c linux-3.0.7/drivers/sta /* Ignore return since this msg is optional. */ rndis_filter_send_request(dev, request); -diff -urNp linux-3.0.7/drivers/staging/hv/vmbus_drv.c linux-3.0.7/drivers/staging/hv/vmbus_drv.c ---- linux-3.0.7/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/hv/vmbus_drv.c linux-3.0.8/drivers/staging/hv/vmbus_drv.c +--- linux-3.0.8/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400 @@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h { int ret = 0; @@ -34599,9 +34961,9 @@ diff -urNp linux-3.0.7/drivers/staging/hv/vmbus_drv.c linux-3.0.7/drivers/stagin /* The new device belongs to this bus */ child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */ -diff -urNp linux-3.0.7/drivers/staging/iio/ring_generic.h linux-3.0.7/drivers/staging/iio/ring_generic.h ---- linux-3.0.7/drivers/staging/iio/ring_generic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/iio/ring_generic.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/iio/ring_generic.h linux-3.0.8/drivers/staging/iio/ring_generic.h +--- linux-3.0.8/drivers/staging/iio/ring_generic.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/iio/ring_generic.h 2011-08-23 21:47:56.000000000 -0400 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs { int (*is_enabled)(struct iio_ring_buffer *ring); @@ -34611,9 +34973,28 @@ diff -urNp linux-3.0.7/drivers/staging/iio/ring_generic.h linux-3.0.7/drivers/st struct iio_ring_setup_ops { int (*preenable)(struct iio_dev *); -diff -urNp linux-3.0.7/drivers/staging/octeon/ethernet-rx.c linux-3.0.7/drivers/staging/octeon/ethernet-rx.c ---- linux-3.0.7/drivers/staging/octeon/ethernet-rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/octeon/ethernet-rx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet.c linux-3.0.8/drivers/staging/octeon/ethernet.c +--- linux-3.0.8/drivers/staging/octeon/ethernet.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/octeon/ethernet.c 2011-08-23 21:47:56.000000000 -0400 +@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ + * since the RX tasklet also increments it. + */ + #ifdef CONFIG_64BIT +- atomic64_add(rx_status.dropped_packets, +- (atomic64_t *)&priv->stats.rx_dropped); ++ atomic64_add_unchecked(rx_status.dropped_packets, ++ (atomic64_unchecked_t *)&priv->stats.rx_dropped); + #else +- atomic_add(rx_status.dropped_packets, +- (atomic_t *)&priv->stats.rx_dropped); ++ atomic_add_unchecked(rx_status.dropped_packets, ++ (atomic_unchecked_t *)&priv->stats.rx_dropped); + #endif + } + +diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet-rx.c linux-3.0.8/drivers/staging/octeon/ethernet-rx.c +--- linux-3.0.8/drivers/staging/octeon/ethernet-rx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/octeon/ethernet-rx.c 2011-08-23 21:47:56.000000000 -0400 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { @@ -34642,28 +35023,9 @@ diff -urNp linux-3.0.7/drivers/staging/octeon/ethernet-rx.c linux-3.0.7/drivers/ #endif dev_kfree_skb_irq(skb); } -diff -urNp linux-3.0.7/drivers/staging/octeon/ethernet.c linux-3.0.7/drivers/staging/octeon/ethernet.c ---- linux-3.0.7/drivers/staging/octeon/ethernet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/octeon/ethernet.c 2011-08-23 21:47:56.000000000 -0400 -@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ - * since the RX tasklet also increments it. - */ - #ifdef CONFIG_64BIT -- atomic64_add(rx_status.dropped_packets, -- (atomic64_t *)&priv->stats.rx_dropped); -+ atomic64_add_unchecked(rx_status.dropped_packets, -+ (atomic64_unchecked_t *)&priv->stats.rx_dropped); - #else -- atomic_add(rx_status.dropped_packets, -- (atomic_t *)&priv->stats.rx_dropped); -+ atomic_add_unchecked(rx_status.dropped_packets, -+ (atomic_unchecked_t *)&priv->stats.rx_dropped); - #endif - } - -diff -urNp linux-3.0.7/drivers/staging/pohmelfs/inode.c linux-3.0.7/drivers/staging/pohmelfs/inode.c ---- linux-3.0.7/drivers/staging/pohmelfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/pohmelfs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/pohmelfs/inode.c linux-3.0.8/drivers/staging/pohmelfs/inode.c +--- linux-3.0.8/drivers/staging/pohmelfs/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/pohmelfs/inode.c 2011-08-23 21:47:56.000000000 -0400 @@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -34682,9 +35044,9 @@ diff -urNp linux-3.0.7/drivers/staging/pohmelfs/inode.c linux-3.0.7/drivers/stag atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); -diff -urNp linux-3.0.7/drivers/staging/pohmelfs/mcache.c linux-3.0.7/drivers/staging/pohmelfs/mcache.c ---- linux-3.0.7/drivers/staging/pohmelfs/mcache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/pohmelfs/mcache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/pohmelfs/mcache.c linux-3.0.8/drivers/staging/pohmelfs/mcache.c +--- linux-3.0.8/drivers/staging/pohmelfs/mcache.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/pohmelfs/mcache.c 2011-08-23 21:47:56.000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -34694,9 +35056,9 @@ diff -urNp linux-3.0.7/drivers/staging/pohmelfs/mcache.c linux-3.0.7/drivers/sta mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-3.0.7/drivers/staging/pohmelfs/netfs.h linux-3.0.7/drivers/staging/pohmelfs/netfs.h ---- linux-3.0.7/drivers/staging/pohmelfs/netfs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/pohmelfs/netfs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/pohmelfs/netfs.h linux-3.0.8/drivers/staging/pohmelfs/netfs.h +--- linux-3.0.8/drivers/staging/pohmelfs/netfs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/pohmelfs/netfs.h 2011-08-23 21:47:56.000000000 -0400 @@ -571,14 +571,14 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -34714,9 +35076,9 @@ diff -urNp linux-3.0.7/drivers/staging/pohmelfs/netfs.h linux-3.0.7/drivers/stag unsigned int crypto_attached_size; unsigned int crypto_align_size; -diff -urNp linux-3.0.7/drivers/staging/pohmelfs/trans.c linux-3.0.7/drivers/staging/pohmelfs/trans.c ---- linux-3.0.7/drivers/staging/pohmelfs/trans.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/pohmelfs/trans.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/pohmelfs/trans.c linux-3.0.8/drivers/staging/pohmelfs/trans.c +--- linux-3.0.8/drivers/staging/pohmelfs/trans.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/pohmelfs/trans.c 2011-08-23 21:47:56.000000000 -0400 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran int err; struct netfs_cmd *cmd = t->iovec.iov_base; @@ -34726,9 +35088,9 @@ diff -urNp linux-3.0.7/drivers/staging/pohmelfs/trans.c linux-3.0.7/drivers/stag cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); -diff -urNp linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h ---- linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h +--- linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h 2011-08-23 21:47:56.000000000 -0400 @@ -83,7 +83,7 @@ struct _io_ops { u8 *pmem); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, @@ -34738,9 +35100,9 @@ diff -urNp linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.7/drivers/ struct io_req { struct list_head list; -diff -urNp linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c ---- linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c 2011-08-24 18:21:41.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c +--- linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c 2011-08-24 18:21:41.000000000 -0400 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s t3e3_if_config(sc, cmd_2t3e3, (char *)¶m, &resp, &rlen); @@ -34750,9 +35112,9 @@ diff -urNp linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.7/drivers/st return -EFAULT; return 0; -diff -urNp linux-3.0.7/drivers/staging/tty/stallion.c linux-3.0.7/drivers/staging/tty/stallion.c ---- linux-3.0.7/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/tty/stallion.c linux-3.0.8/drivers/staging/tty/stallion.c +--- linux-3.0.8/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp struct stlport stl_dummyport; struct stlport *portp; @@ -34762,9 +35124,9 @@ diff -urNp linux-3.0.7/drivers/staging/tty/stallion.c linux-3.0.7/drivers/stagin if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, -diff -urNp linux-3.0.7/drivers/staging/usbip/usbip_common.h linux-3.0.7/drivers/staging/usbip/usbip_common.h ---- linux-3.0.7/drivers/staging/usbip/usbip_common.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/usbip/usbip_common.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/usbip/usbip_common.h linux-3.0.8/drivers/staging/usbip/usbip_common.h +--- linux-3.0.8/drivers/staging/usbip/usbip_common.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/usbip/usbip_common.h 2011-08-23 21:47:56.000000000 -0400 @@ -315,7 +315,7 @@ struct usbip_device { void (*shutdown)(struct usbip_device *); void (*reset)(struct usbip_device *); @@ -34774,9 +35136,9 @@ diff -urNp linux-3.0.7/drivers/staging/usbip/usbip_common.h linux-3.0.7/drivers/ }; void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd, -diff -urNp linux-3.0.7/drivers/staging/usbip/vhci.h linux-3.0.7/drivers/staging/usbip/vhci.h ---- linux-3.0.7/drivers/staging/usbip/vhci.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/usbip/vhci.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/usbip/vhci.h linux-3.0.8/drivers/staging/usbip/vhci.h +--- linux-3.0.8/drivers/staging/usbip/vhci.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/usbip/vhci.h 2011-08-23 21:47:56.000000000 -0400 @@ -94,7 +94,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; @@ -34786,9 +35148,9 @@ diff -urNp linux-3.0.7/drivers/staging/usbip/vhci.h linux-3.0.7/drivers/staging/ /* * NOTE: -diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_hcd.c linux-3.0.7/drivers/staging/usbip/vhci_hcd.c ---- linux-3.0.7/drivers/staging/usbip/vhci_hcd.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/staging/usbip/vhci_hcd.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_hcd.c linux-3.0.8/drivers/staging/usbip/vhci_hcd.c +--- linux-3.0.8/drivers/staging/usbip/vhci_hcd.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/staging/usbip/vhci_hcd.c 2011-08-23 21:47:56.000000000 -0400 @@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb) return; } @@ -34816,9 +35178,9 @@ diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_hcd.c linux-3.0.7/drivers/stag spin_lock_init(&vhci->lock); hcd->power_budget = 0; /* no limit */ -diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_rx.c linux-3.0.7/drivers/staging/usbip/vhci_rx.c ---- linux-3.0.7/drivers/staging/usbip/vhci_rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/usbip/vhci_rx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_rx.c linux-3.0.8/drivers/staging/usbip/vhci_rx.c +--- linux-3.0.8/drivers/staging/usbip/vhci_rx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/usbip/vhci_rx.c 2011-08-23 21:47:56.000000000 -0400 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct if (!urb) { pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum); @@ -34828,9 +35190,9 @@ diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_rx.c linux-3.0.7/drivers/stagi usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } -diff -urNp linux-3.0.7/drivers/staging/vt6655/hostap.c linux-3.0.7/drivers/staging/vt6655/hostap.c ---- linux-3.0.7/drivers/staging/vt6655/hostap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/vt6655/hostap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/vt6655/hostap.c linux-3.0.8/drivers/staging/vt6655/hostap.c +--- linux-3.0.8/drivers/staging/vt6655/hostap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/vt6655/hostap.c 2011-08-23 21:47:56.000000000 -0400 @@ -79,14 +79,13 @@ static int msglevel * */ @@ -34857,9 +35219,9 @@ diff -urNp linux-3.0.7/drivers/staging/vt6655/hostap.c linux-3.0.7/drivers/stagi pDevice->apdev->netdev_ops = &apdev_netdev_ops; pDevice->apdev->type = ARPHRD_IEEE80211; -diff -urNp linux-3.0.7/drivers/staging/vt6656/hostap.c linux-3.0.7/drivers/staging/vt6656/hostap.c ---- linux-3.0.7/drivers/staging/vt6656/hostap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/vt6656/hostap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/vt6656/hostap.c linux-3.0.8/drivers/staging/vt6656/hostap.c +--- linux-3.0.8/drivers/staging/vt6656/hostap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/vt6656/hostap.c 2011-08-23 21:47:56.000000000 -0400 @@ -80,14 +80,13 @@ static int msglevel * */ @@ -34886,9 +35248,9 @@ diff -urNp linux-3.0.7/drivers/staging/vt6656/hostap.c linux-3.0.7/drivers/stagi pDevice->apdev->netdev_ops = &apdev_netdev_ops; pDevice->apdev->type = ARPHRD_IEEE80211; -diff -urNp linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c ---- linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c +--- linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 21:47:56.000000000 -0400 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf struct usbctlx_completor { @@ -34898,9 +35260,9 @@ diff -urNp linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.7/drivers static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw, -diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.c linux-3.0.7/drivers/staging/zcache/tmem.c ---- linux-3.0.7/drivers/staging/zcache/tmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/zcache/tmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.c linux-3.0.8/drivers/staging/zcache/tmem.c +--- linux-3.0.8/drivers/staging/zcache/tmem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/zcache/tmem.c 2011-08-23 21:47:56.000000000 -0400 @@ -39,7 +39,7 @@ * A tmem host implementation must use this function to register callbacks * for memory allocation. @@ -34919,9 +35281,9 @@ diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.c linux-3.0.7/drivers/staging void tmem_register_pamops(struct tmem_pamops *m) { -diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.h linux-3.0.7/drivers/staging/zcache/tmem.h ---- linux-3.0.7/drivers/staging/zcache/tmem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/staging/zcache/tmem.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.h linux-3.0.8/drivers/staging/zcache/tmem.h +--- linux-3.0.8/drivers/staging/zcache/tmem.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/staging/zcache/tmem.h 2011-08-23 21:47:56.000000000 -0400 @@ -171,6 +171,7 @@ struct tmem_pamops { int (*get_data)(struct page *, void *, struct tmem_pool *); void (*free)(void *, struct tmem_pool *); @@ -34938,9 +35300,9 @@ diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.h linux-3.0.7/drivers/staging extern void tmem_register_hostops(struct tmem_hostops *m); /* core tmem accessor functions */ -diff -urNp linux-3.0.7/drivers/target/target_core_alua.c linux-3.0.7/drivers/target/target_core_alua.c ---- linux-3.0.7/drivers/target/target_core_alua.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_alua.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_alua.c linux-3.0.8/drivers/target/target_core_alua.c +--- linux-3.0.8/drivers/target/target_core_alua.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_alua.c 2011-08-23 21:48:14.000000000 -0400 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_ char path[ALUA_METADATA_PATH_LEN]; int len; @@ -34959,9 +35321,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_alua.c linux-3.0.7/drivers/tar memset(path, 0, ALUA_METADATA_PATH_LEN); memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN); -diff -urNp linux-3.0.7/drivers/target/target_core_cdb.c linux-3.0.7/drivers/target/target_core_cdb.c ---- linux-3.0.7/drivers/target/target_core_cdb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_cdb.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_cdb.c linux-3.0.8/drivers/target/target_core_cdb.c +--- linux-3.0.8/drivers/target/target_core_cdb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_cdb.c 2011-08-23 21:48:14.000000000 -0400 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd * int length = 0; unsigned char buf[SE_MODE_PAGE_BUF]; @@ -34971,9 +35333,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_cdb.c linux-3.0.7/drivers/targ memset(buf, 0, SE_MODE_PAGE_BUF); switch (cdb[2] & 0x3f) { -diff -urNp linux-3.0.7/drivers/target/target_core_configfs.c linux-3.0.7/drivers/target/target_core_configfs.c ---- linux-3.0.7/drivers/target/target_core_configfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_configfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_configfs.c linux-3.0.8/drivers/target/target_core_configfs.c +--- linux-3.0.8/drivers/target/target_core_configfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_configfs.c 2011-08-23 21:48:14.000000000 -0400 @@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a ssize_t len = 0; int reg_count = 0, prf_isid; @@ -34983,9 +35345,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_configfs.c linux-3.0.7/drivers if (!(su_dev->se_dev_ptr)) return -ENODEV; -diff -urNp linux-3.0.7/drivers/target/target_core_pr.c linux-3.0.7/drivers/target/target_core_pr.c ---- linux-3.0.7/drivers/target/target_core_pr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_pr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_pr.c linux-3.0.8/drivers/target/target_core_pr.c +--- linux-3.0.8/drivers/target/target_core_pr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_pr.c 2011-08-23 21:48:14.000000000 -0400 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi unsigned char t_port[PR_APTPL_MAX_TPORT_LEN]; u16 tpgt; @@ -35013,9 +35375,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_pr.c linux-3.0.7/drivers/targe memset(iov, 0, sizeof(struct iovec)); memset(path, 0, 512); -diff -urNp linux-3.0.7/drivers/target/target_core_tmr.c linux-3.0.7/drivers/target/target_core_tmr.c ---- linux-3.0.7/drivers/target/target_core_tmr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_tmr.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_tmr.c linux-3.0.8/drivers/target/target_core_tmr.c +--- linux-3.0.8/drivers/target/target_core_tmr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_tmr.c 2011-08-23 21:47:56.000000000 -0400 @@ -269,7 +269,7 @@ int core_tmr_lun_reset( CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key, T_TASK(cmd)->t_task_cdbs, @@ -35043,9 +35405,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_tmr.c linux-3.0.7/drivers/targ spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); -diff -urNp linux-3.0.7/drivers/target/target_core_transport.c linux-3.0.7/drivers/target/target_core_transport.c ---- linux-3.0.7/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/target/target_core_transport.c linux-3.0.8/drivers/target/target_core_transport.c +--- linux-3.0.8/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t dev->queue_depth = dev_limits->queue_depth; @@ -35121,9 +35483,9 @@ diff -urNp linux-3.0.7/drivers/target/target_core_transport.c linux-3.0.7/driver atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -diff -urNp linux-3.0.7/drivers/telephony/ixj.c linux-3.0.7/drivers/telephony/ixj.c ---- linux-3.0.7/drivers/telephony/ixj.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/telephony/ixj.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/telephony/ixj.c linux-3.0.8/drivers/telephony/ixj.c +--- linux-3.0.8/drivers/telephony/ixj.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/telephony/ixj.c 2011-08-23 21:48:14.000000000 -0400 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; @@ -35133,9 +35495,9 @@ diff -urNp linux-3.0.7/drivers/telephony/ixj.c linux-3.0.7/drivers/telephony/ixj if (!SCI_Prepare(j)) return 0; -diff -urNp linux-3.0.7/drivers/tty/hvc/hvcs.c linux-3.0.7/drivers/tty/hvc/hvcs.c ---- linux-3.0.7/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/hvc/hvcs.c linux-3.0.8/drivers/tty/hvc/hvcs.c +--- linux-3.0.8/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400 @@ -83,6 +83,7 @@ #include <asm/hvcserver.h> #include <asm/uaccess.h> @@ -35238,9 +35600,9 @@ diff -urNp linux-3.0.7/drivers/tty/hvc/hvcs.c linux-3.0.7/drivers/tty/hvc/hvcs.c return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-3.0.7/drivers/tty/ipwireless/tty.c linux-3.0.7/drivers/tty/ipwireless/tty.c ---- linux-3.0.7/drivers/tty/ipwireless/tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/ipwireless/tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/ipwireless/tty.c linux-3.0.8/drivers/tty/ipwireless/tty.c +--- linux-3.0.8/drivers/tty/ipwireless/tty.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/ipwireless/tty.c 2011-08-23 21:47:56.000000000 -0400 @@ -29,6 +29,7 @@ #include <linux/tty_driver.h> #include <linux/tty_flip.h> @@ -35363,9 +35725,9 @@ diff -urNp linux-3.0.7/drivers/tty/ipwireless/tty.c linux-3.0.7/drivers/tty/ipwi do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-3.0.7/drivers/tty/n_gsm.c linux-3.0.7/drivers/tty/n_gsm.c ---- linux-3.0.7/drivers/tty/n_gsm.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/drivers/tty/n_gsm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/n_gsm.c linux-3.0.8/drivers/tty/n_gsm.c +--- linux-3.0.8/drivers/tty/n_gsm.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/drivers/tty/n_gsm.c 2011-08-23 21:47:56.000000000 -0400 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s return NULL; spin_lock_init(&dlci->lock); @@ -35375,9 +35737,9 @@ diff -urNp linux-3.0.7/drivers/tty/n_gsm.c linux-3.0.7/drivers/tty/n_gsm.c kfree(dlci); return NULL; } -diff -urNp linux-3.0.7/drivers/tty/n_tty.c linux-3.0.7/drivers/tty/n_tty.c ---- linux-3.0.7/drivers/tty/n_tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/n_tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/n_tty.c linux-3.0.8/drivers/tty/n_tty.c +--- linux-3.0.8/drivers/tty/n_tty.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/n_tty.c 2011-08-23 21:47:56.000000000 -0400 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ { *ops = tty_ldisc_N_TTY; @@ -35387,9 +35749,9 @@ diff -urNp linux-3.0.7/drivers/tty/n_tty.c linux-3.0.7/drivers/tty/n_tty.c + ops->flags = 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); -diff -urNp linux-3.0.7/drivers/tty/pty.c linux-3.0.7/drivers/tty/pty.c ---- linux-3.0.7/drivers/tty/pty.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/tty/pty.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/pty.c linux-3.0.8/drivers/tty/pty.c +--- linux-3.0.8/drivers/tty/pty.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/tty/pty.c 2011-10-16 21:55:28.000000000 -0400 @@ -767,8 +767,10 @@ static void __init unix98_pty_init(void) register_sysctl_table(pty_root_table); @@ -35402,9 +35764,9 @@ diff -urNp linux-3.0.7/drivers/tty/pty.c linux-3.0.7/drivers/tty/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || -diff -urNp linux-3.0.7/drivers/tty/rocket.c linux-3.0.7/drivers/tty/rocket.c ---- linux-3.0.7/drivers/tty/rocket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/rocket.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/rocket.c linux-3.0.8/drivers/tty/rocket.c +--- linux-3.0.8/drivers/tty/rocket.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/rocket.c 2011-08-23 21:48:14.000000000 -0400 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info struct rocket_ports tmp; int board; @@ -35414,9 +35776,9 @@ diff -urNp linux-3.0.7/drivers/tty/rocket.c linux-3.0.7/drivers/tty/rocket.c if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); -diff -urNp linux-3.0.7/drivers/tty/serial/kgdboc.c linux-3.0.7/drivers/tty/serial/kgdboc.c ---- linux-3.0.7/drivers/tty/serial/kgdboc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/serial/kgdboc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/serial/kgdboc.c linux-3.0.8/drivers/tty/serial/kgdboc.c +--- linux-3.0.8/drivers/tty/serial/kgdboc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/serial/kgdboc.c 2011-08-23 21:47:56.000000000 -0400 @@ -23,8 +23,9 @@ #define MAX_CONFIG_LEN 40 @@ -35515,9 +35877,9 @@ diff -urNp linux-3.0.7/drivers/tty/serial/kgdboc.c linux-3.0.7/drivers/tty/seria #ifdef CONFIG_KGDB_SERIAL_CONSOLE /* This is only available if kgdboc is a built in for early debugging */ static int __init kgdboc_early_init(char *opt) -diff -urNp linux-3.0.7/drivers/tty/serial/mfd.c linux-3.0.7/drivers/tty/serial/mfd.c ---- linux-3.0.7/drivers/tty/serial/mfd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/serial/mfd.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/serial/mfd.c linux-3.0.8/drivers/tty/serial/mfd.c +--- linux-3.0.8/drivers/tty/serial/mfd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/serial/mfd.c 2011-10-11 10:44:33.000000000 -0400 @@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci } @@ -35527,9 +35889,9 @@ diff -urNp linux-3.0.7/drivers/tty/serial/mfd.c linux-3.0.7/drivers/tty/serial/m { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) }, -diff -urNp linux-3.0.7/drivers/tty/serial/mrst_max3110.c linux-3.0.7/drivers/tty/serial/mrst_max3110.c ---- linux-3.0.7/drivers/tty/serial/mrst_max3110.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/tty/serial/mrst_max3110.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/serial/mrst_max3110.c linux-3.0.8/drivers/tty/serial/mrst_max3110.c +--- linux-3.0.8/drivers/tty/serial/mrst_max3110.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/tty/serial/mrst_max3110.c 2011-10-16 21:55:28.000000000 -0400 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u int loop = 1, num, total = 0; u8 recv_buf[512], *pbuf; @@ -35539,9 +35901,9 @@ diff -urNp linux-3.0.7/drivers/tty/serial/mrst_max3110.c linux-3.0.7/drivers/tty pbuf = recv_buf; do { num = max3110_read_multi(max, pbuf); -diff -urNp linux-3.0.7/drivers/tty/tty_io.c linux-3.0.7/drivers/tty/tty_io.c ---- linux-3.0.7/drivers/tty/tty_io.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/drivers/tty/tty_io.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/tty_io.c linux-3.0.8/drivers/tty/tty_io.c +--- linux-3.0.8/drivers/tty/tty_io.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/drivers/tty/tty_io.c 2011-10-16 21:55:28.000000000 -0400 @@ -3214,7 +3214,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); void tty_default_fops(struct file_operations *fops) @@ -35551,9 +35913,9 @@ diff -urNp linux-3.0.7/drivers/tty/tty_io.c linux-3.0.7/drivers/tty/tty_io.c } /* -diff -urNp linux-3.0.7/drivers/tty/tty_ldisc.c linux-3.0.7/drivers/tty/tty_ldisc.c ---- linux-3.0.7/drivers/tty/tty_ldisc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/tty_ldisc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/tty_ldisc.c linux-3.0.8/drivers/tty/tty_ldisc.c +--- linux-3.0.8/drivers/tty/tty_ldisc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/tty_ldisc.c 2011-08-23 21:47:56.000000000 -0400 @@ -74,7 +74,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; @@ -35599,9 +35961,9 @@ diff -urNp linux-3.0.7/drivers/tty/tty_ldisc.c linux-3.0.7/drivers/tty/tty_ldisc module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-3.0.7/drivers/tty/vt/keyboard.c linux-3.0.7/drivers/tty/vt/keyboard.c ---- linux-3.0.7/drivers/tty/vt/keyboard.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/vt/keyboard.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/vt/keyboard.c linux-3.0.8/drivers/tty/vt/keyboard.c +--- linux-3.0.8/drivers/tty/vt/keyboard.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/vt/keyboard.c 2011-08-23 21:48:14.000000000 -0400 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_OFF) && value != KVAL(K_SAK)) @@ -35619,9 +35981,9 @@ diff -urNp linux-3.0.7/drivers/tty/vt/keyboard.c linux-3.0.7/drivers/tty/vt/keyb fn_handler[value](vc); } -diff -urNp linux-3.0.7/drivers/tty/vt/vt.c linux-3.0.7/drivers/tty/vt/vt.c ---- linux-3.0.7/drivers/tty/vt/vt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/vt/vt.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/vt/vt.c linux-3.0.8/drivers/tty/vt/vt.c +--- linux-3.0.8/drivers/tty/vt/vt.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/vt/vt.c 2011-08-23 21:47:56.000000000 -0400 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -35631,9 +35993,9 @@ diff -urNp linux-3.0.7/drivers/tty/vt/vt.c linux-3.0.7/drivers/tty/vt/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } -diff -urNp linux-3.0.7/drivers/tty/vt/vt_ioctl.c linux-3.0.7/drivers/tty/vt/vt_ioctl.c ---- linux-3.0.7/drivers/tty/vt/vt_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/tty/vt/vt_ioctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/tty/vt/vt_ioctl.c linux-3.0.8/drivers/tty/vt/vt_ioctl.c +--- linux-3.0.8/drivers/tty/vt/vt_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/tty/vt/vt_ioctl.c 2011-08-23 21:48:14.000000000 -0400 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -35674,9 +36036,9 @@ diff -urNp linux-3.0.7/drivers/tty/vt/vt_ioctl.c linux-3.0.7/drivers/tty/vt/vt_i if (!perm) { ret = -EPERM; goto reterr; -diff -urNp linux-3.0.7/drivers/uio/uio.c linux-3.0.7/drivers/uio/uio.c ---- linux-3.0.7/drivers/uio/uio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/uio/uio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/uio/uio.c linux-3.0.8/drivers/uio/uio.c +--- linux-3.0.8/drivers/uio/uio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/uio/uio.c 2011-08-23 21:47:56.000000000 -0400 @@ -25,6 +25,7 @@ #include <linux/kobject.h> #include <linux/cdev.h> @@ -35768,9 +36130,9 @@ diff -urNp linux-3.0.7/drivers/uio/uio.c linux-3.0.7/drivers/uio/uio.c ret = uio_get_minor(idev); if (ret) -diff -urNp linux-3.0.7/drivers/usb/atm/cxacru.c linux-3.0.7/drivers/usb/atm/cxacru.c ---- linux-3.0.7/drivers/usb/atm/cxacru.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/atm/cxacru.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/atm/cxacru.c linux-3.0.8/drivers/usb/atm/cxacru.c +--- linux-3.0.8/drivers/usb/atm/cxacru.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/atm/cxacru.c 2011-08-23 21:47:56.000000000 -0400 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp); if (ret < 2) @@ -35780,9 +36142,9 @@ diff -urNp linux-3.0.7/drivers/usb/atm/cxacru.c linux-3.0.7/drivers/usb/atm/cxac return -EINVAL; pos += tmp; -diff -urNp linux-3.0.7/drivers/usb/atm/usbatm.c linux-3.0.7/drivers/usb/atm/usbatm.c ---- linux-3.0.7/drivers/usb/atm/usbatm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/atm/usbatm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/atm/usbatm.c linux-3.0.8/drivers/usb/atm/usbatm.c +--- linux-3.0.8/drivers/usb/atm/usbatm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/atm/usbatm.c 2011-08-23 21:47:56.000000000 -0400 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -35862,9 +36224,9 @@ diff -urNp linux-3.0.7/drivers/usb/atm/usbatm.c linux-3.0.7/drivers/usb/atm/usba if (!left--) { if (instance->disconnected) -diff -urNp linux-3.0.7/drivers/usb/core/devices.c linux-3.0.7/drivers/usb/core/devices.c ---- linux-3.0.7/drivers/usb/core/devices.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/core/devices.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/core/devices.c linux-3.0.8/drivers/usb/core/devices.c +--- linux-3.0.8/drivers/usb/core/devices.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/core/devices.c 2011-08-23 21:47:56.000000000 -0400 @@ -126,7 +126,7 @@ static const char format_endpt[] = * time it gets called. */ @@ -35892,9 +36254,9 @@ diff -urNp linux-3.0.7/drivers/usb/core/devices.c linux-3.0.7/drivers/usb/core/d if (file->f_version != event_count) { file->f_version = event_count; return POLLIN | POLLRDNORM; -diff -urNp linux-3.0.7/drivers/usb/core/message.c linux-3.0.7/drivers/usb/core/message.c ---- linux-3.0.7/drivers/usb/core/message.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/core/message.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/core/message.c linux-3.0.8/drivers/usb/core/message.c +--- linux-3.0.8/drivers/usb/core/message.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/core/message.c 2011-08-23 21:47:56.000000000 -0400 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -35906,9 +36268,9 @@ diff -urNp linux-3.0.7/drivers/usb/core/message.c linux-3.0.7/drivers/usb/core/m if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-3.0.7/drivers/usb/early/ehci-dbgp.c linux-3.0.7/drivers/usb/early/ehci-dbgp.c ---- linux-3.0.7/drivers/usb/early/ehci-dbgp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/early/ehci-dbgp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/early/ehci-dbgp.c linux-3.0.8/drivers/usb/early/ehci-dbgp.c +--- linux-3.0.8/drivers/usb/early/ehci-dbgp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/early/ehci-dbgp.c 2011-08-23 21:47:56.000000000 -0400 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, #ifdef CONFIG_KGDB @@ -35946,9 +36308,9 @@ diff -urNp linux-3.0.7/drivers/usb/early/ehci-dbgp.c linux-3.0.7/drivers/usb/ear return 0; } -diff -urNp linux-3.0.7/drivers/usb/host/xhci-mem.c linux-3.0.7/drivers/usb/host/xhci-mem.c ---- linux-3.0.7/drivers/usb/host/xhci-mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/host/xhci-mem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/host/xhci-mem.c linux-3.0.8/drivers/usb/host/xhci-mem.c +--- linux-3.0.8/drivers/usb/host/xhci-mem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/host/xhci-mem.c 2011-08-23 21:48:14.000000000 -0400 @@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str unsigned int num_tests; int i, ret; @@ -35958,9 +36320,9 @@ diff -urNp linux-3.0.7/drivers/usb/host/xhci-mem.c linux-3.0.7/drivers/usb/host/ num_tests = ARRAY_SIZE(simple_test_vector); for (i = 0; i < num_tests; i++) { ret = xhci_test_trb_in_td(xhci, -diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-hc.h linux-3.0.7/drivers/usb/wusbcore/wa-hc.h ---- linux-3.0.7/drivers/usb/wusbcore/wa-hc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/wusbcore/wa-hc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-hc.h linux-3.0.8/drivers/usb/wusbcore/wa-hc.h +--- linux-3.0.8/drivers/usb/wusbcore/wa-hc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/wusbcore/wa-hc.h 2011-08-23 21:47:56.000000000 -0400 @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; @@ -35979,9 +36341,9 @@ diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-hc.h linux-3.0.7/drivers/usb/wusb } /** -diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c ---- linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c +--- linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400 @@ -294,7 +294,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) @@ -35991,9 +36353,9 @@ diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c linux-3.0.7/drivers/usb/wu } /* -diff -urNp linux-3.0.7/drivers/vhost/vhost.c linux-3.0.7/drivers/vhost/vhost.c ---- linux-3.0.7/drivers/vhost/vhost.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/vhost/vhost.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/vhost/vhost.c linux-3.0.8/drivers/vhost/vhost.c +--- linux-3.0.8/drivers/vhost/vhost.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/vhost/vhost.c 2011-08-23 21:47:56.000000000 -0400 @@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu return get_user(vq->last_used_idx, &used->idx); } @@ -36003,9 +36365,9 @@ diff -urNp linux-3.0.7/drivers/vhost/vhost.c linux-3.0.7/drivers/vhost/vhost.c { struct file *eventfp, *filep = NULL, *pollstart = NULL, *pollstop = NULL; -diff -urNp linux-3.0.7/drivers/video/aty/aty128fb.c linux-3.0.7/drivers/video/aty/aty128fb.c ---- linux-3.0.7/drivers/video/aty/aty128fb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/aty/aty128fb.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/aty/aty128fb.c linux-3.0.8/drivers/video/aty/aty128fb.c +--- linux-3.0.8/drivers/video/aty/aty128fb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/aty/aty128fb.c 2011-10-11 10:44:33.000000000 -0400 @@ -148,7 +148,7 @@ enum { }; @@ -36015,9 +36377,9 @@ diff -urNp linux-3.0.7/drivers/video/aty/aty128fb.c linux-3.0.7/drivers/video/at "AGP", "PCI", "PRO AGP", -diff -urNp linux-3.0.7/drivers/video/fbcmap.c linux-3.0.7/drivers/video/fbcmap.c ---- linux-3.0.7/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/fbcmap.c linux-3.0.8/drivers/video/fbcmap.c +--- linux-3.0.8/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -36028,9 +36390,9 @@ diff -urNp linux-3.0.7/drivers/video/fbcmap.c linux-3.0.7/drivers/video/fbcmap.c rc = -EINVAL; goto out1; } -diff -urNp linux-3.0.7/drivers/video/fbmem.c linux-3.0.7/drivers/video/fbmem.c ---- linux-3.0.7/drivers/video/fbmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/fbmem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/fbmem.c linux-3.0.8/drivers/video/fbmem.c +--- linux-3.0.8/drivers/video/fbmem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/fbmem.c 2011-08-23 21:48:14.000000000 -0400 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -36076,9 +36438,9 @@ diff -urNp linux-3.0.7/drivers/video/fbmem.c linux-3.0.7/drivers/video/fbmem.c return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-3.0.7/drivers/video/geode/gx1fb_core.c linux-3.0.7/drivers/video/geode/gx1fb_core.c ---- linux-3.0.7/drivers/video/geode/gx1fb_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/geode/gx1fb_core.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/geode/gx1fb_core.c linux-3.0.8/drivers/video/geode/gx1fb_core.c +--- linux-3.0.8/drivers/video/geode/gx1fb_core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/geode/gx1fb_core.c 2011-10-11 10:44:33.000000000 -0400 @@ -29,7 +29,7 @@ static int crt_option = 1; static char panel_option[32] = ""; @@ -36088,9 +36450,9 @@ diff -urNp linux-3.0.7/drivers/video/geode/gx1fb_core.c linux-3.0.7/drivers/vide /* 640x480-60 VESA */ { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, -diff -urNp linux-3.0.7/drivers/video/gxt4500.c linux-3.0.7/drivers/video/gxt4500.c ---- linux-3.0.7/drivers/video/gxt4500.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/gxt4500.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/gxt4500.c linux-3.0.8/drivers/video/gxt4500.c +--- linux-3.0.8/drivers/video/gxt4500.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/gxt4500.c 2011-10-11 10:44:33.000000000 -0400 @@ -156,7 +156,7 @@ struct gxt4500_par { static char *mode_option; @@ -36109,9 +36471,9 @@ diff -urNp linux-3.0.7/drivers/video/gxt4500.c linux-3.0.7/drivers/video/gxt4500 .id = "IBM GXT4500P", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_PSEUDOCOLOR, -diff -urNp linux-3.0.7/drivers/video/i810/i810_accel.c linux-3.0.7/drivers/video/i810/i810_accel.c ---- linux-3.0.7/drivers/video/i810/i810_accel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/i810/i810_accel.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/i810/i810_accel.c linux-3.0.8/drivers/video/i810/i810_accel.c +--- linux-3.0.8/drivers/video/i810/i810_accel.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/i810/i810_accel.c 2011-08-23 21:47:56.000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -36120,9 +36482,9 @@ diff -urNp linux-3.0.7/drivers/video/i810/i810_accel.c linux-3.0.7/drivers/video i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-3.0.7/drivers/video/i810/i810_main.c linux-3.0.7/drivers/video/i810/i810_main.c ---- linux-3.0.7/drivers/video/i810/i810_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/i810/i810_main.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/i810/i810_main.c linux-3.0.8/drivers/video/i810/i810_main.c +--- linux-3.0.8/drivers/video/i810/i810_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/i810/i810_main.c 2011-10-11 10:44:33.000000000 -0400 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_ static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par); @@ -36132,9 +36494,9 @@ diff -urNp linux-3.0.7/drivers/video/i810/i810_main.c linux-3.0.7/drivers/video/ "Intel(R) 810 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810E Framebuffer Device" , -diff -urNp linux-3.0.7/drivers/video/jz4740_fb.c linux-3.0.7/drivers/video/jz4740_fb.c ---- linux-3.0.7/drivers/video/jz4740_fb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/jz4740_fb.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/jz4740_fb.c linux-3.0.8/drivers/video/jz4740_fb.c +--- linux-3.0.8/drivers/video/jz4740_fb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/jz4740_fb.c 2011-10-11 10:44:33.000000000 -0400 @@ -136,7 +136,7 @@ struct jzfb { uint32_t pseudo_palette[16]; }; @@ -36144,9 +36506,9 @@ diff -urNp linux-3.0.7/drivers/video/jz4740_fb.c linux-3.0.7/drivers/video/jz474 .id = "JZ4740 FB", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, -diff -urNp linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm 2011-08-29 23:49:40.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm 2011-08-29 23:49:40.000000000 -0400 @@ -1,1604 +1,1123 @@ P3 -# Standard 224-color Linux logo @@ -38872,9 +39234,9 @@ diff -urNp linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.7/dri +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 -diff -urNp linux-3.0.7/drivers/video/udlfb.c linux-3.0.7/drivers/video/udlfb.c ---- linux-3.0.7/drivers/video/udlfb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/udlfb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/udlfb.c linux-3.0.8/drivers/video/udlfb.c +--- linux-3.0.8/drivers/video/udlfb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/udlfb.c 2011-08-23 21:47:56.000000000 -0400 @@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data dlfb_urb_completion(urb); @@ -38958,9 +39320,9 @@ diff -urNp linux-3.0.7/drivers/video/udlfb.c linux-3.0.7/drivers/video/udlfb.c return count; } -diff -urNp linux-3.0.7/drivers/video/uvesafb.c linux-3.0.7/drivers/video/uvesafb.c ---- linux-3.0.7/drivers/video/uvesafb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/uvesafb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/uvesafb.c linux-3.0.8/drivers/video/uvesafb.c +--- linux-3.0.8/drivers/video/uvesafb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/uvesafb.c 2011-08-23 21:47:56.000000000 -0400 @@ -19,6 +19,7 @@ #include <linux/io.h> #include <linux/mutex.h> @@ -39036,9 +39398,9 @@ diff -urNp linux-3.0.7/drivers/video/uvesafb.c linux-3.0.7/drivers/video/uvesafb } framebuffer_release(info); -diff -urNp linux-3.0.7/drivers/video/vesafb.c linux-3.0.7/drivers/video/vesafb.c ---- linux-3.0.7/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/vesafb.c linux-3.0.8/drivers/video/vesafb.c +--- linux-3.0.8/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400 @@ -9,6 +9,7 @@ */ @@ -39141,9 +39503,9 @@ diff -urNp linux-3.0.7/drivers/video/vesafb.c linux-3.0.7/drivers/video/vesafb.c if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-3.0.7/drivers/video/via/via_clock.h linux-3.0.7/drivers/video/via/via_clock.h ---- linux-3.0.7/drivers/video/via/via_clock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/video/via/via_clock.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/drivers/video/via/via_clock.h linux-3.0.8/drivers/video/via/via_clock.h +--- linux-3.0.8/drivers/video/via/via_clock.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/video/via/via_clock.h 2011-08-23 21:47:56.000000000 -0400 @@ -56,7 +56,7 @@ struct via_clock { void (*set_engine_pll_state)(u8 state); @@ -39153,9 +39515,9 @@ diff -urNp linux-3.0.7/drivers/video/via/via_clock.h linux-3.0.7/drivers/video/v static inline u32 get_pll_internal_frequency(u32 ref_freq, -diff -urNp linux-3.0.7/drivers/virtio/virtio_balloon.c linux-3.0.7/drivers/virtio/virtio_balloon.c ---- linux-3.0.7/drivers/virtio/virtio_balloon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/drivers/virtio/virtio_balloon.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/drivers/virtio/virtio_balloon.c linux-3.0.8/drivers/virtio/virtio_balloon.c +--- linux-3.0.8/drivers/virtio/virtio_balloon.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/drivers/virtio/virtio_balloon.c 2011-08-23 21:48:14.000000000 -0400 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct struct sysinfo i; int idx = 0; @@ -39165,9 +39527,9 @@ diff -urNp linux-3.0.7/drivers/virtio/virtio_balloon.c linux-3.0.7/drivers/virti all_vm_events(events); si_meminfo(&i); -diff -urNp linux-3.0.7/fs/9p/vfs_inode.c linux-3.0.7/fs/9p/vfs_inode.c ---- linux-3.0.7/fs/9p/vfs_inode.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/fs/9p/vfs_inode.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/fs/9p/vfs_inode.c linux-3.0.8/fs/9p/vfs_inode.c +--- linux-3.0.8/fs/9p/vfs_inode.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/fs/9p/vfs_inode.c 2011-10-16 21:55:28.000000000 -0400 @@ -1264,7 +1264,7 @@ static void *v9fs_vfs_follow_link(struct void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -39177,21 +39539,9 @@ diff -urNp linux-3.0.7/fs/9p/vfs_inode.c linux-3.0.7/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-3.0.7/fs/Kconfig.binfmt linux-3.0.7/fs/Kconfig.binfmt ---- linux-3.0.7/fs/Kconfig.binfmt 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/Kconfig.binfmt 2011-08-23 21:47:56.000000000 -0400 -@@ -86,7 +86,7 @@ config HAVE_AOUT - - config BINFMT_AOUT - tristate "Kernel support for a.out and ECOFF binaries" -- depends on HAVE_AOUT -+ depends on HAVE_AOUT && BROKEN - ---help--- - A.out (Assembler.OUTput) is a set of formats for libraries and - executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-3.0.7/fs/aio.c linux-3.0.7/fs/aio.c ---- linux-3.0.7/fs/aio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/aio.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/aio.c linux-3.0.8/fs/aio.c +--- linux-3.0.8/fs/aio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/aio.c 2011-08-23 21:48:14.000000000 -0400 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -39240,9 +39590,9 @@ diff -urNp linux-3.0.7/fs/aio.c linux-3.0.7/fs/aio.c kiocb->ki_nr_segs = kiocb->ki_nbytes; kiocb->ki_cur_seg = 0; /* ki_nbytes/left now reflect bytes instead of segs */ -diff -urNp linux-3.0.7/fs/attr.c linux-3.0.7/fs/attr.c ---- linux-3.0.7/fs/attr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/attr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/attr.c linux-3.0.8/fs/attr.c +--- linux-3.0.8/fs/attr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/attr.c 2011-08-23 21:48:14.000000000 -0400 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -39251,9 +39601,9 @@ diff -urNp linux-3.0.7/fs/attr.c linux-3.0.7/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-3.0.7/fs/autofs4/waitq.c linux-3.0.7/fs/autofs4/waitq.c ---- linux-3.0.7/fs/autofs4/waitq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/autofs4/waitq.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/autofs4/waitq.c linux-3.0.8/fs/autofs4/waitq.c +--- linux-3.0.8/fs/autofs4/waitq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/autofs4/waitq.c 2011-10-06 04:17:55.000000000 -0400 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi { unsigned long sigpipe, flags; @@ -39263,9 +39613,9 @@ diff -urNp linux-3.0.7/fs/autofs4/waitq.c linux-3.0.7/fs/autofs4/waitq.c ssize_t wr = 0; /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/ -diff -urNp linux-3.0.7/fs/befs/linuxvfs.c linux-3.0.7/fs/befs/linuxvfs.c ---- linux-3.0.7/fs/befs/linuxvfs.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/fs/befs/linuxvfs.c 2011-08-29 23:26:27.000000000 -0400 +diff -urNp linux-3.0.8/fs/befs/linuxvfs.c linux-3.0.8/fs/befs/linuxvfs.c +--- linux-3.0.8/fs/befs/linuxvfs.c 2011-10-24 08:05:23.000000000 -0400 ++++ linux-3.0.8/fs/befs/linuxvfs.c 2011-08-29 23:26:27.000000000 -0400 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -39275,9 +39625,9 @@ diff -urNp linux-3.0.7/fs/befs/linuxvfs.c linux-3.0.7/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-3.0.7/fs/binfmt_aout.c linux-3.0.7/fs/binfmt_aout.c ---- linux-3.0.7/fs/binfmt_aout.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/binfmt_aout.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/binfmt_aout.c linux-3.0.8/fs/binfmt_aout.c +--- linux-3.0.8/fs/binfmt_aout.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/binfmt_aout.c 2011-08-23 21:48:14.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -39354,9 +39704,9 @@ diff -urNp linux-3.0.7/fs/binfmt_aout.c linux-3.0.7/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-3.0.7/fs/binfmt_elf.c linux-3.0.7/fs/binfmt_elf.c ---- linux-3.0.7/fs/binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/binfmt_elf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c +--- linux-3.0.8/fs/binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/binfmt_elf.c 2011-08-23 21:48:14.000000000 -0400 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump #define elf_core_dump NULL #endif @@ -40060,9 +40410,9 @@ diff -urNp linux-3.0.7/fs/binfmt_elf.c linux-3.0.7/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-3.0.7/fs/binfmt_flat.c linux-3.0.7/fs/binfmt_flat.c ---- linux-3.0.7/fs/binfmt_flat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/binfmt_flat.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/binfmt_flat.c linux-3.0.8/fs/binfmt_flat.c +--- linux-3.0.8/fs/binfmt_flat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/binfmt_flat.c 2011-08-23 21:47:56.000000000 -0400 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -40095,9 +40445,9 @@ diff -urNp linux-3.0.7/fs/binfmt_flat.c linux-3.0.7/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-3.0.7/fs/bio.c linux-3.0.7/fs/bio.c ---- linux-3.0.7/fs/bio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/bio.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/bio.c linux-3.0.8/fs/bio.c +--- linux-3.0.8/fs/bio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/bio.c 2011-10-06 04:17:55.000000000 -0400 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b const int read = bio_data_dir(bio) == READ; struct bio_map_data *bmd = bio->bi_private; @@ -40107,9 +40457,9 @@ diff -urNp linux-3.0.7/fs/bio.c linux-3.0.7/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-3.0.7/fs/block_dev.c linux-3.0.7/fs/block_dev.c ---- linux-3.0.7/fs/block_dev.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/fs/block_dev.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/fs/block_dev.c linux-3.0.8/fs/block_dev.c +--- linux-3.0.8/fs/block_dev.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/fs/block_dev.c 2011-10-16 21:55:28.000000000 -0400 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de else if (bdev->bd_contains == bdev) return true; /* is a whole device which isn't held */ @@ -40119,9 +40469,9 @@ diff -urNp linux-3.0.7/fs/block_dev.c linux-3.0.7/fs/block_dev.c return true; /* is a partition of a device that is being partitioned */ else if (whole->bd_holder != NULL) return false; /* is a partition of a held device */ -diff -urNp linux-3.0.7/fs/btrfs/ctree.c linux-3.0.7/fs/btrfs/ctree.c ---- linux-3.0.7/fs/btrfs/ctree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/btrfs/ctree.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/btrfs/ctree.c linux-3.0.8/fs/btrfs/ctree.c +--- linux-3.0.8/fs/btrfs/ctree.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/btrfs/ctree.c 2011-08-23 21:47:56.000000000 -0400 @@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -40138,9 +40488,9 @@ diff -urNp linux-3.0.7/fs/btrfs/ctree.c linux-3.0.7/fs/btrfs/ctree.c parent_start = 0; WARN_ON(trans->transid != btrfs_header_generation(parent)); -diff -urNp linux-3.0.7/fs/btrfs/inode.c linux-3.0.7/fs/btrfs/inode.c ---- linux-3.0.7/fs/btrfs/inode.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/fs/btrfs/inode.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/fs/btrfs/inode.c linux-3.0.8/fs/btrfs/inode.c +--- linux-3.0.8/fs/btrfs/inode.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/fs/btrfs/inode.c 2011-10-16 21:55:28.000000000 -0400 @@ -6896,7 +6896,7 @@ fail: return -ENOMEM; } @@ -40165,9 +40515,9 @@ diff -urNp linux-3.0.7/fs/btrfs/inode.c linux-3.0.7/fs/btrfs/inode.c /* * If a file is moved, it will inherit the cow and compression flags of the new * directory. -diff -urNp linux-3.0.7/fs/btrfs/ioctl.c linux-3.0.7/fs/btrfs/ioctl.c ---- linux-3.0.7/fs/btrfs/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/btrfs/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/btrfs/ioctl.c linux-3.0.8/fs/btrfs/ioctl.c +--- linux-3.0.8/fs/btrfs/ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/btrfs/ioctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs for (i = 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -40198,9 +40548,9 @@ diff -urNp linux-3.0.7/fs/btrfs/ioctl.c linux-3.0.7/fs/btrfs/ioctl.c (arg + sizeof(struct btrfs_ioctl_space_args)); if (copy_to_user(user_dest, dest_orig, alloc_size)) -diff -urNp linux-3.0.7/fs/btrfs/relocation.c linux-3.0.7/fs/btrfs/relocation.c ---- linux-3.0.7/fs/btrfs/relocation.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/btrfs/relocation.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/btrfs/relocation.c linux-3.0.8/fs/btrfs/relocation.c +--- linux-3.0.8/fs/btrfs/relocation.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/btrfs/relocation.c 2011-08-23 21:47:56.000000000 -0400 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -40210,9 +40560,9 @@ diff -urNp linux-3.0.7/fs/btrfs/relocation.c linux-3.0.7/fs/btrfs/relocation.c if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-3.0.7/fs/cachefiles/bind.c linux-3.0.7/fs/cachefiles/bind.c ---- linux-3.0.7/fs/cachefiles/bind.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/bind.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/bind.c linux-3.0.8/fs/cachefiles/bind.c +--- linux-3.0.8/fs/cachefiles/bind.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/bind.c 2011-08-23 21:47:56.000000000 -0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -40229,9 +40579,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/bind.c linux-3.0.7/fs/cachefiles/bind.c cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-3.0.7/fs/cachefiles/daemon.c linux-3.0.7/fs/cachefiles/daemon.c ---- linux-3.0.7/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/daemon.c linux-3.0.8/fs/cachefiles/daemon.c +--- linux-3.0.8/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st if (n > buflen) return -EMSGSIZE; @@ -40268,9 +40618,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/daemon.c linux-3.0.7/fs/cachefiles/daemon.c return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-3.0.7/fs/cachefiles/internal.h linux-3.0.7/fs/cachefiles/internal.h ---- linux-3.0.7/fs/cachefiles/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/internal.h linux-3.0.8/fs/cachefiles/internal.h +--- linux-3.0.8/fs/cachefiles/internal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/internal.h 2011-08-23 21:47:56.000000000 -0400 @@ -57,7 +57,7 @@ struct cachefiles_cache { wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */ struct rb_root active_nodes; /* active nodes (can't be culled) */ @@ -40305,9 +40655,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/internal.h linux-3.0.7/fs/cachefiles/intern } #else -diff -urNp linux-3.0.7/fs/cachefiles/namei.c linux-3.0.7/fs/cachefiles/namei.c ---- linux-3.0.7/fs/cachefiles/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/namei.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/namei.c linux-3.0.8/fs/cachefiles/namei.c +--- linux-3.0.8/fs/cachefiles/namei.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/namei.c 2011-08-23 21:47:56.000000000 -0400 @@ -318,7 +318,7 @@ try_again: /* first step is to make up a grave dentry in the graveyard */ sprintf(nbuffer, "%08x%08x", @@ -40317,9 +40667,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/namei.c linux-3.0.7/fs/cachefiles/namei.c /* do the multiway lock magic */ trap = lock_rename(cache->graveyard, dir); -diff -urNp linux-3.0.7/fs/cachefiles/proc.c linux-3.0.7/fs/cachefiles/proc.c ---- linux-3.0.7/fs/cachefiles/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/proc.c linux-3.0.8/fs/cachefiles/proc.c +--- linux-3.0.8/fs/cachefiles/proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/proc.c 2011-08-23 21:47:56.000000000 -0400 @@ -14,9 +14,9 @@ #include <linux/seq_file.h> #include "internal.h" @@ -40346,9 +40696,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/proc.c linux-3.0.7/fs/cachefiles/proc.c if (x == 0 && y == 0 && z == 0) return 0; -diff -urNp linux-3.0.7/fs/cachefiles/rdwr.c linux-3.0.7/fs/cachefiles/rdwr.c ---- linux-3.0.7/fs/cachefiles/rdwr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cachefiles/rdwr.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/cachefiles/rdwr.c linux-3.0.8/fs/cachefiles/rdwr.c +--- linux-3.0.8/fs/cachefiles/rdwr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cachefiles/rdwr.c 2011-10-06 04:17:55.000000000 -0400 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -40358,9 +40708,9 @@ diff -urNp linux-3.0.7/fs/cachefiles/rdwr.c linux-3.0.7/fs/cachefiles/rdwr.c set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-3.0.7/fs/ceph/dir.c linux-3.0.7/fs/ceph/dir.c ---- linux-3.0.7/fs/ceph/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ceph/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ceph/dir.c linux-3.0.8/fs/ceph/dir.c +--- linux-3.0.8/fs/ceph/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ceph/dir.c 2011-08-23 21:47:56.000000000 -0400 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil struct ceph_fs_client *fsc = ceph_inode_to_client(inode); struct ceph_mds_client *mdsc = fsc->mdsc; @@ -40370,9 +40720,9 @@ diff -urNp linux-3.0.7/fs/ceph/dir.c linux-3.0.7/fs/ceph/dir.c int err; u32 ftype; struct ceph_mds_reply_info_parsed *rinfo; -diff -urNp linux-3.0.7/fs/cifs/cifs_debug.c linux-3.0.7/fs/cifs/cifs_debug.c ---- linux-3.0.7/fs/cifs/cifs_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cifs/cifs_debug.c 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.8/fs/cifs/cifs_debug.c linux-3.0.8/fs/cifs/cifs_debug.c +--- linux-3.0.8/fs/cifs/cifs_debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cifs/cifs_debug.c 2011-08-25 17:18:05.000000000 -0400 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str if (c == '1' || c == 'y' || c == 'Y' || c == '0') { @@ -40502,10 +40852,10 @@ diff -urNp linux-3.0.7/fs/cifs/cifs_debug.c linux-3.0.7/fs/cifs/cifs_debug.c } } } -diff -urNp linux-3.0.7/fs/cifs/cifsfs.c linux-3.0.7/fs/cifs/cifsfs.c ---- linux-3.0.7/fs/cifs/cifsfs.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/cifs/cifsfs.c 2011-08-25 17:18:05.000000000 -0400 -@@ -994,7 +994,7 @@ cifs_init_request_bufs(void) +diff -urNp linux-3.0.8/fs/cifs/cifsfs.c linux-3.0.8/fs/cifs/cifsfs.c +--- linux-3.0.8/fs/cifs/cifsfs.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/fs/cifs/cifsfs.c 2011-10-25 09:10:41.000000000 -0400 +@@ -996,7 +996,7 @@ cifs_init_request_bufs(void) cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + MAX_CIFS_HDR_SIZE, 0, @@ -40514,7 +40864,7 @@ diff -urNp linux-3.0.7/fs/cifs/cifsfs.c linux-3.0.7/fs/cifs/cifsfs.c if (cifs_req_cachep == NULL) return -ENOMEM; -@@ -1021,7 +1021,7 @@ cifs_init_request_bufs(void) +@@ -1023,7 +1023,7 @@ cifs_init_request_bufs(void) efficient to alloc 1 per page off the slab compared to 17K (5page) alloc of large cifs buffers even when page debugging is on */ cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", @@ -40523,7 +40873,7 @@ diff -urNp linux-3.0.7/fs/cifs/cifsfs.c linux-3.0.7/fs/cifs/cifsfs.c NULL); if (cifs_sm_req_cachep == NULL) { mempool_destroy(cifs_req_poolp); -@@ -1106,8 +1106,8 @@ init_cifs(void) +@@ -1108,8 +1108,8 @@ init_cifs(void) atomic_set(&bufAllocCount, 0); atomic_set(&smBufAllocCount, 0); #ifdef CONFIG_CIFS_STATS2 @@ -40534,9 +40884,9 @@ diff -urNp linux-3.0.7/fs/cifs/cifsfs.c linux-3.0.7/fs/cifs/cifsfs.c #endif /* CONFIG_CIFS_STATS2 */ atomic_set(&midCount, 0); -diff -urNp linux-3.0.7/fs/cifs/cifsglob.h linux-3.0.7/fs/cifs/cifsglob.h ---- linux-3.0.7/fs/cifs/cifsglob.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cifs/cifsglob.h 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.8/fs/cifs/cifsglob.h linux-3.0.8/fs/cifs/cifsglob.h +--- linux-3.0.8/fs/cifs/cifsglob.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cifs/cifsglob.h 2011-08-25 17:18:05.000000000 -0400 @@ -381,28 +381,28 @@ struct cifs_tcon { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; @@ -40608,9 +40958,9 @@ diff -urNp linux-3.0.7/fs/cifs/cifsglob.h linux-3.0.7/fs/cifs/cifsglob.h #endif GLOBAL_EXTERN atomic_t smBufAllocCount; GLOBAL_EXTERN atomic_t midCount; -diff -urNp linux-3.0.7/fs/cifs/link.c linux-3.0.7/fs/cifs/link.c ---- linux-3.0.7/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/cifs/link.c linux-3.0.8/fs/cifs/link.c +--- linux-3.0.8/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400 @@ -587,7 +587,7 @@ symlink_exit: void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -40620,9 +40970,9 @@ diff -urNp linux-3.0.7/fs/cifs/link.c linux-3.0.7/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-3.0.7/fs/cifs/misc.c linux-3.0.7/fs/cifs/misc.c ---- linux-3.0.7/fs/cifs/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/cifs/misc.c 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.8/fs/cifs/misc.c linux-3.0.8/fs/cifs/misc.c +--- linux-3.0.8/fs/cifs/misc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/cifs/misc.c 2011-08-25 17:18:05.000000000 -0400 @@ -156,7 +156,7 @@ cifs_buf_get(void) memset(ret_buf, 0, sizeof(struct smb_hdr) + 3); atomic_inc(&bufAllocCount); @@ -40641,9 +40991,9 @@ diff -urNp linux-3.0.7/fs/cifs/misc.c linux-3.0.7/fs/cifs/misc.c #endif /* CONFIG_CIFS_STATS2 */ } -diff -urNp linux-3.0.7/fs/coda/cache.c linux-3.0.7/fs/coda/cache.c ---- linux-3.0.7/fs/coda/cache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/coda/cache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/coda/cache.c linux-3.0.8/fs/coda/cache.c +--- linux-3.0.8/fs/coda/cache.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/coda/cache.c 2011-08-23 21:47:56.000000000 -0400 @@ -24,7 +24,7 @@ #include "coda_linux.h" #include "coda_cache.h" @@ -40688,9 +41038,26 @@ diff -urNp linux-3.0.7/fs/coda/cache.c linux-3.0.7/fs/coda/cache.c spin_unlock(&cii->c_lock); return hit; -diff -urNp linux-3.0.7/fs/compat.c linux-3.0.7/fs/compat.c ---- linux-3.0.7/fs/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/compat_binfmt_elf.c linux-3.0.8/fs/compat_binfmt_elf.c +--- linux-3.0.8/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400 +@@ -30,11 +30,13 @@ + #undef elf_phdr + #undef elf_shdr + #undef elf_note ++#undef elf_dyn + #undef elf_addr_t + #define elfhdr elf32_hdr + #define elf_phdr elf32_phdr + #define elf_shdr elf32_shdr + #define elf_note elf32_note ++#define elf_dyn Elf32_Dyn + #define elf_addr_t Elf32_Addr + + /* +diff -urNp linux-3.0.8/fs/compat.c linux-3.0.8/fs/compat.c +--- linux-3.0.8/fs/compat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/compat.c 2011-10-06 04:17:55.000000000 -0400 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) { @@ -40827,26 +41194,9 @@ diff -urNp linux-3.0.7/fs/compat.c linux-3.0.7/fs/compat.c set_fs(oldfs); if (err) -diff -urNp linux-3.0.7/fs/compat_binfmt_elf.c linux-3.0.7/fs/compat_binfmt_elf.c ---- linux-3.0.7/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400 -@@ -30,11 +30,13 @@ - #undef elf_phdr - #undef elf_shdr - #undef elf_note -+#undef elf_dyn - #undef elf_addr_t - #define elfhdr elf32_hdr - #define elf_phdr elf32_phdr - #define elf_shdr elf32_shdr - #define elf_note elf32_note -+#define elf_dyn Elf32_Dyn - #define elf_addr_t Elf32_Addr - - /* -diff -urNp linux-3.0.7/fs/compat_ioctl.c linux-3.0.7/fs/compat_ioctl.c ---- linux-3.0.7/fs/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/compat_ioctl.c linux-3.0.8/fs/compat_ioctl.c +--- linux-3.0.8/fs/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi err = get_user(palp, &up->palette); @@ -40885,9 +41235,9 @@ diff -urNp linux-3.0.7/fs/compat_ioctl.c linux-3.0.7/fs/compat_ioctl.c if (a > b) return 1; if (a < b) -diff -urNp linux-3.0.7/fs/configfs/dir.c linux-3.0.7/fs/configfs/dir.c ---- linux-3.0.7/fs/configfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/configfs/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/configfs/dir.c linux-3.0.8/fs/configfs/dir.c +--- linux-3.0.8/fs/configfs/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/configfs/dir.c 2011-08-23 21:47:56.000000000 -0400 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file } for (p=q->next; p!= &parent_sd->s_children; p=p->next) { @@ -40912,9 +41262,9 @@ diff -urNp linux-3.0.7/fs/configfs/dir.c linux-3.0.7/fs/configfs/dir.c /* * We'll have a dentry and an inode for -diff -urNp linux-3.0.7/fs/dcache.c linux-3.0.7/fs/dcache.c ---- linux-3.0.7/fs/dcache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/dcache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/dcache.c linux-3.0.8/fs/dcache.c +--- linux-3.0.8/fs/dcache.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/dcache.c 2011-08-23 21:47:56.000000000 -0400 @@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon mempages -= reserve; @@ -40924,9 +41274,9 @@ diff -urNp linux-3.0.7/fs/dcache.c linux-3.0.7/fs/dcache.c dcache_init(); inode_init(); -diff -urNp linux-3.0.7/fs/ecryptfs/inode.c linux-3.0.7/fs/ecryptfs/inode.c ---- linux-3.0.7/fs/ecryptfs/inode.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/ecryptfs/inode.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/ecryptfs/inode.c linux-3.0.8/fs/ecryptfs/inode.c +--- linux-3.0.8/fs/ecryptfs/inode.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/ecryptfs/inode.c 2011-10-06 04:17:55.000000000 -0400 @@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -40954,9 +41304,9 @@ diff -urNp linux-3.0.7/fs/ecryptfs/inode.c linux-3.0.7/fs/ecryptfs/inode.c if (!IS_ERR(buf)) { /* Free the char* */ kfree(buf); -diff -urNp linux-3.0.7/fs/ecryptfs/miscdev.c linux-3.0.7/fs/ecryptfs/miscdev.c ---- linux-3.0.7/fs/ecryptfs/miscdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ecryptfs/miscdev.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ecryptfs/miscdev.c linux-3.0.8/fs/ecryptfs/miscdev.c +--- linux-3.0.8/fs/ecryptfs/miscdev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ecryptfs/miscdev.c 2011-08-23 21:47:56.000000000 -0400 @@ -328,7 +328,7 @@ check_list: goto out_unlock_msg_ctx; i = 5; @@ -40966,9 +41316,9 @@ diff -urNp linux-3.0.7/fs/ecryptfs/miscdev.c linux-3.0.7/fs/ecryptfs/miscdev.c goto out_unlock_msg_ctx; i += packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) -diff -urNp linux-3.0.7/fs/ecryptfs/read_write.c linux-3.0.7/fs/ecryptfs/read_write.c ---- linux-3.0.7/fs/ecryptfs/read_write.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/ecryptfs/read_write.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/ecryptfs/read_write.c linux-3.0.8/fs/ecryptfs/read_write.c +--- linux-3.0.8/fs/ecryptfs/read_write.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/ecryptfs/read_write.c 2011-10-06 04:17:55.000000000 -0400 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e return -EIO; fs_save = get_fs(); @@ -40987,9 +41337,9 @@ diff -urNp linux-3.0.7/fs/ecryptfs/read_write.c linux-3.0.7/fs/ecryptfs/read_wri set_fs(fs_save); return rc; } -diff -urNp linux-3.0.7/fs/exec.c linux-3.0.7/fs/exec.c ---- linux-3.0.7/fs/exec.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/fs/exec.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/fs/exec.c linux-3.0.8/fs/exec.c +--- linux-3.0.8/fs/exec.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/fs/exec.c 2011-10-17 23:17:19.000000000 -0400 @@ -55,12 +55,24 @@ #include <linux/pipe_fs_i.h> #include <linux/oom.h> @@ -41673,9 +42023,9 @@ diff -urNp linux-3.0.7/fs/exec.c linux-3.0.7/fs/exec.c } EXPORT_SYMBOL(dump_write); -diff -urNp linux-3.0.7/fs/ext2/balloc.c linux-3.0.7/fs/ext2/balloc.c ---- linux-3.0.7/fs/ext2/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext2/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext2/balloc.c linux-3.0.8/fs/ext2/balloc.c +--- linux-3.0.8/fs/ext2/balloc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext2/balloc.c 2011-08-23 21:48:14.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -41685,9 +42035,9 @@ diff -urNp linux-3.0.7/fs/ext2/balloc.c linux-3.0.7/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-3.0.7/fs/ext3/balloc.c linux-3.0.7/fs/ext3/balloc.c ---- linux-3.0.7/fs/ext3/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext3/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext3/balloc.c linux-3.0.8/fs/ext3/balloc.c +--- linux-3.0.8/fs/ext3/balloc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext3/balloc.c 2011-08-23 21:48:14.000000000 -0400 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -41697,9 +42047,9 @@ diff -urNp linux-3.0.7/fs/ext3/balloc.c linux-3.0.7/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-3.0.7/fs/ext3/ioctl.c linux-3.0.7/fs/ext3/ioctl.c ---- linux-3.0.7/fs/ext3/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext3/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext3/ioctl.c linux-3.0.8/fs/ext3/ioctl.c +--- linux-3.0.8/fs/ext3/ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext3/ioctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -285,7 +285,7 @@ group_add_out: if (!capable(CAP_SYS_ADMIN)) return -EPERM; @@ -41718,9 +42068,9 @@ diff -urNp linux-3.0.7/fs/ext3/ioctl.c linux-3.0.7/fs/ext3/ioctl.c sizeof(range))) return -EFAULT; -diff -urNp linux-3.0.7/fs/ext4/balloc.c linux-3.0.7/fs/ext4/balloc.c ---- linux-3.0.7/fs/ext4/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext4/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext4/balloc.c linux-3.0.8/fs/ext4/balloc.c +--- linux-3.0.8/fs/ext4/balloc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext4/balloc.c 2011-08-23 21:48:14.000000000 -0400 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -41732,9 +42082,9 @@ diff -urNp linux-3.0.7/fs/ext4/balloc.c linux-3.0.7/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; -diff -urNp linux-3.0.7/fs/ext4/ext4.h linux-3.0.7/fs/ext4/ext4.h ---- linux-3.0.7/fs/ext4/ext4.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext4/ext4.h linux-3.0.8/fs/ext4/ext4.h +--- linux-3.0.8/fs/ext4/ext4.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400 @@ -1177,19 +1177,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; @@ -41765,9 +42115,9 @@ diff -urNp linux-3.0.7/fs/ext4/ext4.h linux-3.0.7/fs/ext4/ext4.h atomic_t s_lock_busy; /* locality groups */ -diff -urNp linux-3.0.7/fs/ext4/file.c linux-3.0.7/fs/ext4/file.c ---- linux-3.0.7/fs/ext4/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext4/file.c 2011-10-17 02:30:30.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext4/file.c linux-3.0.8/fs/ext4/file.c +--- linux-3.0.8/fs/ext4/file.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext4/file.c 2011-10-17 02:30:30.000000000 -0400 @@ -181,8 +181,8 @@ static int ext4_file_open(struct inode * path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); @@ -41779,9 +42129,9 @@ diff -urNp linux-3.0.7/fs/ext4/file.c linux-3.0.7/fs/ext4/file.c ext4_mark_super_dirty(sb); } } -diff -urNp linux-3.0.7/fs/ext4/ioctl.c linux-3.0.7/fs/ext4/ioctl.c ---- linux-3.0.7/fs/ext4/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ext4/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext4/ioctl.c linux-3.0.8/fs/ext4/ioctl.c +--- linux-3.0.8/fs/ext4/ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ext4/ioctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -344,7 +344,7 @@ mext_out: if (!blk_queue_discard(q)) return -EOPNOTSUPP; @@ -41800,9 +42150,9 @@ diff -urNp linux-3.0.7/fs/ext4/ioctl.c linux-3.0.7/fs/ext4/ioctl.c sizeof(range))) return -EFAULT; -diff -urNp linux-3.0.7/fs/ext4/mballoc.c linux-3.0.7/fs/ext4/mballoc.c ---- linux-3.0.7/fs/ext4/mballoc.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/ext4/mballoc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ext4/mballoc.c linux-3.0.8/fs/ext4/mballoc.c +--- linux-3.0.8/fs/ext4/mballoc.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/ext4/mballoc.c 2011-08-23 21:48:14.000000000 -0400 @@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); @@ -41925,9 +42275,9 @@ diff -urNp linux-3.0.7/fs/ext4/mballoc.c linux-3.0.7/fs/ext4/mballoc.c trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); return 0; -diff -urNp linux-3.0.7/fs/fcntl.c linux-3.0.7/fs/fcntl.c ---- linux-3.0.7/fs/fcntl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fcntl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/fcntl.c linux-3.0.8/fs/fcntl.c +--- linux-3.0.8/fs/fcntl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fcntl.c 2011-10-06 04:17:55.000000000 -0400 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -41983,9 +42333,9 @@ diff -urNp linux-3.0.7/fs/fcntl.c linux-3.0.7/fs/fcntl.c )); fasync_cache = kmem_cache_create("fasync_cache", -diff -urNp linux-3.0.7/fs/fifo.c linux-3.0.7/fs/fifo.c ---- linux-3.0.7/fs/fifo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fifo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fifo.c linux-3.0.8/fs/fifo.c +--- linux-3.0.8/fs/fifo.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fifo.c 2011-08-23 21:47:56.000000000 -0400 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -42056,9 +42406,9 @@ diff -urNp linux-3.0.7/fs/fifo.c linux-3.0.7/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-3.0.7/fs/file.c linux-3.0.7/fs/file.c ---- linux-3.0.7/fs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/file.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/file.c linux-3.0.8/fs/file.c +--- linux-3.0.8/fs/file.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/file.c 2011-08-23 21:48:14.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -42075,9 +42425,9 @@ diff -urNp linux-3.0.7/fs/file.c linux-3.0.7/fs/file.c if (nr >= rlimit(RLIMIT_NOFILE)) return -EMFILE; -diff -urNp linux-3.0.7/fs/filesystems.c linux-3.0.7/fs/filesystems.c ---- linux-3.0.7/fs/filesystems.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/filesystems.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/filesystems.c linux-3.0.8/fs/filesystems.c +--- linux-3.0.8/fs/filesystems.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/filesystems.c 2011-08-23 21:48:14.000000000 -0400 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con int len = dot ? dot - name : strlen(name); @@ -42091,101 +42441,9 @@ diff -urNp linux-3.0.7/fs/filesystems.c linux-3.0.7/fs/filesystems.c fs = __get_fs_type(name, len); if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-3.0.7/fs/fs_struct.c linux-3.0.7/fs/fs_struct.c ---- linux-3.0.7/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400 -@@ -4,6 +4,7 @@ - #include <linux/path.h> - #include <linux/slab.h> - #include <linux/fs_struct.h> -+#include <linux/grsecurity.h> - #include "internal.h" - - static inline void path_get_longterm(struct path *path) -@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, s - old_root = fs->root; - fs->root = *path; - path_get_longterm(path); -+ gr_set_chroot_entries(current, path); - write_seqcount_end(&fs->seq); - spin_unlock(&fs->lock); - if (old_root.dentry) -@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_roo - && fs->root.mnt == old_root->mnt) { - path_get_longterm(new_root); - fs->root = *new_root; -+ gr_set_chroot_entries(p, new_root); - count++; - } - if (fs->pwd.dentry == old_root->dentry -@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk) - spin_lock(&fs->lock); - write_seqcount_begin(&fs->seq); - tsk->fs = NULL; -- kill = !--fs->users; -+ gr_clear_chroot_entries(tsk); -+ kill = !atomic_dec_return(&fs->users); - write_seqcount_end(&fs->seq); - spin_unlock(&fs->lock); - task_unlock(tsk); -@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct - struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); - /* We don't need to lock fs - think why ;-) */ - if (fs) { -- fs->users = 1; -+ atomic_set(&fs->users, 1); - fs->in_exec = 0; - spin_lock_init(&fs->lock); - seqcount_init(&fs->seq); -@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct - spin_lock(&old->lock); - fs->root = old->root; - path_get_longterm(&fs->root); -+ /* instead of calling gr_set_chroot_entries here, -+ we call it from every caller of this function -+ */ - fs->pwd = old->pwd; - path_get_longterm(&fs->pwd); - spin_unlock(&old->lock); -@@ -150,8 +157,9 @@ int unshare_fs_struct(void) - - task_lock(current); - spin_lock(&fs->lock); -- kill = !--fs->users; -+ kill = !atomic_dec_return(&fs->users); - current->fs = new_fs; -+ gr_set_chroot_entries(current, &new_fs->root); - spin_unlock(&fs->lock); - task_unlock(current); - -@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask); - - /* to be mentioned only in INIT_TASK */ - struct fs_struct init_fs = { -- .users = 1, -+ .users = ATOMIC_INIT(1), - .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), - .seq = SEQCNT_ZERO, - .umask = 0022, -@@ -186,12 +194,13 @@ void daemonize_fs_struct(void) - task_lock(current); - - spin_lock(&init_fs.lock); -- init_fs.users++; -+ atomic_inc(&init_fs.users); - spin_unlock(&init_fs.lock); - - spin_lock(&fs->lock); - current->fs = &init_fs; -- kill = !--fs->users; -+ gr_set_chroot_entries(current, ¤t->fs->root); -+ kill = !atomic_dec_return(&fs->users); - spin_unlock(&fs->lock); - - task_unlock(current); -diff -urNp linux-3.0.7/fs/fscache/cookie.c linux-3.0.7/fs/fscache/cookie.c ---- linux-3.0.7/fs/fscache/cookie.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/cookie.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/cookie.c linux-3.0.8/fs/fscache/cookie.c +--- linux-3.0.8/fs/fscache/cookie.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/cookie.c 2011-08-23 21:47:56.000000000 -0400 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire parent ? (char *) parent->def->name : "<no-parent>", def->name, netfs_data); @@ -42304,9 +42562,9 @@ diff -urNp linux-3.0.7/fs/fscache/cookie.c linux-3.0.7/fs/fscache/cookie.c wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, fscache_wait_bit, TASK_UNINTERRUPTIBLE); } -diff -urNp linux-3.0.7/fs/fscache/internal.h linux-3.0.7/fs/fscache/internal.h ---- linux-3.0.7/fs/fscache/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/internal.h linux-3.0.8/fs/fscache/internal.h +--- linux-3.0.8/fs/fscache/internal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/internal.h 2011-08-23 21:47:56.000000000 -0400 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void); extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS]; extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS]; @@ -42510,9 +42768,9 @@ diff -urNp linux-3.0.7/fs/fscache/internal.h linux-3.0.7/fs/fscache/internal.h #define fscache_stat_d(stat) do {} while (0) #endif -diff -urNp linux-3.0.7/fs/fscache/object.c linux-3.0.7/fs/fscache/object.c ---- linux-3.0.7/fs/fscache/object.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/object.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/object.c linux-3.0.8/fs/fscache/object.c +--- linux-3.0.8/fs/fscache/object.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/object.c 2011-08-23 21:47:56.000000000 -0400 @@ -128,7 +128,7 @@ static void fscache_object_state_machine /* update the object metadata on disk */ case FSCACHE_OBJECT_UPDATING: @@ -42624,9 +42882,9 @@ diff -urNp linux-3.0.7/fs/fscache/object.c linux-3.0.7/fs/fscache/object.c break; default: -diff -urNp linux-3.0.7/fs/fscache/operation.c linux-3.0.7/fs/fscache/operation.c ---- linux-3.0.7/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/operation.c linux-3.0.8/fs/fscache/operation.c +--- linux-3.0.8/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400 @@ -17,7 +17,7 @@ #include <linux/slab.h> #include "internal.h" @@ -42742,9 +43000,9 @@ diff -urNp linux-3.0.7/fs/fscache/operation.c linux-3.0.7/fs/fscache/operation.c ASSERTCMP(atomic_read(&op->usage), ==, 0); -diff -urNp linux-3.0.7/fs/fscache/page.c linux-3.0.7/fs/fscache/page.c ---- linux-3.0.7/fs/fscache/page.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/page.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/page.c linux-3.0.8/fs/fscache/page.c +--- linux-3.0.8/fs/fscache/page.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/page.c 2011-08-23 21:47:56.000000000 -0400 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct val = radix_tree_lookup(&cookie->stores, page->index); if (!val) { @@ -43128,9 +43386,9 @@ diff -urNp linux-3.0.7/fs/fscache/page.c linux-3.0.7/fs/fscache/page.c #endif for (loop = 0; loop < pagevec->nr; loop++) { -diff -urNp linux-3.0.7/fs/fscache/stats.c linux-3.0.7/fs/fscache/stats.c ---- linux-3.0.7/fs/fscache/stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fscache/stats.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fscache/stats.c linux-3.0.8/fs/fscache/stats.c +--- linux-3.0.8/fs/fscache/stats.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fscache/stats.c 2011-08-23 21:47:56.000000000 -0400 @@ -18,95 +18,95 @@ /* * operation counters @@ -43506,9 +43764,101 @@ diff -urNp linux-3.0.7/fs/fscache/stats.c linux-3.0.7/fs/fscache/stats.c seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n", atomic_read(&fscache_n_cop_alloc_object), -diff -urNp linux-3.0.7/fs/fuse/cuse.c linux-3.0.7/fs/fuse/cuse.c ---- linux-3.0.7/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fs_struct.c linux-3.0.8/fs/fs_struct.c +--- linux-3.0.8/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400 +@@ -4,6 +4,7 @@ + #include <linux/path.h> + #include <linux/slab.h> + #include <linux/fs_struct.h> ++#include <linux/grsecurity.h> + #include "internal.h" + + static inline void path_get_longterm(struct path *path) +@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, s + old_root = fs->root; + fs->root = *path; + path_get_longterm(path); ++ gr_set_chroot_entries(current, path); + write_seqcount_end(&fs->seq); + spin_unlock(&fs->lock); + if (old_root.dentry) +@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_roo + && fs->root.mnt == old_root->mnt) { + path_get_longterm(new_root); + fs->root = *new_root; ++ gr_set_chroot_entries(p, new_root); + count++; + } + if (fs->pwd.dentry == old_root->dentry +@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk) + spin_lock(&fs->lock); + write_seqcount_begin(&fs->seq); + tsk->fs = NULL; +- kill = !--fs->users; ++ gr_clear_chroot_entries(tsk); ++ kill = !atomic_dec_return(&fs->users); + write_seqcount_end(&fs->seq); + spin_unlock(&fs->lock); + task_unlock(tsk); +@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct + struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); + /* We don't need to lock fs - think why ;-) */ + if (fs) { +- fs->users = 1; ++ atomic_set(&fs->users, 1); + fs->in_exec = 0; + spin_lock_init(&fs->lock); + seqcount_init(&fs->seq); +@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct + spin_lock(&old->lock); + fs->root = old->root; + path_get_longterm(&fs->root); ++ /* instead of calling gr_set_chroot_entries here, ++ we call it from every caller of this function ++ */ + fs->pwd = old->pwd; + path_get_longterm(&fs->pwd); + spin_unlock(&old->lock); +@@ -150,8 +157,9 @@ int unshare_fs_struct(void) + + task_lock(current); + spin_lock(&fs->lock); +- kill = !--fs->users; ++ kill = !atomic_dec_return(&fs->users); + current->fs = new_fs; ++ gr_set_chroot_entries(current, &new_fs->root); + spin_unlock(&fs->lock); + task_unlock(current); + +@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask); + + /* to be mentioned only in INIT_TASK */ + struct fs_struct init_fs = { +- .users = 1, ++ .users = ATOMIC_INIT(1), + .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), + .seq = SEQCNT_ZERO, + .umask = 0022, +@@ -186,12 +194,13 @@ void daemonize_fs_struct(void) + task_lock(current); + + spin_lock(&init_fs.lock); +- init_fs.users++; ++ atomic_inc(&init_fs.users); + spin_unlock(&init_fs.lock); + + spin_lock(&fs->lock); + current->fs = &init_fs; +- kill = !--fs->users; ++ gr_set_chroot_entries(current, ¤t->fs->root); ++ kill = !atomic_dec_return(&fs->users); + spin_unlock(&fs->lock); + + task_unlock(current); +diff -urNp linux-3.0.8/fs/fuse/cuse.c linux-3.0.8/fs/fuse/cuse.c +--- linux-3.0.8/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400 @@ -586,10 +586,12 @@ static int __init cuse_init(void) INIT_LIST_HEAD(&cuse_conntbl[i]); @@ -43526,10 +43876,10 @@ diff -urNp linux-3.0.7/fs/fuse/cuse.c linux-3.0.7/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) -diff -urNp linux-3.0.7/fs/fuse/dev.c linux-3.0.7/fs/fuse/dev.c ---- linux-3.0.7/fs/fuse/dev.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/fs/fuse/dev.c 2011-08-29 23:26:27.000000000 -0400 -@@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru +diff -urNp linux-3.0.8/fs/fuse/dev.c linux-3.0.8/fs/fuse/dev.c +--- linux-3.0.8/fs/fuse/dev.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/fs/fuse/dev.c 2011-10-25 09:10:41.000000000 -0400 +@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru ret = 0; pipe_lock(pipe); @@ -43538,9 +43888,9 @@ diff -urNp linux-3.0.7/fs/fuse/dev.c linux-3.0.7/fs/fuse/dev.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -diff -urNp linux-3.0.7/fs/fuse/dir.c linux-3.0.7/fs/fuse/dir.c ---- linux-3.0.7/fs/fuse/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/fuse/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/fuse/dir.c linux-3.0.8/fs/fuse/dir.c +--- linux-3.0.8/fs/fuse/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/fuse/dir.c 2011-08-23 21:47:56.000000000 -0400 @@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de return link; } @@ -43550,9 +43900,9 @@ diff -urNp linux-3.0.7/fs/fuse/dir.c linux-3.0.7/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-3.0.7/fs/gfs2/inode.c linux-3.0.7/fs/gfs2/inode.c ---- linux-3.0.7/fs/gfs2/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/gfs2/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/gfs2/inode.c linux-3.0.8/fs/gfs2/inode.c +--- linux-3.0.8/fs/gfs2/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/gfs2/inode.c 2011-08-23 21:47:56.000000000 -0400 @@ -1525,7 +1525,7 @@ out: static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -43562,9 +43912,9 @@ diff -urNp linux-3.0.7/fs/gfs2/inode.c linux-3.0.7/fs/gfs2/inode.c if (!IS_ERR(s)) kfree(s); } -diff -urNp linux-3.0.7/fs/hfsplus/catalog.c linux-3.0.7/fs/hfsplus/catalog.c ---- linux-3.0.7/fs/hfsplus/catalog.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hfsplus/catalog.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hfsplus/catalog.c linux-3.0.8/fs/hfsplus/catalog.c +--- linux-3.0.8/fs/hfsplus/catalog.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/hfsplus/catalog.c 2011-08-23 21:48:14.000000000 -0400 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block int err; u16 type; @@ -43592,9 +43942,9 @@ diff -urNp linux-3.0.7/fs/hfsplus/catalog.c linux-3.0.7/fs/hfsplus/catalog.c dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); -diff -urNp linux-3.0.7/fs/hfsplus/dir.c linux-3.0.7/fs/hfsplus/dir.c ---- linux-3.0.7/fs/hfsplus/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hfsplus/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hfsplus/dir.c linux-3.0.8/fs/hfsplus/dir.c +--- linux-3.0.8/fs/hfsplus/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/hfsplus/dir.c 2011-08-23 21:48:14.000000000 -0400 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file * struct hfsplus_readdir_data *rd; u16 type; @@ -43604,9 +43954,9 @@ diff -urNp linux-3.0.7/fs/hfsplus/dir.c linux-3.0.7/fs/hfsplus/dir.c if (filp->f_pos >= inode->i_size) return 0; -diff -urNp linux-3.0.7/fs/hfsplus/inode.c linux-3.0.7/fs/hfsplus/inode.c ---- linux-3.0.7/fs/hfsplus/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hfsplus/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hfsplus/inode.c linux-3.0.8/fs/hfsplus/inode.c +--- linux-3.0.8/fs/hfsplus/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/hfsplus/inode.c 2011-08-23 21:48:14.000000000 -0400 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode int res = 0; u16 type; @@ -43625,9 +43975,9 @@ diff -urNp linux-3.0.7/fs/hfsplus/inode.c linux-3.0.7/fs/hfsplus/inode.c if (HFSPLUS_IS_RSRC(inode)) main_inode = HFSPLUS_I(inode)->rsrc_inode; -diff -urNp linux-3.0.7/fs/hfsplus/ioctl.c linux-3.0.7/fs/hfsplus/ioctl.c ---- linux-3.0.7/fs/hfsplus/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hfsplus/ioctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hfsplus/ioctl.c linux-3.0.8/fs/hfsplus/ioctl.c +--- linux-3.0.8/fs/hfsplus/ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/hfsplus/ioctl.c 2011-08-23 21:48:14.000000000 -0400 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent struct hfsplus_cat_file *file; int res; @@ -43646,9 +43996,9 @@ diff -urNp linux-3.0.7/fs/hfsplus/ioctl.c linux-3.0.7/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; -diff -urNp linux-3.0.7/fs/hfsplus/super.c linux-3.0.7/fs/hfsplus/super.c ---- linux-3.0.7/fs/hfsplus/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hfsplus/super.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hfsplus/super.c linux-3.0.8/fs/hfsplus/super.c +--- linux-3.0.8/fs/hfsplus/super.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/fs/hfsplus/super.c 2011-10-25 09:10:41.000000000 -0400 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup struct nls_table *nls = NULL; int err; @@ -43658,9 +44008,9 @@ diff -urNp linux-3.0.7/fs/hfsplus/super.c linux-3.0.7/fs/hfsplus/super.c err = -EINVAL; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) -diff -urNp linux-3.0.7/fs/hugetlbfs/inode.c linux-3.0.7/fs/hugetlbfs/inode.c ---- linux-3.0.7/fs/hugetlbfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/hugetlbfs/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/hugetlbfs/inode.c linux-3.0.8/fs/hugetlbfs/inode.c +--- linux-3.0.8/fs/hugetlbfs/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/hugetlbfs/inode.c 2011-08-23 21:48:14.000000000 -0400 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -43670,9 +44020,9 @@ diff -urNp linux-3.0.7/fs/hugetlbfs/inode.c linux-3.0.7/fs/hugetlbfs/inode.c static int can_do_hugetlb_shm(void) { -diff -urNp linux-3.0.7/fs/inode.c linux-3.0.7/fs/inode.c ---- linux-3.0.7/fs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/inode.c linux-3.0.8/fs/inode.c +--- linux-3.0.8/fs/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/inode.c 2011-08-23 21:47:56.000000000 -0400 @@ -829,8 +829,8 @@ unsigned int get_next_ino(void) #ifdef CONFIG_SMP @@ -43684,9 +44034,9 @@ diff -urNp linux-3.0.7/fs/inode.c linux-3.0.7/fs/inode.c res = next - LAST_INO_BATCH; } -diff -urNp linux-3.0.7/fs/jbd/checkpoint.c linux-3.0.7/fs/jbd/checkpoint.c ---- linux-3.0.7/fs/jbd/checkpoint.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jbd/checkpoint.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/jbd/checkpoint.c linux-3.0.8/fs/jbd/checkpoint.c +--- linux-3.0.8/fs/jbd/checkpoint.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jbd/checkpoint.c 2011-08-23 21:48:14.000000000 -0400 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal tid_t this_tid; int result; @@ -43696,9 +44046,9 @@ diff -urNp linux-3.0.7/fs/jbd/checkpoint.c linux-3.0.7/fs/jbd/checkpoint.c jbd_debug(1, "Start checkpoint\n"); /* -diff -urNp linux-3.0.7/fs/jffs2/compr_rtime.c linux-3.0.7/fs/jffs2/compr_rtime.c ---- linux-3.0.7/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/jffs2/compr_rtime.c linux-3.0.8/fs/jffs2/compr_rtime.c +--- linux-3.0.8/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned int outpos = 0; int pos=0; @@ -43717,9 +44067,9 @@ diff -urNp linux-3.0.7/fs/jffs2/compr_rtime.c linux-3.0.7/fs/jffs2/compr_rtime.c memset(positions,0,sizeof(positions)); while (outpos<destlen) { -diff -urNp linux-3.0.7/fs/jffs2/compr_rubin.c linux-3.0.7/fs/jffs2/compr_rubin.c ---- linux-3.0.7/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/jffs2/compr_rubin.c linux-3.0.8/fs/jffs2/compr_rubin.c +--- linux-3.0.8/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig int ret; uint32_t mysrclen, mydstlen; @@ -43729,9 +44079,9 @@ diff -urNp linux-3.0.7/fs/jffs2/compr_rubin.c linux-3.0.7/fs/jffs2/compr_rubin.c mysrclen = *sourcelen; mydstlen = *dstlen - 8; -diff -urNp linux-3.0.7/fs/jffs2/erase.c linux-3.0.7/fs/jffs2/erase.c ---- linux-3.0.7/fs/jffs2/erase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jffs2/erase.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/jffs2/erase.c linux-3.0.8/fs/jffs2/erase.c +--- linux-3.0.8/fs/jffs2/erase.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jffs2/erase.c 2011-08-23 21:47:56.000000000 -0400 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -43742,9 +44092,9 @@ diff -urNp linux-3.0.7/fs/jffs2/erase.c linux-3.0.7/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-3.0.7/fs/jffs2/wbuf.c linux-3.0.7/fs/jffs2/wbuf.c ---- linux-3.0.7/fs/jffs2/wbuf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jffs2/wbuf.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/jffs2/wbuf.c linux-3.0.8/fs/jffs2/wbuf.c +--- linux-3.0.8/fs/jffs2/wbuf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jffs2/wbuf.c 2011-08-23 21:47:56.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -43755,9 +44105,9 @@ diff -urNp linux-3.0.7/fs/jffs2/wbuf.c linux-3.0.7/fs/jffs2/wbuf.c }; /* -diff -urNp linux-3.0.7/fs/jffs2/xattr.c linux-3.0.7/fs/jffs2/xattr.c ---- linux-3.0.7/fs/jffs2/xattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jffs2/xattr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/jffs2/xattr.c linux-3.0.8/fs/jffs2/xattr.c +--- linux-3.0.8/fs/jffs2/xattr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jffs2/xattr.c 2011-08-23 21:48:14.000000000 -0400 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING)); @@ -43767,9 +44117,9 @@ diff -urNp linux-3.0.7/fs/jffs2/xattr.c linux-3.0.7/fs/jffs2/xattr.c /* Phase.1 : Merge same xref */ for (i=0; i < XREF_TMPHASH_SIZE; i++) xref_tmphash[i] = NULL; -diff -urNp linux-3.0.7/fs/jfs/super.c linux-3.0.7/fs/jfs/super.c ---- linux-3.0.7/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/jfs/super.c linux-3.0.8/fs/jfs/super.c +--- linux-3.0.8/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void) jfs_inode_cachep = @@ -43779,9 +44129,21 @@ diff -urNp linux-3.0.7/fs/jfs/super.c linux-3.0.7/fs/jfs/super.c init_once); if (jfs_inode_cachep == NULL) return -ENOMEM; -diff -urNp linux-3.0.7/fs/libfs.c linux-3.0.7/fs/libfs.c ---- linux-3.0.7/fs/libfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/libfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/Kconfig.binfmt linux-3.0.8/fs/Kconfig.binfmt +--- linux-3.0.8/fs/Kconfig.binfmt 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/Kconfig.binfmt 2011-08-23 21:47:56.000000000 -0400 +@@ -86,7 +86,7 @@ config HAVE_AOUT + + config BINFMT_AOUT + tristate "Kernel support for a.out and ECOFF binaries" +- depends on HAVE_AOUT ++ depends on HAVE_AOUT && BROKEN + ---help--- + A.out (Assembler.OUTput) is a set of formats for libraries and + executables used in the earliest versions of UNIX. Linux used +diff -urNp linux-3.0.8/fs/libfs.c linux-3.0.8/fs/libfs.c +--- linux-3.0.8/fs/libfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/libfs.c 2011-08-23 21:47:56.000000000 -0400 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v for (p=q->next; p != &dentry->d_subdirs; p=p->next) { @@ -43806,9 +44168,9 @@ diff -urNp linux-3.0.7/fs/libfs.c linux-3.0.7/fs/libfs.c next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0) -diff -urNp linux-3.0.7/fs/lockd/clntproc.c linux-3.0.7/fs/lockd/clntproc.c ---- linux-3.0.7/fs/lockd/clntproc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/lockd/clntproc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/lockd/clntproc.c linux-3.0.8/fs/lockd/clntproc.c +--- linux-3.0.8/fs/lockd/clntproc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/lockd/clntproc.c 2011-08-23 21:48:14.000000000 -0400 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt /* * Cookie counter for NLM requests @@ -43832,9 +44194,9 @@ diff -urNp linux-3.0.7/fs/lockd/clntproc.c linux-3.0.7/fs/lockd/clntproc.c req = &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); -diff -urNp linux-3.0.7/fs/locks.c linux-3.0.7/fs/locks.c ---- linux-3.0.7/fs/locks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/locks.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/locks.c linux-3.0.8/fs/locks.c +--- linux-3.0.8/fs/locks.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/locks.c 2011-08-23 21:47:56.000000000 -0400 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil return; @@ -43856,9 +44218,9 @@ diff -urNp linux-3.0.7/fs/locks.c linux-3.0.7/fs/locks.c } lock_flocks(); -diff -urNp linux-3.0.7/fs/logfs/super.c linux-3.0.7/fs/logfs/super.c ---- linux-3.0.7/fs/logfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/logfs/super.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/logfs/super.c linux-3.0.8/fs/logfs/super.c +--- linux-3.0.8/fs/logfs/super.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/logfs/super.c 2011-08-23 21:48:14.000000000 -0400 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super struct logfs_disk_super _ds1, *ds1 = &_ds1; int err, valid0, valid1; @@ -43868,9 +44230,9 @@ diff -urNp linux-3.0.7/fs/logfs/super.c linux-3.0.7/fs/logfs/super.c /* read first superblock */ err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0); if (err) -diff -urNp linux-3.0.7/fs/namei.c linux-3.0.7/fs/namei.c ---- linux-3.0.7/fs/namei.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/fs/namei.c 2011-10-19 10:09:26.000000000 -0400 +diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c +--- linux-3.0.8/fs/namei.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/fs/namei.c 2011-10-19 10:09:26.000000000 -0400 @@ -237,21 +237,23 @@ int generic_permission(struct inode *ino return ret; @@ -44379,9 +44741,9 @@ diff -urNp linux-3.0.7/fs/namei.c linux-3.0.7/fs/namei.c len = -EFAULT; out: return len; -diff -urNp linux-3.0.7/fs/namespace.c linux-3.0.7/fs/namespace.c ---- linux-3.0.7/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c +--- linux-3.0.8/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400 @@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -44441,9 +44803,9 @@ diff -urNp linux-3.0.7/fs/namespace.c linux-3.0.7/fs/namespace.c get_fs_root(current->fs, &root); error = lock_mount(&old); if (error) -diff -urNp linux-3.0.7/fs/ncpfs/dir.c linux-3.0.7/fs/ncpfs/dir.c ---- linux-3.0.7/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ncpfs/dir.c linux-3.0.8/fs/ncpfs/dir.c +--- linux-3.0.8/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr int res, val = 0, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -44489,9 +44851,9 @@ diff -urNp linux-3.0.7/fs/ncpfs/dir.c linux-3.0.7/fs/ncpfs/dir.c DPRINTK("ncp_rename: %s/%s to %s/%s\n", old_dentry->d_parent->d_name.name, old_dentry->d_name.name, new_dentry->d_parent->d_name.name, new_dentry->d_name.name); -diff -urNp linux-3.0.7/fs/ncpfs/inode.c linux-3.0.7/fs/ncpfs/inode.c ---- linux-3.0.7/fs/ncpfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ncpfs/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ncpfs/inode.c linux-3.0.8/fs/ncpfs/inode.c +--- linux-3.0.8/fs/ncpfs/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ncpfs/inode.c 2011-08-23 21:48:14.000000000 -0400 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b #endif struct ncp_entry_info finfo; @@ -44501,9 +44863,9 @@ diff -urNp linux-3.0.7/fs/ncpfs/inode.c linux-3.0.7/fs/ncpfs/inode.c memset(&data, 0, sizeof(data)); server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); if (!server) -diff -urNp linux-3.0.7/fs/nfs/inode.c linux-3.0.7/fs/nfs/inode.c ---- linux-3.0.7/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/nfs/inode.c linux-3.0.8/fs/nfs/inode.c +--- linux-3.0.8/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); nfsi->attrtimeo_timestamp = jiffies; @@ -44533,9 +44895,9 @@ diff -urNp linux-3.0.7/fs/nfs/inode.c linux-3.0.7/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-3.0.7/fs/nfsd/nfs4state.c linux-3.0.7/fs/nfsd/nfs4state.c ---- linux-3.0.7/fs/nfsd/nfs4state.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/nfsd/nfs4state.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/nfsd/nfs4state.c linux-3.0.8/fs/nfsd/nfs4state.c +--- linux-3.0.8/fs/nfsd/nfs4state.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/nfsd/nfs4state.c 2011-08-23 21:48:14.000000000 -0400 @@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc unsigned int strhashval; int err; @@ -44545,9 +44907,9 @@ diff -urNp linux-3.0.7/fs/nfsd/nfs4state.c linux-3.0.7/fs/nfsd/nfs4state.c dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", (long long) lock->lk_offset, (long long) lock->lk_length); -diff -urNp linux-3.0.7/fs/nfsd/nfs4xdr.c linux-3.0.7/fs/nfsd/nfs4xdr.c ---- linux-3.0.7/fs/nfsd/nfs4xdr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/nfsd/nfs4xdr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/nfsd/nfs4xdr.c linux-3.0.8/fs/nfsd/nfs4xdr.c +--- linux-3.0.8/fs/nfsd/nfs4xdr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/nfsd/nfs4xdr.c 2011-08-23 21:48:14.000000000 -0400 @@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s .dentry = dentry, }; @@ -44557,9 +44919,9 @@ diff -urNp linux-3.0.7/fs/nfsd/nfs4xdr.c linux-3.0.7/fs/nfsd/nfs4xdr.c BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); -diff -urNp linux-3.0.7/fs/nfsd/vfs.c linux-3.0.7/fs/nfsd/vfs.c ---- linux-3.0.7/fs/nfsd/vfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/nfsd/vfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/nfsd/vfs.c linux-3.0.8/fs/nfsd/vfs.c +--- linux-3.0.8/fs/nfsd/vfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/nfsd/vfs.c 2011-10-06 04:17:55.000000000 -0400 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -44587,9 +44949,9 @@ diff -urNp linux-3.0.7/fs/nfsd/vfs.c linux-3.0.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-3.0.7/fs/notify/fanotify/fanotify_user.c linux-3.0.7/fs/notify/fanotify/fanotify_user.c ---- linux-3.0.7/fs/notify/fanotify/fanotify_user.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/notify/fanotify/fanotify_user.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/notify/fanotify/fanotify_user.c linux-3.0.8/fs/notify/fanotify/fanotify_user.c +--- linux-3.0.8/fs/notify/fanotify/fanotify_user.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/notify/fanotify/fanotify_user.c 2011-08-23 21:48:14.000000000 -0400 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct goto out_close_fd; @@ -44600,9 +44962,9 @@ diff -urNp linux-3.0.7/fs/notify/fanotify/fanotify_user.c linux-3.0.7/fs/notify/ fanotify_event_metadata.event_len)) goto out_kill_access_response; -diff -urNp linux-3.0.7/fs/notify/notification.c linux-3.0.7/fs/notify/notification.c ---- linux-3.0.7/fs/notify/notification.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/notify/notification.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/notify/notification.c linux-3.0.8/fs/notify/notification.c +--- linux-3.0.8/fs/notify/notification.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/notify/notification.c 2011-08-23 21:47:56.000000000 -0400 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event * get set to 0 so it will never get 'freed' */ @@ -44621,9 +44983,9 @@ diff -urNp linux-3.0.7/fs/notify/notification.c linux-3.0.7/fs/notify/notificati } EXPORT_SYMBOL_GPL(fsnotify_get_cookie); -diff -urNp linux-3.0.7/fs/ntfs/dir.c linux-3.0.7/fs/ntfs/dir.c ---- linux-3.0.7/fs/ntfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ntfs/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ntfs/dir.c linux-3.0.8/fs/ntfs/dir.c +--- linux-3.0.8/fs/ntfs/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ntfs/dir.c 2011-08-23 21:47:56.000000000 -0400 @@ -1329,7 +1329,7 @@ find_next_index_buffer: ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -44633,9 +44995,9 @@ diff -urNp linux-3.0.7/fs/ntfs/dir.c linux-3.0.7/fs/ntfs/dir.c ntfs_error(sb, "Out of bounds check failed. Corrupt directory " "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; -diff -urNp linux-3.0.7/fs/ntfs/file.c linux-3.0.7/fs/ntfs/file.c ---- linux-3.0.7/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ntfs/file.c linux-3.0.8/fs/ntfs/file.c +--- linux-3.0.8/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -44645,9 +45007,9 @@ diff -urNp linux-3.0.7/fs/ntfs/file.c linux-3.0.7/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-3.0.7/fs/ocfs2/localalloc.c linux-3.0.7/fs/ocfs2/localalloc.c ---- linux-3.0.7/fs/ocfs2/localalloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/localalloc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/localalloc.c linux-3.0.8/fs/ocfs2/localalloc.c +--- linux-3.0.8/fs/ocfs2/localalloc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/localalloc.c 2011-08-23 21:47:56.000000000 -0400 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -44657,9 +45019,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/localalloc.c linux-3.0.7/fs/ocfs2/localalloc.c bail: if (handle) -diff -urNp linux-3.0.7/fs/ocfs2/namei.c linux-3.0.7/fs/ocfs2/namei.c ---- linux-3.0.7/fs/ocfs2/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/namei.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/namei.c linux-3.0.8/fs/ocfs2/namei.c +--- linux-3.0.8/fs/ocfs2/namei.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/namei.c 2011-08-23 21:48:14.000000000 -0400 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; struct ocfs2_dir_lookup_result target_insert = { NULL, }; @@ -44669,9 +45031,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/namei.c linux-3.0.7/fs/ocfs2/namei.c /* At some point it might be nice to break this function up a * bit. */ -diff -urNp linux-3.0.7/fs/ocfs2/ocfs2.h linux-3.0.7/fs/ocfs2/ocfs2.h ---- linux-3.0.7/fs/ocfs2/ocfs2.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/ocfs2.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/ocfs2.h linux-3.0.8/fs/ocfs2/ocfs2.h +--- linux-3.0.8/fs/ocfs2/ocfs2.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/ocfs2.h 2011-08-23 21:47:56.000000000 -0400 @@ -235,11 +235,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -44689,9 +45051,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/ocfs2.h linux-3.0.7/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-3.0.7/fs/ocfs2/suballoc.c linux-3.0.7/fs/ocfs2/suballoc.c ---- linux-3.0.7/fs/ocfs2/suballoc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/suballoc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/suballoc.c linux-3.0.8/fs/ocfs2/suballoc.c +--- linux-3.0.8/fs/ocfs2/suballoc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/suballoc.c 2011-08-23 21:47:56.000000000 -0400 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -44746,9 +45108,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/suballoc.c linux-3.0.7/fs/ocfs2/suballoc.c *num_clusters = res.sr_bits; } } -diff -urNp linux-3.0.7/fs/ocfs2/super.c linux-3.0.7/fs/ocfs2/super.c ---- linux-3.0.7/fs/ocfs2/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/super.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/super.c linux-3.0.8/fs/ocfs2/super.c +--- linux-3.0.8/fs/ocfs2/super.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/super.c 2011-08-23 21:47:56.000000000 -0400 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -44783,9 +45145,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/super.c linux-3.0.7/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-3.0.7/fs/ocfs2/symlink.c linux-3.0.7/fs/ocfs2/symlink.c ---- linux-3.0.7/fs/ocfs2/symlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/ocfs2/symlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/ocfs2/symlink.c linux-3.0.8/fs/ocfs2/symlink.c +--- linux-3.0.8/fs/ocfs2/symlink.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/ocfs2/symlink.c 2011-08-23 21:47:56.000000000 -0400 @@ -142,7 +142,7 @@ bail: static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -44795,9 +45157,9 @@ diff -urNp linux-3.0.7/fs/ocfs2/symlink.c linux-3.0.7/fs/ocfs2/symlink.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-3.0.7/fs/open.c linux-3.0.7/fs/open.c ---- linux-3.0.7/fs/open.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/open.c 2011-09-14 09:16:46.000000000 -0400 +diff -urNp linux-3.0.8/fs/open.c linux-3.0.8/fs/open.c +--- linux-3.0.8/fs/open.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/open.c 2011-09-14 09:16:46.000000000 -0400 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ error = locks_verify_truncate(inode, NULL, length); if (!error) @@ -44930,9 +45292,9 @@ diff -urNp linux-3.0.7/fs/open.c linux-3.0.7/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd = PTR_ERR(f); -diff -urNp linux-3.0.7/fs/partitions/ldm.c linux-3.0.7/fs/partitions/ldm.c ---- linux-3.0.7/fs/partitions/ldm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/partitions/ldm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/partitions/ldm.c linux-3.0.8/fs/partitions/ldm.c +--- linux-3.0.8/fs/partitions/ldm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/partitions/ldm.c 2011-08-23 21:48:14.000000000 -0400 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data ldm_error ("A VBLK claims to have %d parts.", num); return false; @@ -44950,9 +45312,9 @@ diff -urNp linux-3.0.7/fs/partitions/ldm.c linux-3.0.7/fs/partitions/ldm.c if (!f) { ldm_crit ("Out of memory."); return false; -diff -urNp linux-3.0.7/fs/pipe.c linux-3.0.7/fs/pipe.c ---- linux-3.0.7/fs/pipe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/pipe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/pipe.c linux-3.0.8/fs/pipe.c +--- linux-3.0.8/fs/pipe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/pipe.c 2011-08-23 21:48:14.000000000 -0400 @@ -420,9 +420,9 @@ redo: } if (bufs) /* More to do? */ @@ -45076,39 +45438,9 @@ diff -urNp linux-3.0.7/fs/pipe.c linux-3.0.7/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-3.0.7/fs/proc/Kconfig linux-3.0.7/fs/proc/Kconfig ---- linux-3.0.7/fs/proc/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/Kconfig 2011-08-23 21:48:14.000000000 -0400 -@@ -30,12 +30,12 @@ config PROC_FS - - config PROC_KCORE - bool "/proc/kcore support" if !ARM -- depends on PROC_FS && MMU -+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD - - config PROC_VMCORE - bool "/proc/vmcore support" -- depends on PROC_FS && CRASH_DUMP -- default y -+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC -+ default n - help - Exports the dump image of crashed kernel in ELF format. - -@@ -59,8 +59,8 @@ config PROC_SYSCTL - limited in memory. - - config PROC_PAGE_MONITOR -- default y -- depends on PROC_FS && MMU -+ default n -+ depends on PROC_FS && MMU && !GRKERNSEC - bool "Enable /proc page monitoring" if EXPERT - help - Various /proc files exist to monitor process memory utilization: -diff -urNp linux-3.0.7/fs/proc/array.c linux-3.0.7/fs/proc/array.c ---- linux-3.0.7/fs/proc/array.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/array.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/array.c linux-3.0.8/fs/proc/array.c +--- linux-3.0.8/fs/proc/array.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/array.c 2011-08-23 21:48:14.000000000 -0400 @@ -60,6 +60,7 @@ #include <linux/tty.h> #include <linux/string.h> @@ -45232,9 +45564,9 @@ diff -urNp linux-3.0.7/fs/proc/array.c linux-3.0.7/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-3.0.7/fs/proc/base.c linux-3.0.7/fs/proc/base.c ---- linux-3.0.7/fs/proc/base.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/fs/proc/base.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c +--- linux-3.0.8/fs/proc/base.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/fs/proc/base.c 2011-10-19 03:59:32.000000000 -0400 @@ -107,6 +107,22 @@ struct pid_entry { union proc_op op; }; @@ -45677,9 +46009,9 @@ diff -urNp linux-3.0.7/fs/proc/base.c linux-3.0.7/fs/proc/base.c ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-3.0.7/fs/proc/cmdline.c linux-3.0.7/fs/proc/cmdline.c ---- linux-3.0.7/fs/proc/cmdline.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/cmdline.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/cmdline.c linux-3.0.8/fs/proc/cmdline.c +--- linux-3.0.8/fs/proc/cmdline.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/cmdline.c 2011-08-23 21:48:14.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -45692,9 +46024,9 @@ diff -urNp linux-3.0.7/fs/proc/cmdline.c linux-3.0.7/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-3.0.7/fs/proc/devices.c linux-3.0.7/fs/proc/devices.c ---- linux-3.0.7/fs/proc/devices.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/devices.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/devices.c linux-3.0.8/fs/proc/devices.c +--- linux-3.0.8/fs/proc/devices.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/devices.c 2011-08-23 21:48:14.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -45707,9 +46039,9 @@ diff -urNp linux-3.0.7/fs/proc/devices.c linux-3.0.7/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-3.0.7/fs/proc/inode.c linux-3.0.7/fs/proc/inode.c ---- linux-3.0.7/fs/proc/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/inode.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/inode.c linux-3.0.8/fs/proc/inode.c +--- linux-3.0.8/fs/proc/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/inode.c 2011-10-19 03:59:32.000000000 -0400 @@ -18,12 +18,18 @@ #include <linux/module.h> #include <linux/sysctl.h> @@ -45755,9 +46087,9 @@ diff -urNp linux-3.0.7/fs/proc/inode.c linux-3.0.7/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-3.0.7/fs/proc/internal.h linux-3.0.7/fs/proc/internal.h ---- linux-3.0.7/fs/proc/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/internal.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/internal.h linux-3.0.8/fs/proc/internal.h +--- linux-3.0.8/fs/proc/internal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/internal.h 2011-08-23 21:48:14.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, @@ -45768,9 +46100,39 @@ diff -urNp linux-3.0.7/fs/proc/internal.h linux-3.0.7/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-3.0.7/fs/proc/kcore.c linux-3.0.7/fs/proc/kcore.c ---- linux-3.0.7/fs/proc/kcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/kcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/Kconfig linux-3.0.8/fs/proc/Kconfig +--- linux-3.0.8/fs/proc/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/Kconfig 2011-08-23 21:48:14.000000000 -0400 +@@ -30,12 +30,12 @@ config PROC_FS + + config PROC_KCORE + bool "/proc/kcore support" if !ARM +- depends on PROC_FS && MMU ++ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD + + config PROC_VMCORE + bool "/proc/vmcore support" +- depends on PROC_FS && CRASH_DUMP +- default y ++ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC ++ default n + help + Exports the dump image of crashed kernel in ELF format. + +@@ -59,8 +59,8 @@ config PROC_SYSCTL + limited in memory. + + config PROC_PAGE_MONITOR +- default y +- depends on PROC_FS && MMU ++ default n ++ depends on PROC_FS && MMU && !GRKERNSEC + bool "Enable /proc page monitoring" if EXPERT + help + Various /proc files exist to monitor process memory utilization: +diff -urNp linux-3.0.8/fs/proc/kcore.c linux-3.0.8/fs/proc/kcore.c +--- linux-3.0.8/fs/proc/kcore.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/kcore.c 2011-08-23 21:48:14.000000000 -0400 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu off_t offset = 0; struct kcore_list *m; @@ -45838,9 +46200,9 @@ diff -urNp linux-3.0.7/fs/proc/kcore.c linux-3.0.7/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-3.0.7/fs/proc/meminfo.c linux-3.0.7/fs/proc/meminfo.c ---- linux-3.0.7/fs/proc/meminfo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/meminfo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/meminfo.c linux-3.0.8/fs/proc/meminfo.c +--- linux-3.0.8/fs/proc/meminfo.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/meminfo.c 2011-08-23 21:48:14.000000000 -0400 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_ unsigned long pages[NR_LRU_LISTS]; int lru; @@ -45859,9 +46221,9 @@ diff -urNp linux-3.0.7/fs/proc/meminfo.c linux-3.0.7/fs/proc/meminfo.c #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * -diff -urNp linux-3.0.7/fs/proc/nommu.c linux-3.0.7/fs/proc/nommu.c ---- linux-3.0.7/fs/proc/nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/nommu.c linux-3.0.8/fs/proc/nommu.c +--- linux-3.0.8/fs/proc/nommu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/nommu.c 2011-08-23 21:47:56.000000000 -0400 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -45871,9 +46233,9 @@ diff -urNp linux-3.0.7/fs/proc/nommu.c linux-3.0.7/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-3.0.7/fs/proc/proc_net.c linux-3.0.7/fs/proc/proc_net.c ---- linux-3.0.7/fs/proc/proc_net.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/proc_net.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/proc_net.c linux-3.0.8/fs/proc/proc_net.c +--- linux-3.0.8/fs/proc/proc_net.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/proc_net.c 2011-08-23 21:48:14.000000000 -0400 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -45892,9 +46254,9 @@ diff -urNp linux-3.0.7/fs/proc/proc_net.c linux-3.0.7/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-3.0.7/fs/proc/proc_sysctl.c linux-3.0.7/fs/proc/proc_sysctl.c ---- linux-3.0.7/fs/proc/proc_sysctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/proc_sysctl.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/proc_sysctl.c linux-3.0.8/fs/proc/proc_sysctl.c +--- linux-3.0.8/fs/proc/proc_sysctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/proc_sysctl.c 2011-10-19 03:59:32.000000000 -0400 @@ -8,11 +8,13 @@ #include <linux/namei.h> #include "internal.h" @@ -45972,9 +46334,9 @@ diff -urNp linux-3.0.7/fs/proc/proc_sysctl.c linux-3.0.7/fs/proc/proc_sysctl.c .lookup = proc_sys_lookup, .permission = proc_sys_permission, .setattr = proc_sys_setattr, -diff -urNp linux-3.0.7/fs/proc/root.c linux-3.0.7/fs/proc/root.c ---- linux-3.0.7/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/root.c linux-3.0.8/fs/proc/root.c +--- linux-3.0.8/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400 @@ -123,7 +123,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -45991,9 +46353,9 @@ diff -urNp linux-3.0.7/fs/proc/root.c linux-3.0.7/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-3.0.7/fs/proc/task_mmu.c linux-3.0.7/fs/proc/task_mmu.c ---- linux-3.0.7/fs/proc/task_mmu.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/fs/proc/task_mmu.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/task_mmu.c linux-3.0.8/fs/proc/task_mmu.c +--- linux-3.0.8/fs/proc/task_mmu.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/fs/proc/task_mmu.c 2011-10-16 21:55:28.000000000 -0400 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -46133,9 +46495,9 @@ diff -urNp linux-3.0.7/fs/proc/task_mmu.c linux-3.0.7/fs/proc/task_mmu.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-3.0.7/fs/proc/task_nommu.c linux-3.0.7/fs/proc/task_nommu.c ---- linux-3.0.7/fs/proc/task_nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/proc/task_nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/proc/task_nommu.c linux-3.0.8/fs/proc/task_nommu.c +--- linux-3.0.8/fs/proc/task_nommu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/proc/task_nommu.c 2011-08-23 21:47:56.000000000 -0400 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -46154,9 +46516,9 @@ diff -urNp linux-3.0.7/fs/proc/task_nommu.c linux-3.0.7/fs/proc/task_nommu.c } else if (mm) { if (vma->vm_start <= mm->start_stack && vma->vm_end >= mm->start_stack) { -diff -urNp linux-3.0.7/fs/quota/netlink.c linux-3.0.7/fs/quota/netlink.c ---- linux-3.0.7/fs/quota/netlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/quota/netlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/quota/netlink.c linux-3.0.8/fs/quota/netlink.c +--- linux-3.0.8/fs/quota/netlink.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/quota/netlink.c 2011-08-23 21:47:56.000000000 -0400 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam void quota_send_warning(short type, unsigned int id, dev_t dev, const char warntype) @@ -46175,9 +46537,9 @@ diff -urNp linux-3.0.7/fs/quota/netlink.c linux-3.0.7/fs/quota/netlink.c "a_genl_family, 0, QUOTA_NL_C_WARNING); if (!msg_head) { printk(KERN_ERR -diff -urNp linux-3.0.7/fs/readdir.c linux-3.0.7/fs/readdir.c ---- linux-3.0.7/fs/readdir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/readdir.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/readdir.c linux-3.0.8/fs/readdir.c +--- linux-3.0.8/fs/readdir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/readdir.c 2011-10-06 04:17:55.000000000 -0400 @@ -17,6 +17,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -46276,9 +46638,9 @@ diff -urNp linux-3.0.7/fs/readdir.c linux-3.0.7/fs/readdir.c if (__put_user(d_off, &lastdirent->d_off)) error = -EFAULT; else -diff -urNp linux-3.0.7/fs/reiserfs/dir.c linux-3.0.7/fs/reiserfs/dir.c ---- linux-3.0.7/fs/reiserfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/dir.c linux-3.0.8/fs/reiserfs/dir.c +--- linux-3.0.8/fs/reiserfs/dir.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/dir.c 2011-08-23 21:48:14.000000000 -0400 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr struct reiserfs_dir_entry de; int ret = 0; @@ -46288,9 +46650,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/dir.c linux-3.0.7/fs/reiserfs/dir.c reiserfs_write_lock(inode->i_sb); reiserfs_check_lock_depth(inode->i_sb, "readdir"); -diff -urNp linux-3.0.7/fs/reiserfs/do_balan.c linux-3.0.7/fs/reiserfs/do_balan.c ---- linux-3.0.7/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/do_balan.c linux-3.0.8/fs/reiserfs/do_balan.c +--- linux-3.0.8/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -46300,9 +46662,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/do_balan.c linux-3.0.7/fs/reiserfs/do_balan.c do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-3.0.7/fs/reiserfs/journal.c linux-3.0.7/fs/reiserfs/journal.c ---- linux-3.0.7/fs/reiserfs/journal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/journal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/journal.c linux-3.0.8/fs/reiserfs/journal.c +--- linux-3.0.8/fs/reiserfs/journal.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/journal.c 2011-08-23 21:48:14.000000000 -0400 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea struct buffer_head *bh; int i, j; @@ -46312,9 +46674,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/journal.c linux-3.0.7/fs/reiserfs/journal.c bh = __getblk(dev, block, bufsize); if (buffer_uptodate(bh)) return (bh); -diff -urNp linux-3.0.7/fs/reiserfs/namei.c linux-3.0.7/fs/reiserfs/namei.c ---- linux-3.0.7/fs/reiserfs/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/namei.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/namei.c linux-3.0.8/fs/reiserfs/namei.c +--- linux-3.0.8/fs/reiserfs/namei.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/namei.c 2011-08-23 21:48:14.000000000 -0400 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode unsigned long savelink = 1; struct timespec ctime; @@ -46324,9 +46686,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/namei.c linux-3.0.7/fs/reiserfs/namei.c /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion stat data updates: (1) old directory, -diff -urNp linux-3.0.7/fs/reiserfs/procfs.c linux-3.0.7/fs/reiserfs/procfs.c ---- linux-3.0.7/fs/reiserfs/procfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/procfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/procfs.c linux-3.0.8/fs/reiserfs/procfs.c +--- linux-3.0.8/fs/reiserfs/procfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/procfs.c 2011-08-23 21:48:14.000000000 -0400 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -46345,9 +46707,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/procfs.c linux-3.0.7/fs/reiserfs/procfs.c seq_printf(m, /* on-disk fields */ "jp_journal_1st_block: \t%i\n" "jp_journal_dev: \t%s[%x]\n" -diff -urNp linux-3.0.7/fs/reiserfs/stree.c linux-3.0.7/fs/reiserfs/stree.c ---- linux-3.0.7/fs/reiserfs/stree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/stree.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/stree.c linux-3.0.8/fs/reiserfs/stree.c +--- linux-3.0.8/fs/reiserfs/stree.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/stree.c 2011-08-23 21:48:14.000000000 -0400 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs int iter = 0; #endif @@ -46393,9 +46755,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/stree.c linux-3.0.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); if (inode) { /* Do we count quotas for item? */ -diff -urNp linux-3.0.7/fs/reiserfs/super.c linux-3.0.7/fs/reiserfs/super.c ---- linux-3.0.7/fs/reiserfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/reiserfs/super.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/reiserfs/super.c linux-3.0.8/fs/reiserfs/super.c +--- linux-3.0.8/fs/reiserfs/super.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/reiserfs/super.c 2011-08-23 21:48:14.000000000 -0400 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct {.option_name = NULL} }; @@ -46405,9 +46767,9 @@ diff -urNp linux-3.0.7/fs/reiserfs/super.c linux-3.0.7/fs/reiserfs/super.c *blocks = 0; if (!options || !*options) /* use default configuration: create tails, journaling on, no -diff -urNp linux-3.0.7/fs/select.c linux-3.0.7/fs/select.c ---- linux-3.0.7/fs/select.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/select.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/select.c linux-3.0.8/fs/select.c +--- linux-3.0.8/fs/select.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/select.c 2011-08-23 21:48:14.000000000 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -46444,9 +46806,9 @@ diff -urNp linux-3.0.7/fs/select.c linux-3.0.7/fs/select.c if (nfds > rlimit(RLIMIT_NOFILE)) return -EINVAL; -diff -urNp linux-3.0.7/fs/seq_file.c linux-3.0.7/fs/seq_file.c ---- linux-3.0.7/fs/seq_file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/seq_file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/seq_file.c linux-3.0.8/fs/seq_file.c +--- linux-3.0.8/fs/seq_file.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/seq_file.c 2011-08-23 21:47:56.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -46496,9 +46858,9 @@ diff -urNp linux-3.0.7/fs/seq_file.c linux-3.0.7/fs/seq_file.c int res = -ENOMEM; if (op) { -diff -urNp linux-3.0.7/fs/splice.c linux-3.0.7/fs/splice.c ---- linux-3.0.7/fs/splice.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/splice.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/fs/splice.c linux-3.0.8/fs/splice.c +--- linux-3.0.8/fs/splice.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/splice.c 2011-10-06 04:17:55.000000000 -0400 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -46664,9 +47026,9 @@ diff -urNp linux-3.0.7/fs/splice.c linux-3.0.7/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-3.0.7/fs/sysfs/file.c linux-3.0.7/fs/sysfs/file.c ---- linux-3.0.7/fs/sysfs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/sysfs/file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/sysfs/file.c linux-3.0.8/fs/sysfs/file.c +--- linux-3.0.8/fs/sysfs/file.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/sysfs/file.c 2011-08-23 21:47:56.000000000 -0400 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent struct sysfs_open_dirent { @@ -46712,9 +47074,9 @@ diff -urNp linux-3.0.7/fs/sysfs/file.c linux-3.0.7/fs/sysfs/file.c wake_up_interruptible(&od->poll); } -diff -urNp linux-3.0.7/fs/sysfs/mount.c linux-3.0.7/fs/sysfs/mount.c ---- linux-3.0.7/fs/sysfs/mount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/sysfs/mount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/sysfs/mount.c linux-3.0.8/fs/sysfs/mount.c +--- linux-3.0.8/fs/sysfs/mount.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/sysfs/mount.c 2011-08-23 21:48:14.000000000 -0400 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { .s_name = "", .s_count = ATOMIC_INIT(1), @@ -46727,9 +47089,9 @@ diff -urNp linux-3.0.7/fs/sysfs/mount.c linux-3.0.7/fs/sysfs/mount.c .s_ino = 1, }; -diff -urNp linux-3.0.7/fs/sysfs/symlink.c linux-3.0.7/fs/sysfs/symlink.c ---- linux-3.0.7/fs/sysfs/symlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/sysfs/symlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/sysfs/symlink.c linux-3.0.8/fs/sysfs/symlink.c +--- linux-3.0.8/fs/sysfs/symlink.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/sysfs/symlink.c 2011-08-23 21:47:56.000000000 -0400 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -46739,9 +47101,9 @@ diff -urNp linux-3.0.7/fs/sysfs/symlink.c linux-3.0.7/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-3.0.7/fs/udf/inode.c linux-3.0.7/fs/udf/inode.c ---- linux-3.0.7/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/udf/inode.c linux-3.0.8/fs/udf/inode.c +--- linux-3.0.8/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk( int goal = 0, pgoal = iinfo->i_location.logicalBlockNum; int lastblock = 0; @@ -46751,9 +47113,9 @@ diff -urNp linux-3.0.7/fs/udf/inode.c linux-3.0.7/fs/udf/inode.c prev_epos.offset = udf_file_entry_alloc_offset(inode); prev_epos.block = iinfo->i_location; prev_epos.bh = NULL; -diff -urNp linux-3.0.7/fs/udf/misc.c linux-3.0.7/fs/udf/misc.c ---- linux-3.0.7/fs/udf/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/udf/misc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/udf/misc.c linux-3.0.8/fs/udf/misc.c +--- linux-3.0.8/fs/udf/misc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/udf/misc.c 2011-08-23 21:47:56.000000000 -0400 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id u8 udf_tag_checksum(const struct tag *t) @@ -46763,9 +47125,9 @@ diff -urNp linux-3.0.7/fs/udf/misc.c linux-3.0.7/fs/udf/misc.c u8 checksum = 0; int i; for (i = 0; i < sizeof(struct tag); ++i) -diff -urNp linux-3.0.7/fs/utimes.c linux-3.0.7/fs/utimes.c ---- linux-3.0.7/fs/utimes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/utimes.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/utimes.c linux-3.0.8/fs/utimes.c +--- linux-3.0.8/fs/utimes.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/utimes.c 2011-08-23 21:48:14.000000000 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -46787,9 +47149,23 @@ diff -urNp linux-3.0.7/fs/utimes.c linux-3.0.7/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-3.0.7/fs/xattr.c linux-3.0.7/fs/xattr.c ---- linux-3.0.7/fs/xattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xattr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/fs/xattr_acl.c linux-3.0.8/fs/xattr_acl.c +--- linux-3.0.8/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400 +@@ -17,8 +17,8 @@ + struct posix_acl * + posix_acl_from_xattr(const void *value, size_t size) + { +- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; +- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end; ++ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value; ++ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end; + int count; + struct posix_acl *acl; + struct posix_acl_entry *acl_e; +diff -urNp linux-3.0.8/fs/xattr.c linux-3.0.8/fs/xattr.c +--- linux-3.0.8/fs/xattr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xattr.c 2011-08-23 21:48:14.000000000 -0400 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -46852,23 +47228,20 @@ diff -urNp linux-3.0.7/fs/xattr.c linux-3.0.7/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-3.0.7/fs/xattr_acl.c linux-3.0.7/fs/xattr_acl.c ---- linux-3.0.7/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400 -@@ -17,8 +17,8 @@ - struct posix_acl * - posix_acl_from_xattr(const void *value, size_t size) - { -- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; -- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end; -+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value; -+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end; - int count; - struct posix_acl *acl; - struct posix_acl_entry *acl_e; -diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400 +@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( + xfs_fsop_geom_t fsgeo; + int error; + ++ memset(&fsgeo, 0, sizeof(fsgeo)); + error = xfs_fs_geometry(mp, &fsgeo, 3); + if (error) + return -error; +diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-08-23 21:47:56.000000000 -0400 @@ -128,7 +128,7 @@ xfs_find_handle( } @@ -46878,20 +47251,9 @@ diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.7/fs/xfs/linux-2.6 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400 -@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( - xfs_fsop_geom_t fsgeo; - int error; - -+ memset(&fsgeo, 0, sizeof(fsgeo)); - error = xfs_fs_geometry(mp, &fsgeo, 3); - if (error) - return -error; -diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c ---- linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c +--- linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c 2011-08-23 21:47:56.000000000 -0400 @@ -437,7 +437,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -46901,9 +47263,9 @@ diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.7/fs/xfs/linux-2.6/ if (!IS_ERR(s)) kfree(s); -diff -urNp linux-3.0.7/fs/xfs/xfs_bmap.c linux-3.0.7/fs/xfs/xfs_bmap.c ---- linux-3.0.7/fs/xfs/xfs_bmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xfs/xfs_bmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/xfs/xfs_bmap.c linux-3.0.8/fs/xfs/xfs_bmap.c +--- linux-3.0.8/fs/xfs/xfs_bmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xfs/xfs_bmap.c 2011-08-23 21:47:56.000000000 -0400 @@ -253,7 +253,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -46913,9 +47275,9 @@ diff -urNp linux-3.0.7/fs/xfs/xfs_bmap.c linux-3.0.7/fs/xfs/xfs_bmap.c #endif /* DEBUG */ STATIC int -diff -urNp linux-3.0.7/fs/xfs/xfs_dir2_sf.c linux-3.0.7/fs/xfs/xfs_dir2_sf.c ---- linux-3.0.7/fs/xfs/xfs_dir2_sf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/fs/xfs/xfs_dir2_sf.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/fs/xfs/xfs_dir2_sf.c linux-3.0.8/fs/xfs/xfs_dir2_sf.c +--- linux-3.0.8/fs/xfs/xfs_dir2_sf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/fs/xfs/xfs_dir2_sf.c 2011-08-23 21:47:56.000000000 -0400 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( } @@ -46933,1091 +47295,118 @@ diff -urNp linux-3.0.7/fs/xfs/xfs_dir2_sf.c linux-3.0.7/fs/xfs/xfs_dir2_sf.c off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset = off & 0x7fffffff; return 0; -diff -urNp linux-3.0.7/grsecurity/Kconfig linux-3.0.7/grsecurity/Kconfig ---- linux-3.0.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/Kconfig 2011-09-15 00:00:57.000000000 -0400 -@@ -0,0 +1,1038 @@ -+# -+# grecurity configuration -+# -+ -+menu "Grsecurity" -+ -+config GRKERNSEC -+ bool "Grsecurity" -+ select CRYPTO -+ select CRYPTO_SHA256 -+ help -+ If you say Y here, you will be able to configure many features -+ that will enhance the security of your system. It is highly -+ recommended that you say Y here and read through the help -+ for each option so that you fully understand the features and -+ can evaluate their usefulness for your machine. -+ -+choice -+ prompt "Security Level" -+ depends on GRKERNSEC -+ default GRKERNSEC_CUSTOM -+ -+config GRKERNSEC_LOW -+ bool "Low" -+ select GRKERNSEC_LINK -+ select GRKERNSEC_FIFO -+ select GRKERNSEC_RANDNET -+ select GRKERNSEC_DMESG -+ select GRKERNSEC_CHROOT -+ select GRKERNSEC_CHROOT_CHDIR -+ -+ help -+ If you choose this option, several of the grsecurity options will -+ be enabled that will give you greater protection against a number -+ of attacks, while assuring that none of your software will have any -+ conflicts with the additional security measures. If you run a lot -+ of unusual software, or you are having problems with the higher -+ security levels, you should say Y here. With this option, the -+ following features are enabled: -+ -+ - Linking restrictions -+ - FIFO restrictions -+ - Restricted dmesg -+ - Enforced chdir("/") on chroot -+ - Runtime module disabling -+ -+config GRKERNSEC_MEDIUM -+ bool "Medium" -+ select PAX -+ select PAX_EI_PAX -+ select PAX_PT_PAX_FLAGS -+ select PAX_HAVE_ACL_FLAGS -+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR) -+ select GRKERNSEC_CHROOT -+ select GRKERNSEC_CHROOT_SYSCTL -+ select GRKERNSEC_LINK -+ select GRKERNSEC_FIFO -+ select GRKERNSEC_DMESG -+ select GRKERNSEC_RANDNET -+ select GRKERNSEC_FORKFAIL -+ select GRKERNSEC_TIME -+ select GRKERNSEC_SIGNAL -+ select GRKERNSEC_CHROOT -+ select GRKERNSEC_CHROOT_UNIX -+ select GRKERNSEC_CHROOT_MOUNT -+ select GRKERNSEC_CHROOT_PIVOT -+ select GRKERNSEC_CHROOT_DOUBLE -+ select GRKERNSEC_CHROOT_CHDIR -+ select GRKERNSEC_CHROOT_MKNOD -+ select GRKERNSEC_PROC -+ select GRKERNSEC_PROC_USERGROUP -+ select PAX_RANDUSTACK -+ select PAX_ASLR -+ select PAX_RANDMMAP -+ select PAX_REFCOUNT if (X86 || SPARC64) -+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB)) -+ -+ help -+ If you say Y here, several features in addition to those included -+ in the low additional security level will be enabled. These -+ features provide even more security to your system, though in rare -+ cases they may be incompatible with very old or poorly written -+ software. If you enable this option, make sure that your auth -+ service (identd) is running as gid 1001. With this option, -+ the following features (in addition to those provided in the -+ low additional security level) will be enabled: -+ -+ - Failed fork logging -+ - Time change logging -+ - Signal logging -+ - Deny mounts in chroot -+ - Deny double chrooting -+ - Deny sysctl writes in chroot -+ - Deny mknod in chroot -+ - Deny access to abstract AF_UNIX sockets out of chroot -+ - Deny pivot_root in chroot -+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port -+ - /proc restrictions with special GID set to 10 (usually wheel) -+ - Address Space Layout Randomization (ASLR) -+ - Prevent exploitation of most refcount overflows -+ - Bounds checking of copying between the kernel and userland -+ -+config GRKERNSEC_HIGH -+ bool "High" -+ select GRKERNSEC_LINK -+ select GRKERNSEC_FIFO -+ select GRKERNSEC_DMESG -+ select GRKERNSEC_FORKFAIL -+ select GRKERNSEC_TIME -+ select GRKERNSEC_SIGNAL -+ select GRKERNSEC_CHROOT -+ select GRKERNSEC_CHROOT_SHMAT -+ select GRKERNSEC_CHROOT_UNIX -+ select GRKERNSEC_CHROOT_MOUNT -+ select GRKERNSEC_CHROOT_FCHDIR -+ select GRKERNSEC_CHROOT_PIVOT -+ select GRKERNSEC_CHROOT_DOUBLE -+ select GRKERNSEC_CHROOT_CHDIR -+ select GRKERNSEC_CHROOT_MKNOD -+ select GRKERNSEC_CHROOT_CAPS -+ select GRKERNSEC_CHROOT_SYSCTL -+ select GRKERNSEC_CHROOT_FINDTASK -+ select GRKERNSEC_SYSFS_RESTRICT -+ select GRKERNSEC_PROC -+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR) -+ select GRKERNSEC_HIDESYM -+ select GRKERNSEC_BRUTE -+ select GRKERNSEC_PROC_USERGROUP -+ select GRKERNSEC_KMEM -+ select GRKERNSEC_RESLOG -+ select GRKERNSEC_RANDNET -+ select GRKERNSEC_PROC_ADD -+ select GRKERNSEC_CHROOT_CHMOD -+ select GRKERNSEC_CHROOT_NICE -+ select GRKERNSEC_AUDIT_MOUNT -+ select GRKERNSEC_MODHARDEN if (MODULES) -+ select GRKERNSEC_HARDEN_PTRACE -+ select GRKERNSEC_VM86 if (X86_32) -+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC) -+ select PAX -+ select PAX_RANDUSTACK -+ select PAX_ASLR -+ select PAX_RANDMMAP -+ select PAX_NOEXEC -+ select PAX_MPROTECT -+ select PAX_EI_PAX -+ select PAX_PT_PAX_FLAGS -+ select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) -+ select PAX_MEMORY_UDEREF if (X86 && !XEN) -+ select PAX_RANDKSTACK if (X86_TSC && X86) -+ select PAX_SEGMEXEC if (X86_32) -+ select PAX_PAGEEXEC -+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC) -+ 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 || PPC || SPARC || ARM) && (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 -+ against your system. The heightened security comes at a cost -+ of an increased chance of incompatibilities with rare software -+ on your machine. Since this security level enables PaX, you should -+ view <http://pax.grsecurity.net> and read about the PaX -+ project. While you are there, download chpax and run it on -+ binaries that cause problems with PaX. Also remember that -+ since the /proc restrictions are enabled, you must run your -+ identd as gid 1001. This security level enables the following -+ features in addition to those listed in the low and medium -+ security levels: -+ -+ - Additional /proc restrictions -+ - Chmod restrictions in chroot -+ - No signals, ptrace, or viewing of processes outside of chroot -+ - Capability restrictions in chroot -+ - Deny fchdir out of chroot -+ - Priority restrictions in chroot -+ - Segmentation-based implementation of PaX -+ - Mprotect restrictions -+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat] -+ - Kernel stack randomization -+ - Mount/unmount/remount logging -+ - Kernel symbol hiding -+ - Prevention of memory exhaustion-based exploits -+ - Hardening of module auto-loading -+ - Ptrace restrictions -+ - Restricted vm86 mode -+ - Restricted sysfs/debugfs -+ - Active kernel exploit response -+ -+config GRKERNSEC_CUSTOM -+ bool "Custom" -+ help -+ If you say Y here, you will be able to configure every grsecurity -+ option, which allows you to enable many more features that aren't -+ covered in the basic security levels. These additional features -+ include TPE, socket restrictions, and the sysctl system for -+ grsecurity. It is advised that you read through the help for -+ each option to determine its usefulness in your situation. -+ -+endchoice -+ -+menu "Address Space Protection" -+depends on GRKERNSEC -+ -+config GRKERNSEC_KMEM -+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port" -+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390) -+ help -+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to -+ be written to via mmap or otherwise to modify the running kernel. -+ /dev/port will also not be allowed to be opened. If you have module -+ support disabled, enabling this will close up four ways that are -+ currently used to insert malicious code into the running kernel. -+ Even with all these features enabled, we still highly recommend that -+ you use the RBAC system, as it is still possible for an attacker to -+ modify the running kernel through privileged I/O granted by ioperm/iopl. -+ If you are not using XFree86, you may be able to stop this additional -+ case by enabling the 'Disable privileged I/O' option. Though nothing -+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem, -+ but only to video memory, which is the only writing we allow in this -+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will -+ not be allowed to mprotect it with PROT_WRITE later. -+ It is highly recommended that you say Y here if you meet all the -+ conditions above. -+ -+config GRKERNSEC_VM86 -+ bool "Restrict VM86 mode" -+ depends on X86_32 -+ -+ help -+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to -+ make use of a special execution mode on 32bit x86 processors called -+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain -+ video cards and will still work with this option enabled. The purpose -+ of the option is to prevent exploitation of emulation errors in -+ virtualization of vm86 mode like the one discovered in VMWare in 2009. -+ Nearly all users should be able to enable this option. -+ -+config GRKERNSEC_IO -+ bool "Disable privileged I/O" -+ depends on X86 -+ select RTC_CLASS -+ select RTC_INTF_DEV -+ select RTC_DRV_CMOS -+ -+ help -+ If you say Y here, all ioperm and iopl calls will return an error. -+ Ioperm and iopl can be used to modify the running kernel. -+ Unfortunately, some programs need this access to operate properly, -+ the most notable of which are XFree86 and hwclock. hwclock can be -+ remedied by having RTC support in the kernel, so real-time -+ clock support is enabled if this option is enabled, to ensure -+ that hwclock operates correctly. XFree86 still will not -+ operate correctly with this option enabled, so DO NOT CHOOSE Y -+ IF YOU USE XFree86. If you use XFree86 and you still want to -+ protect your kernel against modification, use the RBAC system. -+ -+config GRKERNSEC_PROC_MEMMAP -+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]" -+ default y if (PAX_NOEXEC || PAX_ASLR) -+ depends on PAX_NOEXEC || PAX_ASLR -+ help -+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will -+ give no information about the addresses of its mappings if -+ PaX features that rely on random addresses are enabled on the task. -+ If you use PaX it is greatly recommended that you say Y here as it -+ closes up a hole that makes the full ASLR useless for suid -+ binaries. -+ -+config GRKERNSEC_BRUTE -+ bool "Deter exploit bruteforcing" -+ help -+ If you say Y here, attempts to bruteforce exploits against forking -+ daemons such as apache or sshd, as well as against suid/sgid binaries -+ will be deterred. When a child of a forking daemon is killed by PaX -+ or crashes due to an illegal instruction or other suspicious signal, -+ the parent process will be delayed 30 seconds upon every subsequent -+ fork until the administrator is able to assess the situation and -+ restart the daemon. -+ In the suid/sgid case, the attempt is logged, the user has all their -+ processes terminated, and they are prevented from executing any further -+ processes for 15 minutes. -+ It is recommended that you also enable signal logging in the auditing -+ section so that logs are generated when a process triggers a suspicious -+ signal. -+ If the sysctl option is enabled, a sysctl option with name -+ "deter_bruteforce" is created. -+ -+ -+config GRKERNSEC_MODHARDEN -+ bool "Harden module auto-loading" -+ depends on MODULES -+ help -+ If you say Y here, module auto-loading in response to use of some -+ feature implemented by an unloaded module will be restricted to -+ root users. Enabling this option helps defend against attacks -+ by unprivileged users who abuse the auto-loading behavior to -+ cause a vulnerable module to load that is then exploited. -+ -+ If this option prevents a legitimate use of auto-loading for a -+ non-root user, the administrator can execute modprobe manually -+ with the exact name of the module mentioned in the alert log. -+ Alternatively, the administrator can add the module to the list -+ of modules loaded at boot by modifying init scripts. -+ -+ Modification of init scripts will most likely be needed on -+ Ubuntu servers with encrypted home directory support enabled, -+ as the first non-root user logging in will cause the ecb(aes), -+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded. -+ -+config GRKERNSEC_HIDESYM -+ bool "Hide kernel symbols" -+ help -+ If you say Y here, getting information on loaded modules, and -+ displaying all kernel symbols through a syscall will be restricted -+ to users with CAP_SYS_MODULE. For software compatibility reasons, -+ /proc/kallsyms will be restricted to the root user. The RBAC -+ system can hide that entry even from root. -+ -+ This option also prevents leaking of kernel addresses through -+ several /proc entries. -+ -+ Note that this option is only effective provided the following -+ conditions are met: -+ 1) The kernel using grsecurity is not precompiled by some distribution -+ 2) You have also enabled GRKERNSEC_DMESG -+ 3) You are using the RBAC system and hiding other files such as your -+ kernel image and System.map. Alternatively, enabling this option -+ causes the permissions on /boot, /lib/modules, and the kernel -+ source directory to change at compile time to prevent -+ reading by non-root users. -+ If the above conditions are met, this option will aid in providing a -+ useful protection against local kernel exploitation of overflows -+ and arbitrary read/write vulnerabilities. -+ -+config GRKERNSEC_KERN_LOCKOUT -+ bool "Active kernel exploit response" -+ depends on X86 || ARM || PPC || SPARC -+ help -+ If you say Y here, when a PaX alert is triggered due to suspicious -+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY) -+ or an OOPs occurs due to bad memory accesses, instead of just -+ terminating the offending process (and potentially allowing -+ a subsequent exploit from the same user), we will take one of two -+ actions: -+ If the user was root, we will panic the system -+ If the user was non-root, we will log the attempt, terminate -+ all processes owned by the user, then prevent them from creating -+ any new processes until the system is restarted -+ This deters repeated kernel exploitation/bruteforcing attempts -+ and is useful for later forensics. -+ -+endmenu -+menu "Role Based Access Control Options" -+depends on GRKERNSEC -+ -+config GRKERNSEC_RBAC_DEBUG -+ bool -+ -+config GRKERNSEC_NO_RBAC -+ bool "Disable RBAC system" -+ help -+ If you say Y here, the /dev/grsec device will be removed from the kernel, -+ preventing the RBAC system from being enabled. You should only say Y -+ here if you have no intention of using the RBAC system, so as to prevent -+ an attacker with root access from misusing the RBAC system to hide files -+ and processes when loadable module support and /dev/[k]mem have been -+ locked down. -+ -+config GRKERNSEC_ACL_HIDEKERN -+ bool "Hide kernel processes" -+ help -+ If you say Y here, all kernel threads will be hidden to all -+ processes but those whose subject has the "view hidden processes" -+ flag. -+ -+config GRKERNSEC_ACL_MAXTRIES -+ int "Maximum tries before password lockout" -+ default 3 -+ help -+ This option enforces the maximum number of times a user can attempt -+ to authorize themselves with the grsecurity RBAC system before being -+ denied the ability to attempt authorization again for a specified time. -+ The lower the number, the harder it will be to brute-force a password. -+ -+config GRKERNSEC_ACL_TIMEOUT -+ int "Time to wait after max password tries, in seconds" -+ default 30 -+ help -+ This option specifies the time the user must wait after attempting to -+ authorize to the RBAC system with the maximum number of invalid -+ passwords. The higher the number, the harder it will be to brute-force -+ a password. -+ -+endmenu -+menu "Filesystem Protections" -+depends on GRKERNSEC -+ -+config GRKERNSEC_PROC -+ bool "Proc restrictions" -+ help -+ If you say Y here, the permissions of the /proc filesystem -+ will be altered to enhance system security and privacy. You MUST -+ choose either a user only restriction or a user and group restriction. -+ Depending upon the option you choose, you can either restrict users to -+ see only the processes they themselves run, or choose a group that can -+ view all processes and files normally restricted to root if you choose -+ the "restrict to user only" option. NOTE: If you're running identd as -+ a non-root user, you will have to run it as the group you specify here. -+ -+config GRKERNSEC_PROC_USER -+ bool "Restrict /proc to user only" -+ depends on GRKERNSEC_PROC -+ help -+ If you say Y here, non-root users will only be able to view their own -+ processes, and restricts them from viewing network-related information, -+ and viewing kernel symbol and module information. -+ -+config GRKERNSEC_PROC_USERGROUP -+ bool "Allow special group" -+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER -+ help -+ If you say Y here, you will be able to select a group that will be -+ able to view all processes and network-related information. If you've -+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still -+ remain hidden. This option is useful if you want to run identd as -+ a non-root user. -+ -+config GRKERNSEC_PROC_GID -+ int "GID for special group" -+ depends on GRKERNSEC_PROC_USERGROUP -+ default 1001 -+ -+config GRKERNSEC_PROC_ADD -+ bool "Additional restrictions" -+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP -+ help -+ If you say Y here, additional restrictions will be placed on -+ /proc that keep normal users from viewing device information and -+ slabinfo information that could be useful for exploits. -+ -+config GRKERNSEC_LINK -+ bool "Linking restrictions" -+ help -+ If you say Y here, /tmp race exploits will be prevented, since users -+ will no longer be able to follow symlinks owned by other users in -+ world-writable +t directories (e.g. /tmp), unless the owner of the -+ symlink is the owner of the directory. users will also not be -+ able to hardlink to files they do not own. If the sysctl option is -+ enabled, a sysctl option with name "linking_restrictions" is created. -+ -+config GRKERNSEC_FIFO -+ bool "FIFO restrictions" -+ help -+ If you say Y here, users will not be able to write to FIFOs they don't -+ own in world-writable +t directories (e.g. /tmp), unless the owner of -+ the FIFO is the same owner of the directory it's held in. If the sysctl -+ option is enabled, a sysctl option with name "fifo_restrictions" is -+ created. -+ -+config GRKERNSEC_SYSFS_RESTRICT -+ bool "Sysfs/debugfs restriction" -+ depends on SYSFS -+ help -+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and -+ any filesystem normally mounted under it (e.g. debugfs) will only -+ be accessible by root. These filesystems generally provide access -+ to hardware and debug information that isn't appropriate for unprivileged -+ users of the system. Sysfs and debugfs have also become a large source -+ of new vulnerabilities, ranging from infoleaks to local compromise. -+ There has been very little oversight with an eye toward security involved -+ in adding new exporters of information to these filesystems, so their -+ use is discouraged. -+ This option is equivalent to a chmod 0700 of the mount paths. -+ -+config GRKERNSEC_ROFS -+ bool "Runtime read-only mount protection" -+ help -+ If you say Y here, a sysctl option with name "romount_protect" will -+ be created. By setting this option to 1 at runtime, filesystems -+ will be protected in the following ways: -+ * No new writable mounts will be allowed -+ * Existing read-only mounts won't be able to be remounted read/write -+ * Write operations will be denied on all block devices -+ This option acts independently of grsec_lock: once it is set to 1, -+ it cannot be turned off. Therefore, please be mindful of the resulting -+ behavior if this option is enabled in an init script on a read-only -+ filesystem. This feature is mainly intended for secure embedded systems. -+ -+config GRKERNSEC_CHROOT -+ bool "Chroot jail restrictions" -+ help -+ If you say Y here, you will be able to choose several options that will -+ make breaking out of a chrooted jail much more difficult. If you -+ encounter no software incompatibilities with the following options, it -+ is recommended that you enable each one. -+ -+config GRKERNSEC_CHROOT_MOUNT -+ bool "Deny mounts" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to -+ mount or remount filesystems. If the sysctl option is enabled, a -+ sysctl option with name "chroot_deny_mount" is created. -+ -+config GRKERNSEC_CHROOT_DOUBLE -+ bool "Deny double-chroots" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to chroot -+ again outside the chroot. This is a widely used method of breaking -+ out of a chroot jail and should not be allowed. If the sysctl -+ option is enabled, a sysctl option with name -+ "chroot_deny_chroot" is created. -+ -+config GRKERNSEC_CHROOT_PIVOT -+ bool "Deny pivot_root in chroot" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to use -+ a function called pivot_root() that was introduced in Linux 2.3.41. It -+ works similar to chroot in that it changes the root filesystem. This -+ function could be misused in a chrooted process to attempt to break out -+ of the chroot, and therefore should not be allowed. If the sysctl -+ option is enabled, a sysctl option with name "chroot_deny_pivot" is -+ created. -+ -+config GRKERNSEC_CHROOT_CHDIR -+ bool "Enforce chdir(\"/\") on all chroots" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, the current working directory of all newly-chrooted -+ applications will be set to the the root directory of the chroot. -+ The man page on chroot(2) states: -+ Note that this call does not change the current working -+ directory, so that `.' can be outside the tree rooted at -+ `/'. In particular, the super-user can escape from a -+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'. -+ -+ It is recommended that you say Y here, since it's not known to break -+ any software. If the sysctl option is enabled, a sysctl option with -+ name "chroot_enforce_chdir" is created. -+ -+config GRKERNSEC_CHROOT_CHMOD -+ bool "Deny (f)chmod +s" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to chmod -+ or fchmod files to make them have suid or sgid bits. This protects -+ against another published method of breaking a chroot. If the sysctl -+ option is enabled, a sysctl option with name "chroot_deny_chmod" is -+ created. -+ -+config GRKERNSEC_CHROOT_FCHDIR -+ bool "Deny fchdir out of chroot" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, a well-known method of breaking chroots by fchdir'ing -+ to a file descriptor of the chrooting process that points to a directory -+ outside the filesystem will be stopped. If the sysctl option -+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created. -+ -+config GRKERNSEC_CHROOT_MKNOD -+ bool "Deny mknod" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be allowed to -+ mknod. The problem with using mknod inside a chroot is that it -+ would allow an attacker to create a device entry that is the same -+ as one on the physical root of your system, which could range from -+ anything from the console device to a device for your harddrive (which -+ they could then use to wipe the drive or steal data). It is recommended -+ that you say Y here, unless you run into software incompatibilities. -+ If the sysctl option is enabled, a sysctl option with name -+ "chroot_deny_mknod" is created. -+ -+config GRKERNSEC_CHROOT_SHMAT -+ bool "Deny shmat() out of chroot" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to attach -+ to shared memory segments that were created outside of the chroot jail. -+ It is recommended that you say Y here. If the sysctl option is enabled, -+ a sysctl option with name "chroot_deny_shmat" is created. -+ -+config GRKERNSEC_CHROOT_UNIX -+ bool "Deny access to abstract AF_UNIX sockets out of chroot" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to -+ connect to abstract (meaning not belonging to a filesystem) Unix -+ domain sockets that were bound outside of a chroot. It is recommended -+ that you say Y here. If the sysctl option is enabled, a sysctl option -+ with name "chroot_deny_unix" is created. -+ -+config GRKERNSEC_CHROOT_FINDTASK -+ bool "Protect outside processes" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to -+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, -+ getsid, or view any process outside of the chroot. If the sysctl -+ option is enabled, a sysctl option with name "chroot_findtask" is -+ created. -+ -+config GRKERNSEC_CHROOT_NICE -+ bool "Restrict priority changes" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, processes inside a chroot will not be able to raise -+ the priority of processes in the chroot, or alter the priority of -+ processes outside the chroot. This provides more security than simply -+ removing CAP_SYS_NICE from the process' capability set. If the -+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice" -+ is created. -+ -+config GRKERNSEC_CHROOT_SYSCTL -+ bool "Deny sysctl writes" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, an attacker in a chroot will not be able to -+ write to sysctl entries, either by sysctl(2) or through a /proc -+ interface. It is strongly recommended that you say Y here. If the -+ sysctl option is enabled, a sysctl option with name -+ "chroot_deny_sysctl" is created. -+ -+config GRKERNSEC_CHROOT_CAPS -+ bool "Capability restrictions" -+ depends on GRKERNSEC_CHROOT -+ help -+ If you say Y here, the capabilities on all processes within a -+ chroot jail will be lowered to stop module insertion, raw i/o, -+ system and net admin tasks, rebooting the system, modifying immutable -+ files, modifying IPC owned by another, and changing the system time. -+ This is left an option because it can break some apps. Disable this -+ if your chrooted apps are having problems performing those kinds of -+ tasks. If the sysctl option is enabled, a sysctl option with -+ name "chroot_caps" is created. -+ -+endmenu -+menu "Kernel Auditing" -+depends on GRKERNSEC -+ -+config GRKERNSEC_AUDIT_GROUP -+ bool "Single group for auditing" -+ help -+ If you say Y here, the exec, chdir, and (un)mount logging features -+ will only operate on a group you specify. This option is recommended -+ if you only want to watch certain users instead of having a large -+ amount of logs from the entire system. If the sysctl option is enabled, -+ a sysctl option with name "audit_group" is created. -+ -+config GRKERNSEC_AUDIT_GID -+ int "GID for auditing" -+ depends on GRKERNSEC_AUDIT_GROUP -+ default 1007 -+ -+config GRKERNSEC_EXECLOG -+ bool "Exec logging" -+ help -+ If you say Y here, all execve() calls will be logged (since the -+ other exec*() calls are frontends to execve(), all execution -+ will be logged). Useful for shell-servers that like to keep track -+ of their users. If the sysctl option is enabled, a sysctl option with -+ name "exec_logging" is created. -+ WARNING: This option when enabled will produce a LOT of logs, especially -+ on an active system. -+ -+config GRKERNSEC_RESLOG -+ bool "Resource logging" -+ help -+ If you say Y here, all attempts to overstep resource limits will -+ be logged with the resource name, the requested size, and the current -+ limit. It is highly recommended that you say Y here. If the sysctl -+ option is enabled, a sysctl option with name "resource_logging" is -+ created. If the RBAC system is enabled, the sysctl value is ignored. -+ -+config GRKERNSEC_CHROOT_EXECLOG -+ bool "Log execs within chroot" -+ help -+ If you say Y here, all executions inside a chroot jail will be logged -+ to syslog. This can cause a large amount of logs if certain -+ applications (eg. djb's daemontools) are installed on the system, and -+ is therefore left as an option. If the sysctl option is enabled, a -+ sysctl option with name "chroot_execlog" is created. -+ -+config GRKERNSEC_AUDIT_PTRACE -+ bool "Ptrace logging" -+ help -+ If you say Y here, all attempts to attach to a process via ptrace -+ will be logged. If the sysctl option is enabled, a sysctl option -+ with name "audit_ptrace" is created. -+ -+config GRKERNSEC_AUDIT_CHDIR -+ bool "Chdir logging" -+ help -+ If you say Y here, all chdir() calls will be logged. If the sysctl -+ option is enabled, a sysctl option with name "audit_chdir" is created. -+ -+config GRKERNSEC_AUDIT_MOUNT -+ bool "(Un)Mount logging" -+ help -+ If you say Y here, all mounts and unmounts will be logged. If the -+ sysctl option is enabled, a sysctl option with name "audit_mount" is -+ created. -+ -+config GRKERNSEC_SIGNAL -+ bool "Signal logging" -+ help -+ If you say Y here, certain important signals will be logged, such as -+ SIGSEGV, which will as a result inform you of when a error in a program -+ occurred, which in some cases could mean a possible exploit attempt. -+ If the sysctl option is enabled, a sysctl option with name -+ "signal_logging" is created. -+ -+config GRKERNSEC_FORKFAIL -+ bool "Fork failure logging" -+ help -+ If you say Y here, all failed fork() attempts will be logged. -+ This could suggest a fork bomb, or someone attempting to overstep -+ their process limit. If the sysctl option is enabled, a sysctl option -+ with name "forkfail_logging" is created. -+ -+config GRKERNSEC_TIME -+ bool "Time change logging" -+ help -+ If you say Y here, any changes of the system clock will be logged. -+ If the sysctl option is enabled, a sysctl option with name -+ "timechange_logging" is created. -+ -+config GRKERNSEC_PROC_IPADDR -+ bool "/proc/<pid>/ipaddr support" -+ help -+ If you say Y here, a new entry will be added to each /proc/<pid> -+ directory that contains the IP address of the person using the task. -+ The IP is carried across local TCP and AF_UNIX stream sockets. -+ This information can be useful for IDS/IPSes to perform remote response -+ to a local attack. The entry is readable by only the owner of the -+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via -+ the RBAC system), and thus does not create privacy concerns. -+ -+config GRKERNSEC_RWXMAP_LOG -+ bool 'Denied RWX mmap/mprotect logging' -+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT -+ help -+ If you say Y here, calls to mmap() and mprotect() with explicit -+ usage of PROT_WRITE and PROT_EXEC together will be logged when -+ denied by the PAX_MPROTECT feature. If the sysctl option is -+ enabled, a sysctl option with name "rwxmap_logging" is created. -+ -+config GRKERNSEC_AUDIT_TEXTREL -+ bool 'ELF text relocations logging (READ HELP)' -+ depends on PAX_MPROTECT -+ help -+ If you say Y here, text relocations will be logged with the filename -+ of the offending library or binary. The purpose of the feature is -+ to help Linux distribution developers get rid of libraries and -+ binaries that need text relocations which hinder the future progress -+ of PaX. Only Linux distribution developers should say Y here, and -+ never on a production machine, as this option creates an information -+ leak that could aid an attacker in defeating the randomization of -+ a single memory region. If the sysctl option is enabled, a sysctl -+ option with name "audit_textrel" is created. -+ -+endmenu -+ -+menu "Executable Protections" -+depends on GRKERNSEC -+ -+config GRKERNSEC_DMESG -+ bool "Dmesg(8) restriction" -+ help -+ If you say Y here, non-root users will not be able to use dmesg(8) -+ to view up to the last 4kb of messages in the kernel's log buffer. -+ The kernel's log buffer often contains kernel addresses and other -+ identifying information useful to an attacker in fingerprinting a -+ system for a targeted exploit. -+ If the sysctl option is enabled, a sysctl option with name "dmesg" is -+ created. -+ -+config GRKERNSEC_HARDEN_PTRACE -+ bool "Deter ptrace-based process snooping" -+ help -+ If you say Y here, TTY sniffers and other malicious monitoring -+ programs implemented through ptrace will be defeated. If you -+ have been using the RBAC system, this option has already been -+ enabled for several years for all users, with the ability to make -+ fine-grained exceptions. -+ -+ This option only affects the ability of non-root users to ptrace -+ processes that are not a descendent of the ptracing process. -+ This means that strace ./binary and gdb ./binary will still work, -+ but attaching to arbitrary processes will not. If the sysctl -+ option is enabled, a sysctl option with name "harden_ptrace" is -+ created. -+ -+config GRKERNSEC_TPE -+ bool "Trusted Path Execution (TPE)" -+ help -+ If you say Y here, you will be able to choose a gid to add to the -+ supplementary groups of users you want to mark as "untrusted." -+ These users will not be able to execute any files that are not in -+ root-owned directories writable only by root. If the sysctl option -+ is enabled, a sysctl option with name "tpe" is created. -+ -+config GRKERNSEC_TPE_ALL -+ bool "Partially restrict all non-root users" -+ depends on GRKERNSEC_TPE -+ help -+ If you say Y here, all non-root users will be covered under -+ a weaker TPE restriction. This is separate from, and in addition to, -+ the main TPE options that you have selected elsewhere. Thus, if a -+ "trusted" GID is chosen, this restriction applies to even that GID. -+ Under this restriction, all non-root users will only be allowed to -+ execute files in directories they own that are not group or -+ world-writable, or in directories owned by root and writable only by -+ root. If the sysctl option is enabled, a sysctl option with name -+ "tpe_restrict_all" is created. -+ -+config GRKERNSEC_TPE_INVERT -+ bool "Invert GID option" -+ depends on GRKERNSEC_TPE -+ help -+ If you say Y here, the group you specify in the TPE configuration will -+ decide what group TPE restrictions will be *disabled* for. This -+ option is useful if you want TPE restrictions to be applied to most -+ users on the system. If the sysctl option is enabled, a sysctl option -+ with name "tpe_invert" is created. Unlike other sysctl options, this -+ entry will default to on for backward-compatibility. -+ -+config GRKERNSEC_TPE_GID -+ int "GID for untrusted users" -+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT -+ default 1005 -+ help -+ Setting this GID determines what group TPE restrictions will be -+ *enabled* for. If the sysctl option is enabled, a sysctl option -+ with name "tpe_gid" is created. -+ -+config GRKERNSEC_TPE_GID -+ int "GID for trusted users" -+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT -+ default 1005 -+ help -+ Setting this GID determines what group TPE restrictions will be -+ *disabled* for. If the sysctl option is enabled, a sysctl option -+ with name "tpe_gid" is created. -+ -+endmenu -+menu "Network Protections" -+depends on GRKERNSEC -+ -+config GRKERNSEC_RANDNET -+ bool "Larger entropy pools" -+ help -+ If you say Y here, the entropy pools used for many features of Linux -+ and grsecurity will be doubled in size. Since several grsecurity -+ features use additional randomness, it is recommended that you say Y -+ here. Saying Y here has a similar effect as modifying -+ /proc/sys/kernel/random/poolsize. -+ -+config GRKERNSEC_BLACKHOLE -+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention" -+ depends on NET -+ help -+ If you say Y here, neither TCP resets nor ICMP -+ destination-unreachable packets will be sent in response to packets -+ sent to ports for which no associated listening process exists. -+ This feature supports both IPV4 and IPV6 and exempts the -+ loopback interface from blackholing. Enabling this feature -+ makes a host more resilient to DoS attacks and reduces network -+ visibility against scanners. +diff -urNp linux-3.0.8/grsecurity/gracl_alloc.c linux-3.0.8/grsecurity/gracl_alloc.c +--- linux-3.0.8/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_alloc.c 2011-08-23 21:48:14.000000000 -0400 +@@ -0,0 +1,105 @@ ++#include <linux/kernel.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include <linux/vmalloc.h> ++#include <linux/gracl.h> ++#include <linux/grsecurity.h> + -+ The blackhole feature as-implemented is equivalent to the FreeBSD -+ blackhole feature, as it prevents RST responses to all packets, not -+ just SYNs. Under most application behavior this causes no -+ problems, but applications (like haproxy) may not close certain -+ connections in a way that cleanly terminates them on the remote -+ end, leaving the remote host in LAST_ACK state. Because of this -+ side-effect and to prevent intentional LAST_ACK DoSes, this -+ feature also adds automatic mitigation against such attacks. -+ The mitigation drastically reduces the amount of time a socket -+ can spend in LAST_ACK state. If you're using haproxy and not -+ all servers it connects to have this option enabled, consider -+ disabling this feature on the haproxy host. ++static unsigned long alloc_stack_next = 1; ++static unsigned long alloc_stack_size = 1; ++static void **alloc_stack; + -+ If the sysctl option is enabled, two sysctl options with names -+ "ip_blackhole" and "lastack_retries" will be created. -+ While "ip_blackhole" takes the standard zero/non-zero on/off -+ toggle, "lastack_retries" uses the same kinds of values as -+ "tcp_retries1" and "tcp_retries2". The default value of 4 -+ prevents a socket from lasting more than 45 seconds in LAST_ACK -+ state. ++static __inline__ int ++alloc_pop(void) ++{ ++ if (alloc_stack_next == 1) ++ return 0; + -+config GRKERNSEC_SOCKET -+ bool "Socket restrictions" -+ depends on NET -+ help -+ If you say Y here, you will be able to choose from several options. -+ If you assign a GID on your system and add it to the supplementary -+ groups of users you want to restrict socket access to, this patch -+ will perform up to three things, based on the option(s) you choose. ++ kfree(alloc_stack[alloc_stack_next - 2]); + -+config GRKERNSEC_SOCKET_ALL -+ bool "Deny any sockets to group" -+ depends on GRKERNSEC_SOCKET -+ help -+ If you say Y here, you will be able to choose a GID of whose users will -+ be unable to connect to other hosts from your machine or run server -+ applications from your machine. If the sysctl option is enabled, a -+ sysctl option with name "socket_all" is created. ++ alloc_stack_next--; + -+config GRKERNSEC_SOCKET_ALL_GID -+ int "GID to deny all sockets for" -+ depends on GRKERNSEC_SOCKET_ALL -+ default 1004 -+ help -+ Here you can choose the GID to disable socket access for. Remember to -+ add the users you want socket access disabled for to the GID -+ specified here. If the sysctl option is enabled, a sysctl option -+ with name "socket_all_gid" is created. ++ return 1; ++} + -+config GRKERNSEC_SOCKET_CLIENT -+ bool "Deny client sockets to group" -+ depends on GRKERNSEC_SOCKET -+ help -+ If you say Y here, you will be able to choose a GID of whose users will -+ be unable to connect to other hosts from your machine, but will be -+ able to run servers. If this option is enabled, all users in the group -+ you specify will have to use passive mode when initiating ftp transfers -+ from the shell on your machine. If the sysctl option is enabled, a -+ sysctl option with name "socket_client" is created. ++static __inline__ int ++alloc_push(void *buf) ++{ ++ if (alloc_stack_next >= alloc_stack_size) ++ return 1; + -+config GRKERNSEC_SOCKET_CLIENT_GID -+ int "GID to deny client sockets for" -+ depends on GRKERNSEC_SOCKET_CLIENT -+ default 1003 -+ help -+ Here you can choose the GID to disable client socket access for. -+ Remember to add the users you want client socket access disabled for to -+ the GID specified here. If the sysctl option is enabled, a sysctl -+ option with name "socket_client_gid" is created. ++ alloc_stack[alloc_stack_next - 1] = buf; + -+config GRKERNSEC_SOCKET_SERVER -+ bool "Deny server sockets to group" -+ depends on GRKERNSEC_SOCKET -+ help -+ If you say Y here, you will be able to choose a GID of whose users will -+ be unable to run server applications from your machine. If the sysctl -+ option is enabled, a sysctl option with name "socket_server" is created. ++ alloc_stack_next++; + -+config GRKERNSEC_SOCKET_SERVER_GID -+ int "GID to deny server sockets for" -+ depends on GRKERNSEC_SOCKET_SERVER -+ default 1002 -+ help -+ Here you can choose the GID to disable server socket access for. -+ Remember to add the users you want server socket access disabled for to -+ the GID specified here. If the sysctl option is enabled, a sysctl -+ option with name "socket_server_gid" is created. ++ return 0; ++} + -+endmenu -+menu "Sysctl support" -+depends on GRKERNSEC && SYSCTL ++void * ++acl_alloc(unsigned long len) ++{ ++ void *ret = NULL; + -+config GRKERNSEC_SYSCTL -+ bool "Sysctl support" -+ help -+ If you say Y here, you will be able to change the options that -+ grsecurity runs with at bootup, without having to recompile your -+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity -+ to enable (1) or disable (0) various features. All the sysctl entries -+ are mutable until the "grsec_lock" entry is set to a non-zero value. -+ All features enabled in the kernel configuration are disabled at boot -+ if you do not say Y to the "Turn on features by default" option. -+ All options should be set at startup, and the grsec_lock entry should -+ be set to a non-zero value after all the options are set. -+ *THIS IS EXTREMELY IMPORTANT* ++ if (!len || len > PAGE_SIZE) ++ goto out; + -+config GRKERNSEC_SYSCTL_DISTRO -+ bool "Extra sysctl support for distro makers (READ HELP)" -+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO -+ help -+ If you say Y here, additional sysctl options will be created -+ for features that affect processes running as root. Therefore, -+ it is critical when using this option that the grsec_lock entry be -+ enabled after boot. Only distros with prebuilt kernel packages -+ with this option enabled that can ensure grsec_lock is enabled -+ after boot should use this option. -+ *Failure to set grsec_lock after boot makes all grsec features -+ this option covers useless* ++ ret = kmalloc(len, GFP_KERNEL); + -+ Currently this option creates the following sysctl entries: -+ "Disable Privileged I/O": "disable_priv_io" ++ if (ret) { ++ if (alloc_push(ret)) { ++ kfree(ret); ++ ret = NULL; ++ } ++ } + -+config GRKERNSEC_SYSCTL_ON -+ bool "Turn on features by default" -+ depends on GRKERNSEC_SYSCTL -+ help -+ If you say Y here, instead of having all features enabled in the -+ kernel configuration disabled at boot time, the features will be -+ enabled at boot time. It is recommended you say Y here unless -+ there is some reason you would want all sysctl-tunable features to -+ be disabled by default. As mentioned elsewhere, it is important -+ to enable the grsec_lock entry once you have finished modifying -+ the sysctl entries. ++out: ++ return ret; ++} + -+endmenu -+menu "Logging Options" -+depends on GRKERNSEC ++void * ++acl_alloc_num(unsigned long num, unsigned long len) ++{ ++ if (!len || (num > (PAGE_SIZE / len))) ++ return NULL; + -+config GRKERNSEC_FLOODTIME -+ int "Seconds in between log messages (minimum)" -+ default 10 -+ help -+ This option allows you to enforce the number of seconds between -+ grsecurity log messages. The default should be suitable for most -+ people, however, if you choose to change it, choose a value small enough -+ to allow informative logs to be produced, but large enough to -+ prevent flooding. ++ return acl_alloc(num * len); ++} + -+config GRKERNSEC_FLOODBURST -+ int "Number of messages in a burst (maximum)" -+ default 6 -+ help -+ This option allows you to choose the maximum number of messages allowed -+ within the flood time interval you chose in a separate option. The -+ default should be suitable for most people, however if you find that -+ many of your logs are being interpreted as flooding, you may want to -+ raise this value. ++void ++acl_free_all(void) ++{ ++ if (gr_acl_is_enabled() || !alloc_stack) ++ return; + -+endmenu ++ while (alloc_pop()) ; + -+endmenu -diff -urNp linux-3.0.7/grsecurity/Makefile linux-3.0.7/grsecurity/Makefile ---- linux-3.0.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/Makefile 2011-10-17 06:45:43.000000000 -0400 -@@ -0,0 +1,36 @@ -+# grsecurity's ACL system was originally written in 2001 by Michael Dalton -+# during 2001-2009 it has been completely redesigned by Brad Spengler -+# into an RBAC system -+# -+# All code in this directory and various hooks inserted throughout the kernel -+# are copyright Brad Spengler - Open Source Security, Inc., and released -+# under the GPL v2 or higher ++ if (alloc_stack) { ++ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) ++ kfree(alloc_stack); ++ else ++ vfree(alloc_stack); ++ } + -+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \ -+ grsec_mount.o grsec_sig.o grsec_sysctl.o \ -+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o ++ alloc_stack = NULL; ++ alloc_stack_size = 1; ++ alloc_stack_next = 1; + -+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \ -+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ -+ gracl_learn.o grsec_log.o -+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o ++ return; ++} + -+ifdef CONFIG_NET -+obj-y += grsec_sock.o -+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o -+endif ++int ++acl_alloc_stack_init(unsigned long size) ++{ ++ if ((size * sizeof (void *)) <= PAGE_SIZE) ++ alloc_stack = ++ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL); ++ else ++ alloc_stack = (void **) vmalloc(size * sizeof (void *)); + -+ifndef CONFIG_GRKERNSEC -+obj-y += grsec_disabled.o -+endif ++ alloc_stack_size = size; + -+ifdef CONFIG_GRKERNSEC_HIDESYM -+extra-y := grsec_hidesym.o -+$(obj)/grsec_hidesym.o: -+ @-chmod -f 500 /boot -+ @-chmod -f 500 /lib/modules -+ @-chmod -f 500 /lib64/modules -+ @-chmod -f 500 /lib32/modules -+ @-chmod -f 700 . -+ @echo ' grsec: protected kernel image paths' -+endif -diff -urNp linux-3.0.7/grsecurity/gracl.c linux-3.0.7/grsecurity/gracl.c ---- linux-3.0.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl.c 2011-10-17 06:42:59.000000000 -0400 ++ if (!alloc_stack) ++ return 0; ++ else ++ return 1; ++} +diff -urNp linux-3.0.8/grsecurity/gracl.c linux-3.0.8/grsecurity/gracl.c +--- linux-3.0.8/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl.c 2011-10-17 06:42:59.000000000 -0400 @@ -0,0 +1,4154 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -52173,118 +51562,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl.c linux-3.0.7/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-3.0.7/grsecurity/gracl_alloc.c linux-3.0.7/grsecurity/gracl_alloc.c ---- linux-3.0.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_alloc.c 2011-08-23 21:48:14.000000000 -0400 -@@ -0,0 +1,105 @@ -+#include <linux/kernel.h> -+#include <linux/mm.h> -+#include <linux/slab.h> -+#include <linux/vmalloc.h> -+#include <linux/gracl.h> -+#include <linux/grsecurity.h> -+ -+static unsigned long alloc_stack_next = 1; -+static unsigned long alloc_stack_size = 1; -+static void **alloc_stack; -+ -+static __inline__ int -+alloc_pop(void) -+{ -+ if (alloc_stack_next == 1) -+ return 0; -+ -+ kfree(alloc_stack[alloc_stack_next - 2]); -+ -+ alloc_stack_next--; -+ -+ return 1; -+} -+ -+static __inline__ int -+alloc_push(void *buf) -+{ -+ if (alloc_stack_next >= alloc_stack_size) -+ return 1; -+ -+ alloc_stack[alloc_stack_next - 1] = buf; -+ -+ alloc_stack_next++; -+ -+ return 0; -+} -+ -+void * -+acl_alloc(unsigned long len) -+{ -+ void *ret = NULL; -+ -+ if (!len || len > PAGE_SIZE) -+ goto out; -+ -+ ret = kmalloc(len, GFP_KERNEL); -+ -+ if (ret) { -+ if (alloc_push(ret)) { -+ kfree(ret); -+ ret = NULL; -+ } -+ } -+ -+out: -+ return ret; -+} -+ -+void * -+acl_alloc_num(unsigned long num, unsigned long len) -+{ -+ if (!len || (num > (PAGE_SIZE / len))) -+ return NULL; -+ -+ return acl_alloc(num * len); -+} -+ -+void -+acl_free_all(void) -+{ -+ if (gr_acl_is_enabled() || !alloc_stack) -+ return; -+ -+ while (alloc_pop()) ; -+ -+ if (alloc_stack) { -+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) -+ kfree(alloc_stack); -+ else -+ vfree(alloc_stack); -+ } -+ -+ alloc_stack = NULL; -+ alloc_stack_size = 1; -+ alloc_stack_next = 1; -+ -+ return; -+} -+ -+int -+acl_alloc_stack_init(unsigned long size) -+{ -+ if ((size * sizeof (void *)) <= PAGE_SIZE) -+ alloc_stack = -+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL); -+ else -+ alloc_stack = (void **) vmalloc(size * sizeof (void *)); -+ -+ alloc_stack_size = size; -+ -+ if (!alloc_stack) -+ return 0; -+ else -+ return 1; -+} -diff -urNp linux-3.0.7/grsecurity/gracl_cap.c linux-3.0.7/grsecurity/gracl_cap.c ---- linux-3.0.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_cap.c 2011-09-14 09:21:24.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_cap.c linux-3.0.8/grsecurity/gracl_cap.c +--- linux-3.0.8/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_cap.c 2011-09-14 09:21:24.000000000 -0400 @@ -0,0 +1,101 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -52387,9 +51667,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_cap.c linux-3.0.7/grsecurity/gracl_cap.c + return 0; +} + -diff -urNp linux-3.0.7/grsecurity/gracl_fs.c linux-3.0.7/grsecurity/gracl_fs.c ---- linux-3.0.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_fs.c 2011-10-17 01:22:26.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_fs.c linux-3.0.8/grsecurity/gracl_fs.c +--- linux-3.0.8/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_fs.c 2011-10-17 01:22:26.000000000 -0400 @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -52822,9 +52102,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_fs.c linux-3.0.7/grsecurity/gracl_fs.c + + return 0; +} -diff -urNp linux-3.0.7/grsecurity/gracl_ip.c linux-3.0.7/grsecurity/gracl_ip.c ---- linux-3.0.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_ip.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_ip.c linux-3.0.8/grsecurity/gracl_ip.c +--- linux-3.0.8/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_ip.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,381 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -53207,9 +52487,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_ip.c linux-3.0.7/grsecurity/gracl_ip.c + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-3.0.7/grsecurity/gracl_learn.c linux-3.0.7/grsecurity/gracl_learn.c ---- linux-3.0.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_learn.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_learn.c linux-3.0.8/grsecurity/gracl_learn.c +--- linux-3.0.8/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_learn.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,207 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -53418,9 +52698,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_learn.c linux-3.0.7/grsecurity/gracl_lea + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-3.0.7/grsecurity/gracl_res.c linux-3.0.7/grsecurity/gracl_res.c ---- linux-3.0.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_res.c linux-3.0.8/grsecurity/gracl_res.c +--- linux-3.0.8/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,68 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -53490,9 +52770,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_res.c linux-3.0.7/grsecurity/gracl_res.c + rcu_read_unlock(); + return; +} -diff -urNp linux-3.0.7/grsecurity/gracl_segv.c linux-3.0.7/grsecurity/gracl_segv.c ---- linux-3.0.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_segv.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_segv.c linux-3.0.8/grsecurity/gracl_segv.c +--- linux-3.0.8/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_segv.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,299 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -53793,9 +53073,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_segv.c linux-3.0.7/grsecurity/gracl_segv + + return; +} -diff -urNp linux-3.0.7/grsecurity/gracl_shm.c linux-3.0.7/grsecurity/gracl_shm.c ---- linux-3.0.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/gracl_shm.c linux-3.0.8/grsecurity/gracl_shm.c +--- linux-3.0.8/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -53837,9 +53117,9 @@ diff -urNp linux-3.0.7/grsecurity/gracl_shm.c linux-3.0.7/grsecurity/gracl_shm.c + + return 1; +} -diff -urNp linux-3.0.7/grsecurity/grsec_chdir.c linux-3.0.7/grsecurity/grsec_chdir.c ---- linux-3.0.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_chdir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_chdir.c linux-3.0.8/grsecurity/grsec_chdir.c +--- linux-3.0.8/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_chdir.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -53860,9 +53140,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_chdir.c linux-3.0.7/grsecurity/grsec_chd +#endif + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_chroot.c linux-3.0.7/grsecurity/grsec_chroot.c ---- linux-3.0.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_chroot.c 2011-09-15 06:47:48.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_chroot.c linux-3.0.8/grsecurity/grsec_chroot.c +--- linux-3.0.8/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_chroot.c 2011-09-15 06:47:48.000000000 -0400 @@ -0,0 +1,351 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -54215,10 +53495,10 @@ diff -urNp linux-3.0.7/grsecurity/grsec_chroot.c linux-3.0.7/grsecurity/grsec_ch +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_disabled.c linux-3.0.7/grsecurity/grsec_disabled.c ---- linux-3.0.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_disabled.c 2011-09-24 08:13:01.000000000 -0400 -@@ -0,0 +1,433 @@ +diff -urNp linux-3.0.8/grsecurity/grsec_disabled.c linux-3.0.8/grsecurity/grsec_disabled.c +--- linux-3.0.8/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_disabled.c 2011-10-25 09:17:34.000000000 -0400 +@@ -0,0 +1,439 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/sched.h> @@ -54260,6 +53540,12 @@ diff -urNp linux-3.0.7/grsecurity/grsec_disabled.c linux-3.0.7/grsecurity/grsec_ + return 0; +} + ++void ++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) ++{ ++ return; ++} ++ +int +gr_handle_rawio(const struct inode *inode) +{ @@ -54652,9 +53938,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_disabled.c linux-3.0.7/grsecurity/grsec_ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-3.0.7/grsecurity/grsec_exec.c linux-3.0.7/grsecurity/grsec_exec.c ---- linux-3.0.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_exec.c 2011-10-20 00:50:54.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_exec.c linux-3.0.8/grsecurity/grsec_exec.c +--- linux-3.0.8/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_exec.c 2011-10-20 00:50:54.000000000 -0400 @@ -0,0 +1,146 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54802,9 +54088,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_exec.c linux-3.0.7/grsecurity/grsec_exec + +EXPORT_SYMBOL(gr_is_capable); +EXPORT_SYMBOL(gr_is_capable_nolog); -diff -urNp linux-3.0.7/grsecurity/grsec_fifo.c linux-3.0.7/grsecurity/grsec_fifo.c ---- linux-3.0.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_fifo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_fifo.c linux-3.0.8/grsecurity/grsec_fifo.c +--- linux-3.0.8/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_fifo.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54830,9 +54116,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_fifo.c linux-3.0.7/grsecurity/grsec_fifo +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_fork.c linux-3.0.7/grsecurity/grsec_fork.c ---- linux-3.0.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_fork.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_fork.c linux-3.0.8/grsecurity/grsec_fork.c +--- linux-3.0.8/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_fork.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,23 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54857,9 +54143,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_fork.c linux-3.0.7/grsecurity/grsec_fork +#endif + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_init.c linux-3.0.7/grsecurity/grsec_init.c ---- linux-3.0.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_init.c 2011-08-25 17:25:12.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_init.c linux-3.0.8/grsecurity/grsec_init.c +--- linux-3.0.8/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_init.c 2011-08-25 17:25:12.000000000 -0400 @@ -0,0 +1,269 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55130,9 +54416,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_init.c linux-3.0.7/grsecurity/grsec_init + + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_link.c linux-3.0.7/grsecurity/grsec_link.c ---- linux-3.0.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_link.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_link.c linux-3.0.8/grsecurity/grsec_link.c +--- linux-3.0.8/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_link.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55177,9 +54463,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_link.c linux-3.0.7/grsecurity/grsec_link +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_log.c linux-3.0.7/grsecurity/grsec_log.c ---- linux-3.0.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_log.c 2011-09-26 10:46:21.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_log.c linux-3.0.8/grsecurity/grsec_log.c +--- linux-3.0.8/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_log.c 2011-09-26 10:46:21.000000000 -0400 @@ -0,0 +1,315 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55496,9 +54782,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_log.c linux-3.0.7/grsecurity/grsec_log.c + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-3.0.7/grsecurity/grsec_mem.c linux-3.0.7/grsecurity/grsec_mem.c ---- linux-3.0.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_mem.c linux-3.0.8/grsecurity/grsec_mem.c +--- linux-3.0.8/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,33 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55533,9 +54819,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_mem.c linux-3.0.7/grsecurity/grsec_mem.c + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_mount.c linux-3.0.7/grsecurity/grsec_mount.c ---- linux-3.0.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_mount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_mount.c linux-3.0.8/grsecurity/grsec_mount.c +--- linux-3.0.8/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_mount.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55599,9 +54885,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_mount.c linux-3.0.7/grsecurity/grsec_mou +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_pax.c linux-3.0.7/grsecurity/grsec_pax.c ---- linux-3.0.7/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_pax.c linux-3.0.8/grsecurity/grsec_pax.c +--- linux-3.0.8/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,36 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55639,9 +54925,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_pax.c linux-3.0.7/grsecurity/grsec_pax.c +#endif + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_ptrace.c linux-3.0.7/grsecurity/grsec_ptrace.c ---- linux-3.0.7/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_ptrace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_ptrace.c linux-3.0.8/grsecurity/grsec_ptrace.c +--- linux-3.0.8/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_ptrace.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55657,9 +54943,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_ptrace.c linux-3.0.7/grsecurity/grsec_pt +#endif + return; +} -diff -urNp linux-3.0.7/grsecurity/grsec_sig.c linux-3.0.7/grsecurity/grsec_sig.c ---- linux-3.0.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_sig.c linux-3.0.8/grsecurity/grsec_sig.c +--- linux-3.0.8/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,206 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55867,9 +55153,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_sig.c linux-3.0.7/grsecurity/grsec_sig.c +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_sock.c linux-3.0.7/grsecurity/grsec_sock.c ---- linux-3.0.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_sock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_sock.c linux-3.0.8/grsecurity/grsec_sock.c +--- linux-3.0.8/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_sock.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,244 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -56115,9 +55401,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_sock.c linux-3.0.7/grsecurity/grsec_sock +#endif + return 0; +} -diff -urNp linux-3.0.7/grsecurity/grsec_sysctl.c linux-3.0.7/grsecurity/grsec_sysctl.c ---- linux-3.0.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_sysctl.c 2011-08-25 17:26:15.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_sysctl.c linux-3.0.8/grsecurity/grsec_sysctl.c +--- linux-3.0.8/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_sysctl.c 2011-08-25 17:26:15.000000000 -0400 @@ -0,0 +1,433 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -56552,9 +55838,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_sysctl.c linux-3.0.7/grsecurity/grsec_sy + { } +}; +#endif -diff -urNp linux-3.0.7/grsecurity/grsec_time.c linux-3.0.7/grsecurity/grsec_time.c ---- linux-3.0.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_time.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_time.c linux-3.0.8/grsecurity/grsec_time.c +--- linux-3.0.8/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_time.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -56572,9 +55858,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_time.c linux-3.0.7/grsecurity/grsec_time +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-3.0.7/grsecurity/grsec_tpe.c linux-3.0.7/grsecurity/grsec_tpe.c ---- linux-3.0.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsec_tpe.c linux-3.0.8/grsecurity/grsec_tpe.c +--- linux-3.0.8/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,39 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -56615,9 +55901,9 @@ diff -urNp linux-3.0.7/grsecurity/grsec_tpe.c linux-3.0.7/grsecurity/grsec_tpe.c +#endif + return 1; +} -diff -urNp linux-3.0.7/grsecurity/grsum.c linux-3.0.7/grsecurity/grsum.c ---- linux-3.0.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/grsecurity/grsum.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/grsum.c linux-3.0.8/grsecurity/grsum.c +--- linux-3.0.8/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/grsum.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -56680,9 +55966,1091 @@ diff -urNp linux-3.0.7/grsecurity/grsum.c linux-3.0.7/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-3.0.7/include/acpi/acpi_bus.h linux-3.0.7/include/acpi/acpi_bus.h ---- linux-3.0.7/include/acpi/acpi_bus.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/acpi/acpi_bus.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/grsecurity/Kconfig linux-3.0.8/grsecurity/Kconfig +--- linux-3.0.8/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/Kconfig 2011-09-15 00:00:57.000000000 -0400 +@@ -0,0 +1,1038 @@ ++# ++# grecurity configuration ++# ++ ++menu "Grsecurity" ++ ++config GRKERNSEC ++ bool "Grsecurity" ++ select CRYPTO ++ select CRYPTO_SHA256 ++ help ++ If you say Y here, you will be able to configure many features ++ that will enhance the security of your system. It is highly ++ recommended that you say Y here and read through the help ++ for each option so that you fully understand the features and ++ can evaluate their usefulness for your machine. ++ ++choice ++ prompt "Security Level" ++ depends on GRKERNSEC ++ default GRKERNSEC_CUSTOM ++ ++config GRKERNSEC_LOW ++ bool "Low" ++ select GRKERNSEC_LINK ++ select GRKERNSEC_FIFO ++ select GRKERNSEC_RANDNET ++ select GRKERNSEC_DMESG ++ select GRKERNSEC_CHROOT ++ select GRKERNSEC_CHROOT_CHDIR ++ ++ help ++ If you choose this option, several of the grsecurity options will ++ be enabled that will give you greater protection against a number ++ of attacks, while assuring that none of your software will have any ++ conflicts with the additional security measures. If you run a lot ++ of unusual software, or you are having problems with the higher ++ security levels, you should say Y here. With this option, the ++ following features are enabled: ++ ++ - Linking restrictions ++ - FIFO restrictions ++ - Restricted dmesg ++ - Enforced chdir("/") on chroot ++ - Runtime module disabling ++ ++config GRKERNSEC_MEDIUM ++ bool "Medium" ++ select PAX ++ select PAX_EI_PAX ++ select PAX_PT_PAX_FLAGS ++ select PAX_HAVE_ACL_FLAGS ++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR) ++ select GRKERNSEC_CHROOT ++ select GRKERNSEC_CHROOT_SYSCTL ++ select GRKERNSEC_LINK ++ select GRKERNSEC_FIFO ++ select GRKERNSEC_DMESG ++ select GRKERNSEC_RANDNET ++ select GRKERNSEC_FORKFAIL ++ select GRKERNSEC_TIME ++ select GRKERNSEC_SIGNAL ++ select GRKERNSEC_CHROOT ++ select GRKERNSEC_CHROOT_UNIX ++ select GRKERNSEC_CHROOT_MOUNT ++ select GRKERNSEC_CHROOT_PIVOT ++ select GRKERNSEC_CHROOT_DOUBLE ++ select GRKERNSEC_CHROOT_CHDIR ++ select GRKERNSEC_CHROOT_MKNOD ++ select GRKERNSEC_PROC ++ select GRKERNSEC_PROC_USERGROUP ++ select PAX_RANDUSTACK ++ select PAX_ASLR ++ select PAX_RANDMMAP ++ select PAX_REFCOUNT if (X86 || SPARC64) ++ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB)) ++ ++ help ++ If you say Y here, several features in addition to those included ++ in the low additional security level will be enabled. These ++ features provide even more security to your system, though in rare ++ cases they may be incompatible with very old or poorly written ++ software. If you enable this option, make sure that your auth ++ service (identd) is running as gid 1001. With this option, ++ the following features (in addition to those provided in the ++ low additional security level) will be enabled: ++ ++ - Failed fork logging ++ - Time change logging ++ - Signal logging ++ - Deny mounts in chroot ++ - Deny double chrooting ++ - Deny sysctl writes in chroot ++ - Deny mknod in chroot ++ - Deny access to abstract AF_UNIX sockets out of chroot ++ - Deny pivot_root in chroot ++ - Denied writes of /dev/kmem, /dev/mem, and /dev/port ++ - /proc restrictions with special GID set to 10 (usually wheel) ++ - Address Space Layout Randomization (ASLR) ++ - Prevent exploitation of most refcount overflows ++ - Bounds checking of copying between the kernel and userland ++ ++config GRKERNSEC_HIGH ++ bool "High" ++ select GRKERNSEC_LINK ++ select GRKERNSEC_FIFO ++ select GRKERNSEC_DMESG ++ select GRKERNSEC_FORKFAIL ++ select GRKERNSEC_TIME ++ select GRKERNSEC_SIGNAL ++ select GRKERNSEC_CHROOT ++ select GRKERNSEC_CHROOT_SHMAT ++ select GRKERNSEC_CHROOT_UNIX ++ select GRKERNSEC_CHROOT_MOUNT ++ select GRKERNSEC_CHROOT_FCHDIR ++ select GRKERNSEC_CHROOT_PIVOT ++ select GRKERNSEC_CHROOT_DOUBLE ++ select GRKERNSEC_CHROOT_CHDIR ++ select GRKERNSEC_CHROOT_MKNOD ++ select GRKERNSEC_CHROOT_CAPS ++ select GRKERNSEC_CHROOT_SYSCTL ++ select GRKERNSEC_CHROOT_FINDTASK ++ select GRKERNSEC_SYSFS_RESTRICT ++ select GRKERNSEC_PROC ++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR) ++ select GRKERNSEC_HIDESYM ++ select GRKERNSEC_BRUTE ++ select GRKERNSEC_PROC_USERGROUP ++ select GRKERNSEC_KMEM ++ select GRKERNSEC_RESLOG ++ select GRKERNSEC_RANDNET ++ select GRKERNSEC_PROC_ADD ++ select GRKERNSEC_CHROOT_CHMOD ++ select GRKERNSEC_CHROOT_NICE ++ select GRKERNSEC_AUDIT_MOUNT ++ select GRKERNSEC_MODHARDEN if (MODULES) ++ select GRKERNSEC_HARDEN_PTRACE ++ select GRKERNSEC_VM86 if (X86_32) ++ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC) ++ select PAX ++ select PAX_RANDUSTACK ++ select PAX_ASLR ++ select PAX_RANDMMAP ++ select PAX_NOEXEC ++ select PAX_MPROTECT ++ select PAX_EI_PAX ++ select PAX_PT_PAX_FLAGS ++ select PAX_HAVE_ACL_FLAGS ++ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) ++ select PAX_MEMORY_UDEREF if (X86 && !XEN) ++ select PAX_RANDKSTACK if (X86_TSC && X86) ++ select PAX_SEGMEXEC if (X86_32) ++ select PAX_PAGEEXEC ++ select PAX_EMUPLT if (ALPHA || PARISC || SPARC) ++ 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 || PPC || SPARC || ARM) && (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 ++ against your system. The heightened security comes at a cost ++ of an increased chance of incompatibilities with rare software ++ on your machine. Since this security level enables PaX, you should ++ view <http://pax.grsecurity.net> and read about the PaX ++ project. While you are there, download chpax and run it on ++ binaries that cause problems with PaX. Also remember that ++ since the /proc restrictions are enabled, you must run your ++ identd as gid 1001. This security level enables the following ++ features in addition to those listed in the low and medium ++ security levels: ++ ++ - Additional /proc restrictions ++ - Chmod restrictions in chroot ++ - No signals, ptrace, or viewing of processes outside of chroot ++ - Capability restrictions in chroot ++ - Deny fchdir out of chroot ++ - Priority restrictions in chroot ++ - Segmentation-based implementation of PaX ++ - Mprotect restrictions ++ - Removal of addresses from /proc/<pid>/[smaps|maps|stat] ++ - Kernel stack randomization ++ - Mount/unmount/remount logging ++ - Kernel symbol hiding ++ - Prevention of memory exhaustion-based exploits ++ - Hardening of module auto-loading ++ - Ptrace restrictions ++ - Restricted vm86 mode ++ - Restricted sysfs/debugfs ++ - Active kernel exploit response ++ ++config GRKERNSEC_CUSTOM ++ bool "Custom" ++ help ++ If you say Y here, you will be able to configure every grsecurity ++ option, which allows you to enable many more features that aren't ++ covered in the basic security levels. These additional features ++ include TPE, socket restrictions, and the sysctl system for ++ grsecurity. It is advised that you read through the help for ++ each option to determine its usefulness in your situation. ++ ++endchoice ++ ++menu "Address Space Protection" ++depends on GRKERNSEC ++ ++config GRKERNSEC_KMEM ++ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port" ++ select STRICT_DEVMEM if (X86 || ARM || TILE || S390) ++ help ++ If you say Y here, /dev/kmem and /dev/mem won't be allowed to ++ be written to via mmap or otherwise to modify the running kernel. ++ /dev/port will also not be allowed to be opened. If you have module ++ support disabled, enabling this will close up four ways that are ++ currently used to insert malicious code into the running kernel. ++ Even with all these features enabled, we still highly recommend that ++ you use the RBAC system, as it is still possible for an attacker to ++ modify the running kernel through privileged I/O granted by ioperm/iopl. ++ If you are not using XFree86, you may be able to stop this additional ++ case by enabling the 'Disable privileged I/O' option. Though nothing ++ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem, ++ but only to video memory, which is the only writing we allow in this ++ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will ++ not be allowed to mprotect it with PROT_WRITE later. ++ It is highly recommended that you say Y here if you meet all the ++ conditions above. ++ ++config GRKERNSEC_VM86 ++ bool "Restrict VM86 mode" ++ depends on X86_32 ++ ++ help ++ If you say Y here, only processes with CAP_SYS_RAWIO will be able to ++ make use of a special execution mode on 32bit x86 processors called ++ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain ++ video cards and will still work with this option enabled. The purpose ++ of the option is to prevent exploitation of emulation errors in ++ virtualization of vm86 mode like the one discovered in VMWare in 2009. ++ Nearly all users should be able to enable this option. ++ ++config GRKERNSEC_IO ++ bool "Disable privileged I/O" ++ depends on X86 ++ select RTC_CLASS ++ select RTC_INTF_DEV ++ select RTC_DRV_CMOS ++ ++ help ++ If you say Y here, all ioperm and iopl calls will return an error. ++ Ioperm and iopl can be used to modify the running kernel. ++ Unfortunately, some programs need this access to operate properly, ++ the most notable of which are XFree86 and hwclock. hwclock can be ++ remedied by having RTC support in the kernel, so real-time ++ clock support is enabled if this option is enabled, to ensure ++ that hwclock operates correctly. XFree86 still will not ++ operate correctly with this option enabled, so DO NOT CHOOSE Y ++ IF YOU USE XFree86. If you use XFree86 and you still want to ++ protect your kernel against modification, use the RBAC system. ++ ++config GRKERNSEC_PROC_MEMMAP ++ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]" ++ default y if (PAX_NOEXEC || PAX_ASLR) ++ depends on PAX_NOEXEC || PAX_ASLR ++ help ++ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will ++ give no information about the addresses of its mappings if ++ PaX features that rely on random addresses are enabled on the task. ++ If you use PaX it is greatly recommended that you say Y here as it ++ closes up a hole that makes the full ASLR useless for suid ++ binaries. ++ ++config GRKERNSEC_BRUTE ++ bool "Deter exploit bruteforcing" ++ help ++ If you say Y here, attempts to bruteforce exploits against forking ++ daemons such as apache or sshd, as well as against suid/sgid binaries ++ will be deterred. When a child of a forking daemon is killed by PaX ++ or crashes due to an illegal instruction or other suspicious signal, ++ the parent process will be delayed 30 seconds upon every subsequent ++ fork until the administrator is able to assess the situation and ++ restart the daemon. ++ In the suid/sgid case, the attempt is logged, the user has all their ++ processes terminated, and they are prevented from executing any further ++ processes for 15 minutes. ++ It is recommended that you also enable signal logging in the auditing ++ section so that logs are generated when a process triggers a suspicious ++ signal. ++ If the sysctl option is enabled, a sysctl option with name ++ "deter_bruteforce" is created. ++ ++ ++config GRKERNSEC_MODHARDEN ++ bool "Harden module auto-loading" ++ depends on MODULES ++ help ++ If you say Y here, module auto-loading in response to use of some ++ feature implemented by an unloaded module will be restricted to ++ root users. Enabling this option helps defend against attacks ++ by unprivileged users who abuse the auto-loading behavior to ++ cause a vulnerable module to load that is then exploited. ++ ++ If this option prevents a legitimate use of auto-loading for a ++ non-root user, the administrator can execute modprobe manually ++ with the exact name of the module mentioned in the alert log. ++ Alternatively, the administrator can add the module to the list ++ of modules loaded at boot by modifying init scripts. ++ ++ Modification of init scripts will most likely be needed on ++ Ubuntu servers with encrypted home directory support enabled, ++ as the first non-root user logging in will cause the ecb(aes), ++ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded. ++ ++config GRKERNSEC_HIDESYM ++ bool "Hide kernel symbols" ++ help ++ If you say Y here, getting information on loaded modules, and ++ displaying all kernel symbols through a syscall will be restricted ++ to users with CAP_SYS_MODULE. For software compatibility reasons, ++ /proc/kallsyms will be restricted to the root user. The RBAC ++ system can hide that entry even from root. ++ ++ This option also prevents leaking of kernel addresses through ++ several /proc entries. ++ ++ Note that this option is only effective provided the following ++ conditions are met: ++ 1) The kernel using grsecurity is not precompiled by some distribution ++ 2) You have also enabled GRKERNSEC_DMESG ++ 3) You are using the RBAC system and hiding other files such as your ++ kernel image and System.map. Alternatively, enabling this option ++ causes the permissions on /boot, /lib/modules, and the kernel ++ source directory to change at compile time to prevent ++ reading by non-root users. ++ If the above conditions are met, this option will aid in providing a ++ useful protection against local kernel exploitation of overflows ++ and arbitrary read/write vulnerabilities. ++ ++config GRKERNSEC_KERN_LOCKOUT ++ bool "Active kernel exploit response" ++ depends on X86 || ARM || PPC || SPARC ++ help ++ If you say Y here, when a PaX alert is triggered due to suspicious ++ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY) ++ or an OOPs occurs due to bad memory accesses, instead of just ++ terminating the offending process (and potentially allowing ++ a subsequent exploit from the same user), we will take one of two ++ actions: ++ If the user was root, we will panic the system ++ If the user was non-root, we will log the attempt, terminate ++ all processes owned by the user, then prevent them from creating ++ any new processes until the system is restarted ++ This deters repeated kernel exploitation/bruteforcing attempts ++ and is useful for later forensics. ++ ++endmenu ++menu "Role Based Access Control Options" ++depends on GRKERNSEC ++ ++config GRKERNSEC_RBAC_DEBUG ++ bool ++ ++config GRKERNSEC_NO_RBAC ++ bool "Disable RBAC system" ++ help ++ If you say Y here, the /dev/grsec device will be removed from the kernel, ++ preventing the RBAC system from being enabled. You should only say Y ++ here if you have no intention of using the RBAC system, so as to prevent ++ an attacker with root access from misusing the RBAC system to hide files ++ and processes when loadable module support and /dev/[k]mem have been ++ locked down. ++ ++config GRKERNSEC_ACL_HIDEKERN ++ bool "Hide kernel processes" ++ help ++ If you say Y here, all kernel threads will be hidden to all ++ processes but those whose subject has the "view hidden processes" ++ flag. ++ ++config GRKERNSEC_ACL_MAXTRIES ++ int "Maximum tries before password lockout" ++ default 3 ++ help ++ This option enforces the maximum number of times a user can attempt ++ to authorize themselves with the grsecurity RBAC system before being ++ denied the ability to attempt authorization again for a specified time. ++ The lower the number, the harder it will be to brute-force a password. ++ ++config GRKERNSEC_ACL_TIMEOUT ++ int "Time to wait after max password tries, in seconds" ++ default 30 ++ help ++ This option specifies the time the user must wait after attempting to ++ authorize to the RBAC system with the maximum number of invalid ++ passwords. The higher the number, the harder it will be to brute-force ++ a password. ++ ++endmenu ++menu "Filesystem Protections" ++depends on GRKERNSEC ++ ++config GRKERNSEC_PROC ++ bool "Proc restrictions" ++ help ++ If you say Y here, the permissions of the /proc filesystem ++ will be altered to enhance system security and privacy. You MUST ++ choose either a user only restriction or a user and group restriction. ++ Depending upon the option you choose, you can either restrict users to ++ see only the processes they themselves run, or choose a group that can ++ view all processes and files normally restricted to root if you choose ++ the "restrict to user only" option. NOTE: If you're running identd as ++ a non-root user, you will have to run it as the group you specify here. ++ ++config GRKERNSEC_PROC_USER ++ bool "Restrict /proc to user only" ++ depends on GRKERNSEC_PROC ++ help ++ If you say Y here, non-root users will only be able to view their own ++ processes, and restricts them from viewing network-related information, ++ and viewing kernel symbol and module information. ++ ++config GRKERNSEC_PROC_USERGROUP ++ bool "Allow special group" ++ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER ++ help ++ If you say Y here, you will be able to select a group that will be ++ able to view all processes and network-related information. If you've ++ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still ++ remain hidden. This option is useful if you want to run identd as ++ a non-root user. ++ ++config GRKERNSEC_PROC_GID ++ int "GID for special group" ++ depends on GRKERNSEC_PROC_USERGROUP ++ default 1001 ++ ++config GRKERNSEC_PROC_ADD ++ bool "Additional restrictions" ++ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP ++ help ++ If you say Y here, additional restrictions will be placed on ++ /proc that keep normal users from viewing device information and ++ slabinfo information that could be useful for exploits. ++ ++config GRKERNSEC_LINK ++ bool "Linking restrictions" ++ help ++ If you say Y here, /tmp race exploits will be prevented, since users ++ will no longer be able to follow symlinks owned by other users in ++ world-writable +t directories (e.g. /tmp), unless the owner of the ++ symlink is the owner of the directory. users will also not be ++ able to hardlink to files they do not own. If the sysctl option is ++ enabled, a sysctl option with name "linking_restrictions" is created. ++ ++config GRKERNSEC_FIFO ++ bool "FIFO restrictions" ++ help ++ If you say Y here, users will not be able to write to FIFOs they don't ++ own in world-writable +t directories (e.g. /tmp), unless the owner of ++ the FIFO is the same owner of the directory it's held in. If the sysctl ++ option is enabled, a sysctl option with name "fifo_restrictions" is ++ created. ++ ++config GRKERNSEC_SYSFS_RESTRICT ++ bool "Sysfs/debugfs restriction" ++ depends on SYSFS ++ help ++ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and ++ any filesystem normally mounted under it (e.g. debugfs) will only ++ be accessible by root. These filesystems generally provide access ++ to hardware and debug information that isn't appropriate for unprivileged ++ users of the system. Sysfs and debugfs have also become a large source ++ of new vulnerabilities, ranging from infoleaks to local compromise. ++ There has been very little oversight with an eye toward security involved ++ in adding new exporters of information to these filesystems, so their ++ use is discouraged. ++ This option is equivalent to a chmod 0700 of the mount paths. ++ ++config GRKERNSEC_ROFS ++ bool "Runtime read-only mount protection" ++ help ++ If you say Y here, a sysctl option with name "romount_protect" will ++ be created. By setting this option to 1 at runtime, filesystems ++ will be protected in the following ways: ++ * No new writable mounts will be allowed ++ * Existing read-only mounts won't be able to be remounted read/write ++ * Write operations will be denied on all block devices ++ This option acts independently of grsec_lock: once it is set to 1, ++ it cannot be turned off. Therefore, please be mindful of the resulting ++ behavior if this option is enabled in an init script on a read-only ++ filesystem. This feature is mainly intended for secure embedded systems. ++ ++config GRKERNSEC_CHROOT ++ bool "Chroot jail restrictions" ++ help ++ If you say Y here, you will be able to choose several options that will ++ make breaking out of a chrooted jail much more difficult. If you ++ encounter no software incompatibilities with the following options, it ++ is recommended that you enable each one. ++ ++config GRKERNSEC_CHROOT_MOUNT ++ bool "Deny mounts" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to ++ mount or remount filesystems. If the sysctl option is enabled, a ++ sysctl option with name "chroot_deny_mount" is created. ++ ++config GRKERNSEC_CHROOT_DOUBLE ++ bool "Deny double-chroots" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to chroot ++ again outside the chroot. This is a widely used method of breaking ++ out of a chroot jail and should not be allowed. If the sysctl ++ option is enabled, a sysctl option with name ++ "chroot_deny_chroot" is created. ++ ++config GRKERNSEC_CHROOT_PIVOT ++ bool "Deny pivot_root in chroot" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to use ++ a function called pivot_root() that was introduced in Linux 2.3.41. It ++ works similar to chroot in that it changes the root filesystem. This ++ function could be misused in a chrooted process to attempt to break out ++ of the chroot, and therefore should not be allowed. If the sysctl ++ option is enabled, a sysctl option with name "chroot_deny_pivot" is ++ created. ++ ++config GRKERNSEC_CHROOT_CHDIR ++ bool "Enforce chdir(\"/\") on all chroots" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, the current working directory of all newly-chrooted ++ applications will be set to the the root directory of the chroot. ++ The man page on chroot(2) states: ++ Note that this call does not change the current working ++ directory, so that `.' can be outside the tree rooted at ++ `/'. In particular, the super-user can escape from a ++ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'. ++ ++ It is recommended that you say Y here, since it's not known to break ++ any software. If the sysctl option is enabled, a sysctl option with ++ name "chroot_enforce_chdir" is created. ++ ++config GRKERNSEC_CHROOT_CHMOD ++ bool "Deny (f)chmod +s" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to chmod ++ or fchmod files to make them have suid or sgid bits. This protects ++ against another published method of breaking a chroot. If the sysctl ++ option is enabled, a sysctl option with name "chroot_deny_chmod" is ++ created. ++ ++config GRKERNSEC_CHROOT_FCHDIR ++ bool "Deny fchdir out of chroot" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, a well-known method of breaking chroots by fchdir'ing ++ to a file descriptor of the chrooting process that points to a directory ++ outside the filesystem will be stopped. If the sysctl option ++ is enabled, a sysctl option with name "chroot_deny_fchdir" is created. ++ ++config GRKERNSEC_CHROOT_MKNOD ++ bool "Deny mknod" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be allowed to ++ mknod. The problem with using mknod inside a chroot is that it ++ would allow an attacker to create a device entry that is the same ++ as one on the physical root of your system, which could range from ++ anything from the console device to a device for your harddrive (which ++ they could then use to wipe the drive or steal data). It is recommended ++ that you say Y here, unless you run into software incompatibilities. ++ If the sysctl option is enabled, a sysctl option with name ++ "chroot_deny_mknod" is created. ++ ++config GRKERNSEC_CHROOT_SHMAT ++ bool "Deny shmat() out of chroot" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to attach ++ to shared memory segments that were created outside of the chroot jail. ++ It is recommended that you say Y here. If the sysctl option is enabled, ++ a sysctl option with name "chroot_deny_shmat" is created. ++ ++config GRKERNSEC_CHROOT_UNIX ++ bool "Deny access to abstract AF_UNIX sockets out of chroot" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to ++ connect to abstract (meaning not belonging to a filesystem) Unix ++ domain sockets that were bound outside of a chroot. It is recommended ++ that you say Y here. If the sysctl option is enabled, a sysctl option ++ with name "chroot_deny_unix" is created. ++ ++config GRKERNSEC_CHROOT_FINDTASK ++ bool "Protect outside processes" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to ++ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, ++ getsid, or view any process outside of the chroot. If the sysctl ++ option is enabled, a sysctl option with name "chroot_findtask" is ++ created. ++ ++config GRKERNSEC_CHROOT_NICE ++ bool "Restrict priority changes" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, processes inside a chroot will not be able to raise ++ the priority of processes in the chroot, or alter the priority of ++ processes outside the chroot. This provides more security than simply ++ removing CAP_SYS_NICE from the process' capability set. If the ++ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice" ++ is created. ++ ++config GRKERNSEC_CHROOT_SYSCTL ++ bool "Deny sysctl writes" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, an attacker in a chroot will not be able to ++ write to sysctl entries, either by sysctl(2) or through a /proc ++ interface. It is strongly recommended that you say Y here. If the ++ sysctl option is enabled, a sysctl option with name ++ "chroot_deny_sysctl" is created. ++ ++config GRKERNSEC_CHROOT_CAPS ++ bool "Capability restrictions" ++ depends on GRKERNSEC_CHROOT ++ help ++ If you say Y here, the capabilities on all processes within a ++ chroot jail will be lowered to stop module insertion, raw i/o, ++ system and net admin tasks, rebooting the system, modifying immutable ++ files, modifying IPC owned by another, and changing the system time. ++ This is left an option because it can break some apps. Disable this ++ if your chrooted apps are having problems performing those kinds of ++ tasks. If the sysctl option is enabled, a sysctl option with ++ name "chroot_caps" is created. ++ ++endmenu ++menu "Kernel Auditing" ++depends on GRKERNSEC ++ ++config GRKERNSEC_AUDIT_GROUP ++ bool "Single group for auditing" ++ help ++ If you say Y here, the exec, chdir, and (un)mount logging features ++ will only operate on a group you specify. This option is recommended ++ if you only want to watch certain users instead of having a large ++ amount of logs from the entire system. If the sysctl option is enabled, ++ a sysctl option with name "audit_group" is created. ++ ++config GRKERNSEC_AUDIT_GID ++ int "GID for auditing" ++ depends on GRKERNSEC_AUDIT_GROUP ++ default 1007 ++ ++config GRKERNSEC_EXECLOG ++ bool "Exec logging" ++ help ++ If you say Y here, all execve() calls will be logged (since the ++ other exec*() calls are frontends to execve(), all execution ++ will be logged). Useful for shell-servers that like to keep track ++ of their users. If the sysctl option is enabled, a sysctl option with ++ name "exec_logging" is created. ++ WARNING: This option when enabled will produce a LOT of logs, especially ++ on an active system. ++ ++config GRKERNSEC_RESLOG ++ bool "Resource logging" ++ help ++ If you say Y here, all attempts to overstep resource limits will ++ be logged with the resource name, the requested size, and the current ++ limit. It is highly recommended that you say Y here. If the sysctl ++ option is enabled, a sysctl option with name "resource_logging" is ++ created. If the RBAC system is enabled, the sysctl value is ignored. ++ ++config GRKERNSEC_CHROOT_EXECLOG ++ bool "Log execs within chroot" ++ help ++ If you say Y here, all executions inside a chroot jail will be logged ++ to syslog. This can cause a large amount of logs if certain ++ applications (eg. djb's daemontools) are installed on the system, and ++ is therefore left as an option. If the sysctl option is enabled, a ++ sysctl option with name "chroot_execlog" is created. ++ ++config GRKERNSEC_AUDIT_PTRACE ++ bool "Ptrace logging" ++ help ++ If you say Y here, all attempts to attach to a process via ptrace ++ will be logged. If the sysctl option is enabled, a sysctl option ++ with name "audit_ptrace" is created. ++ ++config GRKERNSEC_AUDIT_CHDIR ++ bool "Chdir logging" ++ help ++ If you say Y here, all chdir() calls will be logged. If the sysctl ++ option is enabled, a sysctl option with name "audit_chdir" is created. ++ ++config GRKERNSEC_AUDIT_MOUNT ++ bool "(Un)Mount logging" ++ help ++ If you say Y here, all mounts and unmounts will be logged. If the ++ sysctl option is enabled, a sysctl option with name "audit_mount" is ++ created. ++ ++config GRKERNSEC_SIGNAL ++ bool "Signal logging" ++ help ++ If you say Y here, certain important signals will be logged, such as ++ SIGSEGV, which will as a result inform you of when a error in a program ++ occurred, which in some cases could mean a possible exploit attempt. ++ If the sysctl option is enabled, a sysctl option with name ++ "signal_logging" is created. ++ ++config GRKERNSEC_FORKFAIL ++ bool "Fork failure logging" ++ help ++ If you say Y here, all failed fork() attempts will be logged. ++ This could suggest a fork bomb, or someone attempting to overstep ++ their process limit. If the sysctl option is enabled, a sysctl option ++ with name "forkfail_logging" is created. ++ ++config GRKERNSEC_TIME ++ bool "Time change logging" ++ help ++ If you say Y here, any changes of the system clock will be logged. ++ If the sysctl option is enabled, a sysctl option with name ++ "timechange_logging" is created. ++ ++config GRKERNSEC_PROC_IPADDR ++ bool "/proc/<pid>/ipaddr support" ++ help ++ If you say Y here, a new entry will be added to each /proc/<pid> ++ directory that contains the IP address of the person using the task. ++ The IP is carried across local TCP and AF_UNIX stream sockets. ++ This information can be useful for IDS/IPSes to perform remote response ++ to a local attack. The entry is readable by only the owner of the ++ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via ++ the RBAC system), and thus does not create privacy concerns. ++ ++config GRKERNSEC_RWXMAP_LOG ++ bool 'Denied RWX mmap/mprotect logging' ++ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT ++ help ++ If you say Y here, calls to mmap() and mprotect() with explicit ++ usage of PROT_WRITE and PROT_EXEC together will be logged when ++ denied by the PAX_MPROTECT feature. If the sysctl option is ++ enabled, a sysctl option with name "rwxmap_logging" is created. ++ ++config GRKERNSEC_AUDIT_TEXTREL ++ bool 'ELF text relocations logging (READ HELP)' ++ depends on PAX_MPROTECT ++ help ++ If you say Y here, text relocations will be logged with the filename ++ of the offending library or binary. The purpose of the feature is ++ to help Linux distribution developers get rid of libraries and ++ binaries that need text relocations which hinder the future progress ++ of PaX. Only Linux distribution developers should say Y here, and ++ never on a production machine, as this option creates an information ++ leak that could aid an attacker in defeating the randomization of ++ a single memory region. If the sysctl option is enabled, a sysctl ++ option with name "audit_textrel" is created. ++ ++endmenu ++ ++menu "Executable Protections" ++depends on GRKERNSEC ++ ++config GRKERNSEC_DMESG ++ bool "Dmesg(8) restriction" ++ help ++ If you say Y here, non-root users will not be able to use dmesg(8) ++ to view up to the last 4kb of messages in the kernel's log buffer. ++ The kernel's log buffer often contains kernel addresses and other ++ identifying information useful to an attacker in fingerprinting a ++ system for a targeted exploit. ++ If the sysctl option is enabled, a sysctl option with name "dmesg" is ++ created. ++ ++config GRKERNSEC_HARDEN_PTRACE ++ bool "Deter ptrace-based process snooping" ++ help ++ If you say Y here, TTY sniffers and other malicious monitoring ++ programs implemented through ptrace will be defeated. If you ++ have been using the RBAC system, this option has already been ++ enabled for several years for all users, with the ability to make ++ fine-grained exceptions. ++ ++ This option only affects the ability of non-root users to ptrace ++ processes that are not a descendent of the ptracing process. ++ This means that strace ./binary and gdb ./binary will still work, ++ but attaching to arbitrary processes will not. If the sysctl ++ option is enabled, a sysctl option with name "harden_ptrace" is ++ created. ++ ++config GRKERNSEC_TPE ++ bool "Trusted Path Execution (TPE)" ++ help ++ If you say Y here, you will be able to choose a gid to add to the ++ supplementary groups of users you want to mark as "untrusted." ++ These users will not be able to execute any files that are not in ++ root-owned directories writable only by root. If the sysctl option ++ is enabled, a sysctl option with name "tpe" is created. ++ ++config GRKERNSEC_TPE_ALL ++ bool "Partially restrict all non-root users" ++ depends on GRKERNSEC_TPE ++ help ++ If you say Y here, all non-root users will be covered under ++ a weaker TPE restriction. This is separate from, and in addition to, ++ the main TPE options that you have selected elsewhere. Thus, if a ++ "trusted" GID is chosen, this restriction applies to even that GID. ++ Under this restriction, all non-root users will only be allowed to ++ execute files in directories they own that are not group or ++ world-writable, or in directories owned by root and writable only by ++ root. If the sysctl option is enabled, a sysctl option with name ++ "tpe_restrict_all" is created. ++ ++config GRKERNSEC_TPE_INVERT ++ bool "Invert GID option" ++ depends on GRKERNSEC_TPE ++ help ++ If you say Y here, the group you specify in the TPE configuration will ++ decide what group TPE restrictions will be *disabled* for. This ++ option is useful if you want TPE restrictions to be applied to most ++ users on the system. If the sysctl option is enabled, a sysctl option ++ with name "tpe_invert" is created. Unlike other sysctl options, this ++ entry will default to on for backward-compatibility. ++ ++config GRKERNSEC_TPE_GID ++ int "GID for untrusted users" ++ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT ++ default 1005 ++ help ++ Setting this GID determines what group TPE restrictions will be ++ *enabled* for. If the sysctl option is enabled, a sysctl option ++ with name "tpe_gid" is created. ++ ++config GRKERNSEC_TPE_GID ++ int "GID for trusted users" ++ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT ++ default 1005 ++ help ++ Setting this GID determines what group TPE restrictions will be ++ *disabled* for. If the sysctl option is enabled, a sysctl option ++ with name "tpe_gid" is created. ++ ++endmenu ++menu "Network Protections" ++depends on GRKERNSEC ++ ++config GRKERNSEC_RANDNET ++ bool "Larger entropy pools" ++ help ++ If you say Y here, the entropy pools used for many features of Linux ++ and grsecurity will be doubled in size. Since several grsecurity ++ features use additional randomness, it is recommended that you say Y ++ here. Saying Y here has a similar effect as modifying ++ /proc/sys/kernel/random/poolsize. ++ ++config GRKERNSEC_BLACKHOLE ++ bool "TCP/UDP blackhole and LAST_ACK DoS prevention" ++ depends on NET ++ help ++ If you say Y here, neither TCP resets nor ICMP ++ destination-unreachable packets will be sent in response to packets ++ sent to ports for which no associated listening process exists. ++ This feature supports both IPV4 and IPV6 and exempts the ++ loopback interface from blackholing. Enabling this feature ++ makes a host more resilient to DoS attacks and reduces network ++ visibility against scanners. ++ ++ The blackhole feature as-implemented is equivalent to the FreeBSD ++ blackhole feature, as it prevents RST responses to all packets, not ++ just SYNs. Under most application behavior this causes no ++ problems, but applications (like haproxy) may not close certain ++ connections in a way that cleanly terminates them on the remote ++ end, leaving the remote host in LAST_ACK state. Because of this ++ side-effect and to prevent intentional LAST_ACK DoSes, this ++ feature also adds automatic mitigation against such attacks. ++ The mitigation drastically reduces the amount of time a socket ++ can spend in LAST_ACK state. If you're using haproxy and not ++ all servers it connects to have this option enabled, consider ++ disabling this feature on the haproxy host. ++ ++ If the sysctl option is enabled, two sysctl options with names ++ "ip_blackhole" and "lastack_retries" will be created. ++ While "ip_blackhole" takes the standard zero/non-zero on/off ++ toggle, "lastack_retries" uses the same kinds of values as ++ "tcp_retries1" and "tcp_retries2". The default value of 4 ++ prevents a socket from lasting more than 45 seconds in LAST_ACK ++ state. ++ ++config GRKERNSEC_SOCKET ++ bool "Socket restrictions" ++ depends on NET ++ help ++ If you say Y here, you will be able to choose from several options. ++ If you assign a GID on your system and add it to the supplementary ++ groups of users you want to restrict socket access to, this patch ++ will perform up to three things, based on the option(s) you choose. ++ ++config GRKERNSEC_SOCKET_ALL ++ bool "Deny any sockets to group" ++ depends on GRKERNSEC_SOCKET ++ help ++ If you say Y here, you will be able to choose a GID of whose users will ++ be unable to connect to other hosts from your machine or run server ++ applications from your machine. If the sysctl option is enabled, a ++ sysctl option with name "socket_all" is created. ++ ++config GRKERNSEC_SOCKET_ALL_GID ++ int "GID to deny all sockets for" ++ depends on GRKERNSEC_SOCKET_ALL ++ default 1004 ++ help ++ Here you can choose the GID to disable socket access for. Remember to ++ add the users you want socket access disabled for to the GID ++ specified here. If the sysctl option is enabled, a sysctl option ++ with name "socket_all_gid" is created. ++ ++config GRKERNSEC_SOCKET_CLIENT ++ bool "Deny client sockets to group" ++ depends on GRKERNSEC_SOCKET ++ help ++ If you say Y here, you will be able to choose a GID of whose users will ++ be unable to connect to other hosts from your machine, but will be ++ able to run servers. If this option is enabled, all users in the group ++ you specify will have to use passive mode when initiating ftp transfers ++ from the shell on your machine. If the sysctl option is enabled, a ++ sysctl option with name "socket_client" is created. ++ ++config GRKERNSEC_SOCKET_CLIENT_GID ++ int "GID to deny client sockets for" ++ depends on GRKERNSEC_SOCKET_CLIENT ++ default 1003 ++ help ++ Here you can choose the GID to disable client socket access for. ++ Remember to add the users you want client socket access disabled for to ++ the GID specified here. If the sysctl option is enabled, a sysctl ++ option with name "socket_client_gid" is created. ++ ++config GRKERNSEC_SOCKET_SERVER ++ bool "Deny server sockets to group" ++ depends on GRKERNSEC_SOCKET ++ help ++ If you say Y here, you will be able to choose a GID of whose users will ++ be unable to run server applications from your machine. If the sysctl ++ option is enabled, a sysctl option with name "socket_server" is created. ++ ++config GRKERNSEC_SOCKET_SERVER_GID ++ int "GID to deny server sockets for" ++ depends on GRKERNSEC_SOCKET_SERVER ++ default 1002 ++ help ++ Here you can choose the GID to disable server socket access for. ++ Remember to add the users you want server socket access disabled for to ++ the GID specified here. If the sysctl option is enabled, a sysctl ++ option with name "socket_server_gid" is created. ++ ++endmenu ++menu "Sysctl support" ++depends on GRKERNSEC && SYSCTL ++ ++config GRKERNSEC_SYSCTL ++ bool "Sysctl support" ++ help ++ If you say Y here, you will be able to change the options that ++ grsecurity runs with at bootup, without having to recompile your ++ kernel. You can echo values to files in /proc/sys/kernel/grsecurity ++ to enable (1) or disable (0) various features. All the sysctl entries ++ are mutable until the "grsec_lock" entry is set to a non-zero value. ++ All features enabled in the kernel configuration are disabled at boot ++ if you do not say Y to the "Turn on features by default" option. ++ All options should be set at startup, and the grsec_lock entry should ++ be set to a non-zero value after all the options are set. ++ *THIS IS EXTREMELY IMPORTANT* ++ ++config GRKERNSEC_SYSCTL_DISTRO ++ bool "Extra sysctl support for distro makers (READ HELP)" ++ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO ++ help ++ If you say Y here, additional sysctl options will be created ++ for features that affect processes running as root. Therefore, ++ it is critical when using this option that the grsec_lock entry be ++ enabled after boot. Only distros with prebuilt kernel packages ++ with this option enabled that can ensure grsec_lock is enabled ++ after boot should use this option. ++ *Failure to set grsec_lock after boot makes all grsec features ++ this option covers useless* ++ ++ Currently this option creates the following sysctl entries: ++ "Disable Privileged I/O": "disable_priv_io" ++ ++config GRKERNSEC_SYSCTL_ON ++ bool "Turn on features by default" ++ depends on GRKERNSEC_SYSCTL ++ help ++ If you say Y here, instead of having all features enabled in the ++ kernel configuration disabled at boot time, the features will be ++ enabled at boot time. It is recommended you say Y here unless ++ there is some reason you would want all sysctl-tunable features to ++ be disabled by default. As mentioned elsewhere, it is important ++ to enable the grsec_lock entry once you have finished modifying ++ the sysctl entries. ++ ++endmenu ++menu "Logging Options" ++depends on GRKERNSEC ++ ++config GRKERNSEC_FLOODTIME ++ int "Seconds in between log messages (minimum)" ++ default 10 ++ help ++ This option allows you to enforce the number of seconds between ++ grsecurity log messages. The default should be suitable for most ++ people, however, if you choose to change it, choose a value small enough ++ to allow informative logs to be produced, but large enough to ++ prevent flooding. ++ ++config GRKERNSEC_FLOODBURST ++ int "Number of messages in a burst (maximum)" ++ default 6 ++ help ++ This option allows you to choose the maximum number of messages allowed ++ within the flood time interval you chose in a separate option. The ++ default should be suitable for most people, however if you find that ++ many of your logs are being interpreted as flooding, you may want to ++ raise this value. ++ ++endmenu ++ ++endmenu +diff -urNp linux-3.0.8/grsecurity/Makefile linux-3.0.8/grsecurity/Makefile +--- linux-3.0.8/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/grsecurity/Makefile 2011-10-17 06:45:43.000000000 -0400 +@@ -0,0 +1,36 @@ ++# grsecurity's ACL system was originally written in 2001 by Michael Dalton ++# during 2001-2009 it has been completely redesigned by Brad Spengler ++# into an RBAC system ++# ++# All code in this directory and various hooks inserted throughout the kernel ++# are copyright Brad Spengler - Open Source Security, Inc., and released ++# under the GPL v2 or higher ++ ++obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \ ++ grsec_mount.o grsec_sig.o grsec_sysctl.o \ ++ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o ++ ++obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \ ++ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ ++ gracl_learn.o grsec_log.o ++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o ++ ++ifdef CONFIG_NET ++obj-y += grsec_sock.o ++obj-$(CONFIG_GRKERNSEC) += gracl_ip.o ++endif ++ ++ifndef CONFIG_GRKERNSEC ++obj-y += grsec_disabled.o ++endif ++ ++ifdef CONFIG_GRKERNSEC_HIDESYM ++extra-y := grsec_hidesym.o ++$(obj)/grsec_hidesym.o: ++ @-chmod -f 500 /boot ++ @-chmod -f 500 /lib/modules ++ @-chmod -f 500 /lib64/modules ++ @-chmod -f 500 /lib32/modules ++ @-chmod -f 700 . ++ @echo ' grsec: protected kernel image paths' ++endif +diff -urNp linux-3.0.8/include/acpi/acpi_bus.h linux-3.0.8/include/acpi/acpi_bus.h +--- linux-3.0.8/include/acpi/acpi_bus.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/acpi/acpi_bus.h 2011-08-23 21:47:56.000000000 -0400 @@ -107,7 +107,7 @@ struct acpi_device_ops { acpi_op_bind bind; acpi_op_unbind unbind; @@ -56692,9 +57060,9 @@ diff -urNp linux-3.0.7/include/acpi/acpi_bus.h linux-3.0.7/include/acpi/acpi_bus #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */ -diff -urNp linux-3.0.7/include/asm-generic/atomic-long.h linux-3.0.7/include/asm-generic/atomic-long.h ---- linux-3.0.7/include/asm-generic/atomic-long.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/atomic-long.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/atomic-long.h linux-3.0.8/include/asm-generic/atomic-long.h +--- linux-3.0.8/include/asm-generic/atomic-long.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/atomic-long.h 2011-08-23 21:47:56.000000000 -0400 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -56995,9 +57363,9 @@ diff -urNp linux-3.0.7/include/asm-generic/atomic-long.h linux-3.0.7/include/asm +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-3.0.7/include/asm-generic/cache.h linux-3.0.7/include/asm-generic/cache.h ---- linux-3.0.7/include/asm-generic/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/cache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/cache.h linux-3.0.8/include/asm-generic/cache.h +--- linux-3.0.8/include/asm-generic/cache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/cache.h 2011-08-23 21:47:56.000000000 -0400 @@ -6,7 +6,7 @@ * cache lines need to provide their own cache.h. */ @@ -57008,9 +57376,9 @@ diff -urNp linux-3.0.7/include/asm-generic/cache.h linux-3.0.7/include/asm-gener +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT) #endif /* __ASM_GENERIC_CACHE_H */ -diff -urNp linux-3.0.7/include/asm-generic/int-l64.h linux-3.0.7/include/asm-generic/int-l64.h ---- linux-3.0.7/include/asm-generic/int-l64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/int-l64.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/int-l64.h linux-3.0.8/include/asm-generic/int-l64.h +--- linux-3.0.8/include/asm-generic/int-l64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/int-l64.h 2011-08-23 21:47:56.000000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -57020,9 +57388,9 @@ diff -urNp linux-3.0.7/include/asm-generic/int-l64.h linux-3.0.7/include/asm-gen #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-3.0.7/include/asm-generic/int-ll64.h linux-3.0.7/include/asm-generic/int-ll64.h ---- linux-3.0.7/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/int-ll64.h linux-3.0.8/include/asm-generic/int-ll64.h +--- linux-3.0.8/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -57032,9 +57400,9 @@ diff -urNp linux-3.0.7/include/asm-generic/int-ll64.h linux-3.0.7/include/asm-ge #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-3.0.7/include/asm-generic/kmap_types.h linux-3.0.7/include/asm-generic/kmap_types.h ---- linux-3.0.7/include/asm-generic/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/kmap_types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/kmap_types.h linux-3.0.8/include/asm-generic/kmap_types.h +--- linux-3.0.8/include/asm-generic/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/kmap_types.h 2011-08-23 21:47:56.000000000 -0400 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, KMAP_D(18) KM_NMI_PTE, @@ -57048,9 +57416,27 @@ diff -urNp linux-3.0.7/include/asm-generic/kmap_types.h linux-3.0.7/include/asm- }; #undef KMAP_D -diff -urNp linux-3.0.7/include/asm-generic/pgtable-nopmd.h linux-3.0.7/include/asm-generic/pgtable-nopmd.h ---- linux-3.0.7/include/asm-generic/pgtable-nopmd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/pgtable-nopmd.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/pgtable.h linux-3.0.8/include/asm-generic/pgtable.h +--- linux-3.0.8/include/asm-generic/pgtable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/pgtable.h 2011-08-23 21:47:56.000000000 -0400 +@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd) + #endif /* __HAVE_ARCH_PMD_WRITE */ + #endif + ++#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL ++static inline unsigned long pax_open_kernel(void) { return 0; } ++#endif ++ ++#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL ++static inline unsigned long pax_close_kernel(void) { return 0; } ++#endif ++ + #endif /* !__ASSEMBLY__ */ + + #endif /* _ASM_GENERIC_PGTABLE_H */ +diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopmd.h linux-3.0.8/include/asm-generic/pgtable-nopmd.h +--- linux-3.0.8/include/asm-generic/pgtable-nopmd.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/pgtable-nopmd.h 2011-08-23 21:47:56.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -57087,9 +57473,9 @@ diff -urNp linux-3.0.7/include/asm-generic/pgtable-nopmd.h linux-3.0.7/include/a /* * 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-3.0.7/include/asm-generic/pgtable-nopud.h linux-3.0.7/include/asm-generic/pgtable-nopud.h ---- linux-3.0.7/include/asm-generic/pgtable-nopud.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/pgtable-nopud.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopud.h linux-3.0.8/include/asm-generic/pgtable-nopud.h +--- linux-3.0.8/include/asm-generic/pgtable-nopud.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/pgtable-nopud.h 2011-08-23 21:47:56.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -57120,27 +57506,9 @@ diff -urNp linux-3.0.7/include/asm-generic/pgtable-nopud.h linux-3.0.7/include/a /* * 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-3.0.7/include/asm-generic/pgtable.h linux-3.0.7/include/asm-generic/pgtable.h ---- linux-3.0.7/include/asm-generic/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/pgtable.h 2011-08-23 21:47:56.000000000 -0400 -@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd) - #endif /* __HAVE_ARCH_PMD_WRITE */ - #endif - -+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL -+static inline unsigned long pax_open_kernel(void) { return 0; } -+#endif -+ -+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL -+static inline unsigned long pax_close_kernel(void) { return 0; } -+#endif -+ - #endif /* !__ASSEMBLY__ */ - - #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-3.0.7/include/asm-generic/vmlinux.lds.h linux-3.0.7/include/asm-generic/vmlinux.lds.h ---- linux-3.0.7/include/asm-generic/vmlinux.lds.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/asm-generic/vmlinux.lds.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/asm-generic/vmlinux.lds.h linux-3.0.8/include/asm-generic/vmlinux.lds.h +--- linux-3.0.8/include/asm-generic/vmlinux.lds.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/asm-generic/vmlinux.lds.h 2011-08-23 21:47:56.000000000 -0400 @@ -217,6 +217,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -57172,9 +57540,30 @@ diff -urNp linux-3.0.7/include/asm-generic/vmlinux.lds.h linux-3.0.7/include/asm /** * PERCPU_SECTION - define output section for percpu area, simple version -diff -urNp linux-3.0.7/include/drm/drmP.h linux-3.0.7/include/drm/drmP.h ---- linux-3.0.7/include/drm/drmP.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/drm/drmP.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/drm/drm_crtc_helper.h linux-3.0.8/include/drm/drm_crtc_helper.h +--- linux-3.0.8/include/drm/drm_crtc_helper.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/drm/drm_crtc_helper.h 2011-08-23 21:47:56.000000000 -0400 +@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs { + + /* disable crtc when not in use - more explicit than dpms off */ + void (*disable)(struct drm_crtc *crtc); +-}; ++} __no_const; + + struct drm_encoder_helper_funcs { + void (*dpms)(struct drm_encoder *encoder, int mode); +@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs { + struct drm_connector *connector); + /* disable encoder when not in use - more explicit than dpms off */ + void (*disable)(struct drm_encoder *encoder); +-}; ++} __no_const; + + struct drm_connector_helper_funcs { + int (*get_modes)(struct drm_connector *connector); +diff -urNp linux-3.0.8/include/drm/drmP.h linux-3.0.8/include/drm/drmP.h +--- linux-3.0.8/include/drm/drmP.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/drm/drmP.h 2011-08-23 21:47:56.000000000 -0400 @@ -73,6 +73,7 @@ #include <linux/workqueue.h> #include <linux/poll.h> @@ -57201,30 +57590,9 @@ diff -urNp linux-3.0.7/include/drm/drmP.h linux-3.0.7/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-3.0.7/include/drm/drm_crtc_helper.h linux-3.0.7/include/drm/drm_crtc_helper.h ---- linux-3.0.7/include/drm/drm_crtc_helper.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/drm/drm_crtc_helper.h 2011-08-23 21:47:56.000000000 -0400 -@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs { - - /* disable crtc when not in use - more explicit than dpms off */ - void (*disable)(struct drm_crtc *crtc); --}; -+} __no_const; - - struct drm_encoder_helper_funcs { - void (*dpms)(struct drm_encoder *encoder, int mode); -@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs { - struct drm_connector *connector); - /* disable encoder when not in use - more explicit than dpms off */ - void (*disable)(struct drm_encoder *encoder); --}; -+} __no_const; - - struct drm_connector_helper_funcs { - int (*get_modes)(struct drm_connector *connector); -diff -urNp linux-3.0.7/include/drm/ttm/ttm_memory.h linux-3.0.7/include/drm/ttm/ttm_memory.h ---- linux-3.0.7/include/drm/ttm/ttm_memory.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/drm/ttm/ttm_memory.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/drm/ttm/ttm_memory.h linux-3.0.8/include/drm/ttm/ttm_memory.h +--- linux-3.0.8/include/drm/ttm/ttm_memory.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/drm/ttm/ttm_memory.h 2011-08-23 21:47:56.000000000 -0400 @@ -47,7 +47,7 @@ struct ttm_mem_shrink { @@ -57234,9 +57602,9 @@ diff -urNp linux-3.0.7/include/drm/ttm/ttm_memory.h linux-3.0.7/include/drm/ttm/ /** * struct ttm_mem_global - Global memory accounting structure. -diff -urNp linux-3.0.7/include/linux/a.out.h linux-3.0.7/include/linux/a.out.h ---- linux-3.0.7/include/linux/a.out.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/a.out.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/a.out.h linux-3.0.8/include/linux/a.out.h +--- linux-3.0.8/include/linux/a.out.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/a.out.h 2011-08-23 21:47:56.000000000 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -57252,9 +57620,9 @@ diff -urNp linux-3.0.7/include/linux/a.out.h linux-3.0.7/include/linux/a.out.h #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-3.0.7/include/linux/atmdev.h linux-3.0.7/include/linux/atmdev.h ---- linux-3.0.7/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/atmdev.h linux-3.0.8/include/linux/atmdev.h +--- linux-3.0.8/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -57264,9 +57632,9 @@ diff -urNp linux-3.0.7/include/linux/atmdev.h linux-3.0.7/include/linux/atmdev.h __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-3.0.7/include/linux/binfmts.h linux-3.0.7/include/linux/binfmts.h ---- linux-3.0.7/include/linux/binfmts.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/binfmts.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/binfmts.h linux-3.0.8/include/linux/binfmts.h +--- linux-3.0.8/include/linux/binfmts.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/binfmts.h 2011-08-23 21:47:56.000000000 -0400 @@ -88,6 +88,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -57275,9 +57643,9 @@ diff -urNp linux-3.0.7/include/linux/binfmts.h linux-3.0.7/include/linux/binfmts unsigned long min_coredump; /* minimal dump size */ }; -diff -urNp linux-3.0.7/include/linux/blkdev.h linux-3.0.7/include/linux/blkdev.h ---- linux-3.0.7/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/blkdev.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/blkdev.h linux-3.0.8/include/linux/blkdev.h +--- linux-3.0.8/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/blkdev.h 2011-08-26 19:49:56.000000000 -0400 @@ -1308,7 +1308,7 @@ struct block_device_operations { /* this callback is with swap_lock and sometimes page table lock held */ void (*swap_slot_free_notify) (struct block_device *, unsigned long); @@ -57287,9 +57655,9 @@ diff -urNp linux-3.0.7/include/linux/blkdev.h linux-3.0.7/include/linux/blkdev.h extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long); -diff -urNp linux-3.0.7/include/linux/blktrace_api.h linux-3.0.7/include/linux/blktrace_api.h ---- linux-3.0.7/include/linux/blktrace_api.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/blktrace_api.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/blktrace_api.h linux-3.0.8/include/linux/blktrace_api.h +--- linux-3.0.8/include/linux/blktrace_api.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/blktrace_api.h 2011-08-23 21:47:56.000000000 -0400 @@ -161,7 +161,7 @@ struct blk_trace { struct dentry *dir; struct dentry *dropped_file; @@ -57299,9 +57667,9 @@ diff -urNp linux-3.0.7/include/linux/blktrace_api.h linux-3.0.7/include/linux/bl }; extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); -diff -urNp linux-3.0.7/include/linux/byteorder/little_endian.h linux-3.0.7/include/linux/byteorder/little_endian.h ---- linux-3.0.7/include/linux/byteorder/little_endian.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/byteorder/little_endian.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/byteorder/little_endian.h linux-3.0.8/include/linux/byteorder/little_endian.h +--- linux-3.0.8/include/linux/byteorder/little_endian.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/byteorder/little_endian.h 2011-08-23 21:47:56.000000000 -0400 @@ -42,51 +42,51 @@ static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -57366,9 +57734,9 @@ diff -urNp linux-3.0.7/include/linux/byteorder/little_endian.h linux-3.0.7/inclu } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-3.0.7/include/linux/cache.h linux-3.0.7/include/linux/cache.h ---- linux-3.0.7/include/linux/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/cache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/cache.h linux-3.0.8/include/linux/cache.h +--- linux-3.0.8/include/linux/cache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/cache.h 2011-08-23 21:47:56.000000000 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -57380,9 +57748,9 @@ diff -urNp linux-3.0.7/include/linux/cache.h linux-3.0.7/include/linux/cache.h #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-3.0.7/include/linux/capability.h linux-3.0.7/include/linux/capability.h ---- linux-3.0.7/include/linux/capability.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/capability.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/capability.h linux-3.0.8/include/linux/capability.h +--- linux-3.0.8/include/linux/capability.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/capability.h 2011-08-23 21:48:14.000000000 -0400 @@ -547,6 +547,9 @@ extern bool capable(int cap); extern bool ns_capable(struct user_namespace *ns, int cap); extern bool task_ns_capable(struct task_struct *t, int cap); @@ -57393,9 +57761,9 @@ diff -urNp linux-3.0.7/include/linux/capability.h linux-3.0.7/include/linux/capa /* audit system wants to get cap info from files as well */ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); -diff -urNp linux-3.0.7/include/linux/cleancache.h linux-3.0.7/include/linux/cleancache.h ---- linux-3.0.7/include/linux/cleancache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/cleancache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/cleancache.h linux-3.0.8/include/linux/cleancache.h +--- linux-3.0.8/include/linux/cleancache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/cleancache.h 2011-08-23 21:47:56.000000000 -0400 @@ -31,7 +31,7 @@ struct cleancache_ops { void (*flush_page)(int, struct cleancache_filekey, pgoff_t); void (*flush_inode)(int, struct cleancache_filekey); @@ -57405,9 +57773,9 @@ diff -urNp linux-3.0.7/include/linux/cleancache.h linux-3.0.7/include/linux/clea extern struct cleancache_ops cleancache_register_ops(struct cleancache_ops *ops); -diff -urNp linux-3.0.7/include/linux/compiler-gcc4.h linux-3.0.7/include/linux/compiler-gcc4.h ---- linux-3.0.7/include/linux/compiler-gcc4.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/compiler-gcc4.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/compiler-gcc4.h linux-3.0.8/include/linux/compiler-gcc4.h +--- linux-3.0.8/include/linux/compiler-gcc4.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/compiler-gcc4.h 2011-08-26 19:49:56.000000000 -0400 @@ -31,6 +31,12 @@ @@ -57433,9 +57801,9 @@ diff -urNp linux-3.0.7/include/linux/compiler-gcc4.h linux-3.0.7/include/linux/c #endif #if __GNUC_MINOR__ > 0 -diff -urNp linux-3.0.7/include/linux/compiler.h linux-3.0.7/include/linux/compiler.h ---- linux-3.0.7/include/linux/compiler.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/compiler.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/compiler.h linux-3.0.8/include/linux/compiler.h +--- linux-3.0.8/include/linux/compiler.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/compiler.h 2011-10-06 04:17:55.000000000 -0400 @@ -5,31 +5,62 @@ #ifdef __CHECKER__ @@ -57556,9 +57924,9 @@ diff -urNp linux-3.0.7/include/linux/compiler.h linux-3.0.7/include/linux/compil +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-3.0.7/include/linux/cpuset.h linux-3.0.7/include/linux/cpuset.h ---- linux-3.0.7/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/cpuset.h linux-3.0.8/include/linux/cpuset.h +--- linux-3.0.8/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void * nodemask. */ @@ -57568,9 +57936,9 @@ diff -urNp linux-3.0.7/include/linux/cpuset.h linux-3.0.7/include/linux/cpuset.h } static inline void set_mems_allowed(nodemask_t nodemask) -diff -urNp linux-3.0.7/include/linux/crypto.h linux-3.0.7/include/linux/crypto.h ---- linux-3.0.7/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/crypto.h linux-3.0.8/include/linux/crypto.h +--- linux-3.0.8/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400 @@ -361,7 +361,7 @@ struct cipher_tfm { const u8 *key, unsigned int keylen); void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src); @@ -57596,9 +57964,9 @@ diff -urNp linux-3.0.7/include/linux/crypto.h linux-3.0.7/include/linux/crypto.h #define crt_ablkcipher crt_u.ablkcipher #define crt_aead crt_u.aead -diff -urNp linux-3.0.7/include/linux/decompress/mm.h linux-3.0.7/include/linux/decompress/mm.h ---- linux-3.0.7/include/linux/decompress/mm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/decompress/mm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/decompress/mm.h linux-3.0.8/include/linux/decompress/mm.h +--- linux-3.0.8/include/linux/decompress/mm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/decompress/mm.h 2011-08-23 21:47:56.000000000 -0400 @@ -77,7 +77,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -57608,9 +57976,9 @@ diff -urNp linux-3.0.7/include/linux/decompress/mm.h linux-3.0.7/include/linux/d #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-3.0.7/include/linux/dma-mapping.h linux-3.0.7/include/linux/dma-mapping.h ---- linux-3.0.7/include/linux/dma-mapping.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/dma-mapping.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/dma-mapping.h linux-3.0.8/include/linux/dma-mapping.h +--- linux-3.0.8/include/linux/dma-mapping.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/dma-mapping.h 2011-08-26 19:49:56.000000000 -0400 @@ -50,7 +50,7 @@ struct dma_map_ops { int (*dma_supported)(struct device *dev, u64 mask); int (*set_dma_mask)(struct device *dev, u64 mask); @@ -57620,9 +57988,9 @@ diff -urNp linux-3.0.7/include/linux/dma-mapping.h linux-3.0.7/include/linux/dma #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-3.0.7/include/linux/efi.h linux-3.0.7/include/linux/efi.h ---- linux-3.0.7/include/linux/efi.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/efi.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/efi.h linux-3.0.8/include/linux/efi.h +--- linux-3.0.8/include/linux/efi.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/efi.h 2011-08-23 21:47:56.000000000 -0400 @@ -410,7 +410,7 @@ struct efivar_operations { efi_get_variable_t *get_variable; efi_get_next_variable_t *get_next_variable; @@ -57632,9 +58000,9 @@ diff -urNp linux-3.0.7/include/linux/efi.h linux-3.0.7/include/linux/efi.h struct efivars { /* -diff -urNp linux-3.0.7/include/linux/elf.h linux-3.0.7/include/linux/elf.h ---- linux-3.0.7/include/linux/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/elf.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/elf.h linux-3.0.8/include/linux/elf.h +--- linux-3.0.8/include/linux/elf.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/elf.h 2011-08-23 21:47:56.000000000 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -57707,9 +58075,9 @@ diff -urNp linux-3.0.7/include/linux/elf.h linux-3.0.7/include/linux/elf.h #endif -diff -urNp linux-3.0.7/include/linux/firewire.h linux-3.0.7/include/linux/firewire.h ---- linux-3.0.7/include/linux/firewire.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/firewire.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/firewire.h linux-3.0.8/include/linux/firewire.h +--- linux-3.0.8/include/linux/firewire.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/firewire.h 2011-08-23 21:47:56.000000000 -0400 @@ -428,7 +428,7 @@ struct fw_iso_context { union { fw_iso_callback_t sc; @@ -57719,9 +58087,30 @@ diff -urNp linux-3.0.7/include/linux/firewire.h linux-3.0.7/include/linux/firewi void *callback_data; }; -diff -urNp linux-3.0.7/include/linux/fs.h linux-3.0.7/include/linux/fs.h ---- linux-3.0.7/include/linux/fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/fs.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/fscache-cache.h linux-3.0.8/include/linux/fscache-cache.h +--- linux-3.0.8/include/linux/fscache-cache.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/fscache-cache.h 2011-08-23 21:47:56.000000000 -0400 +@@ -102,7 +102,7 @@ struct fscache_operation { + fscache_operation_release_t release; + }; + +-extern atomic_t fscache_op_debug_id; ++extern atomic_unchecked_t fscache_op_debug_id; + extern void fscache_op_work_func(struct work_struct *work); + + extern void fscache_enqueue_operation(struct fscache_operation *); +@@ -122,7 +122,7 @@ static inline void fscache_operation_ini + { + INIT_WORK(&op->work, fscache_op_work_func); + atomic_set(&op->usage, 1); +- op->debug_id = atomic_inc_return(&fscache_op_debug_id); ++ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); + op->processor = processor; + op->release = release; + INIT_LIST_HEAD(&op->pend_link); +diff -urNp linux-3.0.8/include/linux/fs.h linux-3.0.8/include/linux/fs.h +--- linux-3.0.8/include/linux/fs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/fs.h 2011-08-26 19:49:56.000000000 -0400 @@ -109,6 +109,11 @@ struct inodes_stat_t { /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x1000000) @@ -57744,42 +58133,9 @@ diff -urNp linux-3.0.7/include/linux/fs.h linux-3.0.7/include/linux/fs.h #define IPERM_FLAG_RCU 0x0001 -diff -urNp linux-3.0.7/include/linux/fs_struct.h linux-3.0.7/include/linux/fs_struct.h ---- linux-3.0.7/include/linux/fs_struct.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/fs_struct.h 2011-08-23 21:47:56.000000000 -0400 -@@ -6,7 +6,7 @@ - #include <linux/seqlock.h> - - struct fs_struct { -- int users; -+ atomic_t users; - spinlock_t lock; - seqcount_t seq; - int umask; -diff -urNp linux-3.0.7/include/linux/fscache-cache.h linux-3.0.7/include/linux/fscache-cache.h ---- linux-3.0.7/include/linux/fscache-cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/fscache-cache.h 2011-08-23 21:47:56.000000000 -0400 -@@ -102,7 +102,7 @@ struct fscache_operation { - fscache_operation_release_t release; - }; - --extern atomic_t fscache_op_debug_id; -+extern atomic_unchecked_t fscache_op_debug_id; - extern void fscache_op_work_func(struct work_struct *work); - - extern void fscache_enqueue_operation(struct fscache_operation *); -@@ -122,7 +122,7 @@ static inline void fscache_operation_ini - { - INIT_WORK(&op->work, fscache_op_work_func); - atomic_set(&op->usage, 1); -- op->debug_id = atomic_inc_return(&fscache_op_debug_id); -+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); - op->processor = processor; - op->release = release; - INIT_LIST_HEAD(&op->pend_link); -diff -urNp linux-3.0.7/include/linux/fsnotify.h linux-3.0.7/include/linux/fsnotify.h ---- linux-3.0.7/include/linux/fsnotify.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/fsnotify.h 2011-08-24 18:10:29.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/fsnotify.h linux-3.0.8/include/linux/fsnotify.h +--- linux-3.0.8/include/linux/fsnotify.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/fsnotify.h 2011-08-24 18:10:29.000000000 -0400 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc */ static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name) @@ -57789,9 +58145,21 @@ diff -urNp linux-3.0.7/include/linux/fsnotify.h linux-3.0.7/include/linux/fsnoti } /* -diff -urNp linux-3.0.7/include/linux/ftrace_event.h linux-3.0.7/include/linux/ftrace_event.h ---- linux-3.0.7/include/linux/ftrace_event.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/ftrace_event.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/fs_struct.h linux-3.0.8/include/linux/fs_struct.h +--- linux-3.0.8/include/linux/fs_struct.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/fs_struct.h 2011-08-23 21:47:56.000000000 -0400 +@@ -6,7 +6,7 @@ + #include <linux/seqlock.h> + + struct fs_struct { +- int users; ++ atomic_t users; + spinlock_t lock; + seqcount_t seq; + int umask; +diff -urNp linux-3.0.8/include/linux/ftrace_event.h linux-3.0.8/include/linux/ftrace_event.h +--- linux-3.0.8/include/linux/ftrace_event.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/ftrace_event.h 2011-08-23 21:47:56.000000000 -0400 @@ -96,7 +96,7 @@ struct trace_event_functions { trace_print_func raw; trace_print_func hex; @@ -57810,9 +58178,9 @@ diff -urNp linux-3.0.7/include/linux/ftrace_event.h linux-3.0.7/include/linux/ft int trace_set_clr_event(const char *system, const char *event, int set); -diff -urNp linux-3.0.7/include/linux/genhd.h linux-3.0.7/include/linux/genhd.h ---- linux-3.0.7/include/linux/genhd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/genhd.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/genhd.h linux-3.0.8/include/linux/genhd.h +--- linux-3.0.8/include/linux/genhd.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/genhd.h 2011-08-23 21:47:56.000000000 -0400 @@ -184,7 +184,7 @@ struct gendisk { struct kobject *slave_dir; @@ -57822,9 +58190,9 @@ diff -urNp linux-3.0.7/include/linux/genhd.h linux-3.0.7/include/linux/genhd.h struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-3.0.7/include/linux/gracl.h linux-3.0.7/include/linux/gracl.h ---- linux-3.0.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/gracl.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/gracl.h linux-3.0.8/include/linux/gracl.h +--- linux-3.0.8/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/gracl.h 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -58143,9 +58511,9 @@ diff -urNp linux-3.0.7/include/linux/gracl.h linux-3.0.7/include/linux/gracl.h + +#endif + -diff -urNp linux-3.0.7/include/linux/gralloc.h linux-3.0.7/include/linux/gralloc.h ---- linux-3.0.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/gralloc.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/gralloc.h linux-3.0.8/include/linux/gralloc.h +--- linux-3.0.8/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/gralloc.h 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -58156,9 +58524,9 @@ diff -urNp linux-3.0.7/include/linux/gralloc.h linux-3.0.7/include/linux/gralloc +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-3.0.7/include/linux/grdefs.h linux-3.0.7/include/linux/grdefs.h ---- linux-3.0.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/grdefs.h linux-3.0.8/include/linux/grdefs.h +--- linux-3.0.8/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,140 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -58300,9 +58668,9 @@ diff -urNp linux-3.0.7/include/linux/grdefs.h linux-3.0.7/include/linux/grdefs.h +}; + +#endif -diff -urNp linux-3.0.7/include/linux/grinternal.h linux-3.0.7/include/linux/grinternal.h ---- linux-3.0.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/grinternal.h 2011-10-20 00:47:28.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/grinternal.h linux-3.0.8/include/linux/grinternal.h +--- linux-3.0.8/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/grinternal.h 2011-10-20 00:47:28.000000000 -0400 @@ -0,0 +1,220 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -58524,9 +58892,9 @@ diff -urNp linux-3.0.7/include/linux/grinternal.h linux-3.0.7/include/linux/grin +#endif + +#endif -diff -urNp linux-3.0.7/include/linux/grmsg.h linux-3.0.7/include/linux/grmsg.h ---- linux-3.0.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/grmsg.h 2011-09-14 09:16:54.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/grmsg.h linux-3.0.8/include/linux/grmsg.h +--- linux-3.0.8/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/grmsg.h 2011-09-14 09:16:54.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" @@ -58636,9 +59004,9 @@ diff -urNp linux-3.0.7/include/linux/grmsg.h linux-3.0.7/include/linux/grmsg.h +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " -diff -urNp linux-3.0.7/include/linux/grsecurity.h linux-3.0.7/include/linux/grsecurity.h ---- linux-3.0.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/grsecurity.h 2011-10-17 06:35:30.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/grsecurity.h linux-3.0.8/include/linux/grsecurity.h +--- linux-3.0.8/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/grsecurity.h 2011-10-17 06:35:30.000000000 -0400 @@ -0,0 +1,228 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -58868,9 +59236,9 @@ diff -urNp linux-3.0.7/include/linux/grsecurity.h linux-3.0.7/include/linux/grse +#endif + +#endif -diff -urNp linux-3.0.7/include/linux/grsock.h linux-3.0.7/include/linux/grsock.h ---- linux-3.0.7/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/grsock.h linux-3.0.8/include/linux/grsock.h +--- linux-3.0.8/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,19 @@ +#ifndef __GRSOCK_H +#define __GRSOCK_H @@ -58891,9 +59259,9 @@ diff -urNp linux-3.0.7/include/linux/grsock.h linux-3.0.7/include/linux/grsock.h + const int protocol); + +#endif -diff -urNp linux-3.0.7/include/linux/hid.h linux-3.0.7/include/linux/hid.h ---- linux-3.0.7/include/linux/hid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/hid.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/hid.h linux-3.0.8/include/linux/hid.h +--- linux-3.0.8/include/linux/hid.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/hid.h 2011-08-23 21:47:56.000000000 -0400 @@ -675,7 +675,7 @@ struct hid_ll_driver { unsigned int code, int value); @@ -58903,9 +59271,9 @@ diff -urNp linux-3.0.7/include/linux/hid.h linux-3.0.7/include/linux/hid.h #define PM_HINT_FULLON 1<<5 #define PM_HINT_NORMAL 1<<1 -diff -urNp linux-3.0.7/include/linux/highmem.h linux-3.0.7/include/linux/highmem.h ---- linux-3.0.7/include/linux/highmem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/highmem.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/highmem.h linux-3.0.8/include/linux/highmem.h +--- linux-3.0.8/include/linux/highmem.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/highmem.h 2011-08-23 21:47:56.000000000 -0400 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -58925,9 +59293,9 @@ diff -urNp linux-3.0.7/include/linux/highmem.h linux-3.0.7/include/linux/highmem static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-3.0.7/include/linux/i2c.h linux-3.0.7/include/linux/i2c.h ---- linux-3.0.7/include/linux/i2c.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/i2c.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/i2c.h linux-3.0.8/include/linux/i2c.h +--- linux-3.0.8/include/linux/i2c.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/i2c.h 2011-08-23 21:47:56.000000000 -0400 @@ -346,6 +346,7 @@ struct i2c_algorithm { /* To determine what the adapter supports */ u32 (*functionality) (struct i2c_adapter *); @@ -58936,9 +59304,9 @@ diff -urNp linux-3.0.7/include/linux/i2c.h linux-3.0.7/include/linux/i2c.h /* * i2c_adapter is the structure used to identify a physical i2c bus along -diff -urNp linux-3.0.7/include/linux/i2o.h linux-3.0.7/include/linux/i2o.h ---- linux-3.0.7/include/linux/i2o.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/i2o.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/i2o.h linux-3.0.8/include/linux/i2o.h +--- linux-3.0.8/include/linux/i2o.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/i2o.h 2011-08-23 21:47:56.000000000 -0400 @@ -564,7 +564,7 @@ struct i2o_controller { struct i2o_device *exec; /* Executive */ #if BITS_PER_LONG == 64 @@ -58948,9 +59316,9 @@ diff -urNp linux-3.0.7/include/linux/i2o.h linux-3.0.7/include/linux/i2o.h struct list_head context_list; /* list of context id's and pointers */ #endif -diff -urNp linux-3.0.7/include/linux/init.h linux-3.0.7/include/linux/init.h ---- linux-3.0.7/include/linux/init.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/init.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/init.h linux-3.0.8/include/linux/init.h +--- linux-3.0.8/include/linux/init.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/init.h 2011-08-23 21:47:56.000000000 -0400 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm /* Each module must use one module_init(). */ @@ -58967,9 +59335,9 @@ diff -urNp linux-3.0.7/include/linux/init.h linux-3.0.7/include/linux/init.h { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); -diff -urNp linux-3.0.7/include/linux/init_task.h linux-3.0.7/include/linux/init_task.h ---- linux-3.0.7/include/linux/init_task.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/init_task.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/init_task.h linux-3.0.8/include/linux/init_task.h +--- linux-3.0.8/include/linux/init_task.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/init_task.h 2011-08-23 21:47:56.000000000 -0400 @@ -126,6 +126,12 @@ extern struct cred init_cred; # define INIT_PERF_EVENTS(tsk) #endif @@ -58991,9 +59359,9 @@ diff -urNp linux-3.0.7/include/linux/init_task.h linux-3.0.7/include/linux/init_ .fs = &init_fs, \ .files = &init_files, \ .signal = &init_signals, \ -diff -urNp linux-3.0.7/include/linux/intel-iommu.h linux-3.0.7/include/linux/intel-iommu.h ---- linux-3.0.7/include/linux/intel-iommu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/intel-iommu.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/intel-iommu.h linux-3.0.8/include/linux/intel-iommu.h +--- linux-3.0.8/include/linux/intel-iommu.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/intel-iommu.h 2011-08-23 21:47:56.000000000 -0400 @@ -296,7 +296,7 @@ struct iommu_flush { u8 fm, u64 type); void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr, @@ -59003,9 +59371,9 @@ diff -urNp linux-3.0.7/include/linux/intel-iommu.h linux-3.0.7/include/linux/int enum { SR_DMAR_FECTL_REG, -diff -urNp linux-3.0.7/include/linux/interrupt.h linux-3.0.7/include/linux/interrupt.h ---- linux-3.0.7/include/linux/interrupt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/interrupt.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/interrupt.h linux-3.0.8/include/linux/interrupt.h +--- linux-3.0.8/include/linux/interrupt.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/interrupt.h 2011-08-23 21:47:56.000000000 -0400 @@ -422,7 +422,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -59030,9 +59398,9 @@ diff -urNp linux-3.0.7/include/linux/interrupt.h linux-3.0.7/include/linux/inter extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { -diff -urNp linux-3.0.7/include/linux/kallsyms.h linux-3.0.7/include/linux/kallsyms.h ---- linux-3.0.7/include/linux/kallsyms.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/kallsyms.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/kallsyms.h linux-3.0.8/include/linux/kallsyms.h +--- linux-3.0.8/include/linux/kallsyms.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/kallsyms.h 2011-08-23 21:48:14.000000000 -0400 @@ -15,7 +15,8 @@ struct module; @@ -59060,9 +59428,9 @@ diff -urNp linux-3.0.7/include/linux/kallsyms.h linux-3.0.7/include/linux/kallsy /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-3.0.7/include/linux/kgdb.h linux-3.0.7/include/linux/kgdb.h ---- linux-3.0.7/include/linux/kgdb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/kgdb.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/kgdb.h linux-3.0.8/include/linux/kgdb.h +--- linux-3.0.8/include/linux/kgdb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/kgdb.h 2011-08-26 19:49:56.000000000 -0400 @@ -53,7 +53,7 @@ extern int kgdb_connected; extern int kgdb_io_module_registered; @@ -59090,9 +59458,9 @@ diff -urNp linux-3.0.7/include/linux/kgdb.h linux-3.0.7/include/linux/kgdb.h extern struct kgdb_arch arch_kgdb_ops; -diff -urNp linux-3.0.7/include/linux/kmod.h linux-3.0.7/include/linux/kmod.h ---- linux-3.0.7/include/linux/kmod.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/kmod.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/kmod.h linux-3.0.8/include/linux/kmod.h +--- linux-3.0.8/include/linux/kmod.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/kmod.h 2011-08-23 21:48:14.000000000 -0400 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -59102,9 +59470,9 @@ diff -urNp linux-3.0.7/include/linux/kmod.h linux-3.0.7/include/linux/kmod.h #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-3.0.7/include/linux/kvm_host.h linux-3.0.7/include/linux/kvm_host.h ---- linux-3.0.7/include/linux/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/kvm_host.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/kvm_host.h linux-3.0.8/include/linux/kvm_host.h +--- linux-3.0.8/include/linux/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/kvm_host.h 2011-08-23 21:47:56.000000000 -0400 @@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -59123,9 +59491,9 @@ diff -urNp linux-3.0.7/include/linux/kvm_host.h linux-3.0.7/include/linux/kvm_ho void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-3.0.7/include/linux/libata.h linux-3.0.7/include/linux/libata.h ---- linux-3.0.7/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/libata.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/libata.h linux-3.0.8/include/linux/libata.h +--- linux-3.0.8/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/libata.h 2011-08-26 19:49:56.000000000 -0400 @@ -899,7 +899,7 @@ struct ata_port_operations { * fields must be pointers. */ @@ -59135,20 +59503,9 @@ diff -urNp linux-3.0.7/include/linux/libata.h linux-3.0.7/include/linux/libata.h struct ata_port_info { unsigned long flags; -diff -urNp linux-3.0.7/include/linux/linkage.h linux-3.0.7/include/linux/linkage.h ---- linux-3.0.7/include/linux/linkage.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/linkage.h 2011-10-11 10:44:33.000000000 -0400 -@@ -82,6 +82,7 @@ - */ - #ifndef ENDPROC - #define ENDPROC(name) \ -+ .size name, .-name; \ - .type name, @function; \ - END(name) - #endif -diff -urNp linux-3.0.7/include/linux/mca.h linux-3.0.7/include/linux/mca.h ---- linux-3.0.7/include/linux/mca.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mca.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mca.h linux-3.0.8/include/linux/mca.h +--- linux-3.0.8/include/linux/mca.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mca.h 2011-08-23 21:47:56.000000000 -0400 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions { int region); void * (*mca_transform_memory)(struct mca_device *, @@ -59158,9 +59515,9 @@ diff -urNp linux-3.0.7/include/linux/mca.h linux-3.0.7/include/linux/mca.h struct mca_bus { u64 default_dma_mask; -diff -urNp linux-3.0.7/include/linux/memory.h linux-3.0.7/include/linux/memory.h ---- linux-3.0.7/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/memory.h linux-3.0.8/include/linux/memory.h +--- linux-3.0.8/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400 @@ -144,7 +144,7 @@ struct memory_accessor { size_t count); ssize_t (*write)(struct memory_accessor *, const char *buf, @@ -59170,9 +59527,9 @@ diff -urNp linux-3.0.7/include/linux/memory.h linux-3.0.7/include/linux/memory.h /* * Kernel text modification mutex, used for code patching. Users of this lock -diff -urNp linux-3.0.7/include/linux/mfd/abx500.h linux-3.0.7/include/linux/mfd/abx500.h ---- linux-3.0.7/include/linux/mfd/abx500.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mfd/abx500.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mfd/abx500.h linux-3.0.8/include/linux/mfd/abx500.h +--- linux-3.0.8/include/linux/mfd/abx500.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mfd/abx500.h 2011-08-23 21:47:56.000000000 -0400 @@ -234,6 +234,7 @@ struct abx500_ops { int (*event_registers_startup_state_get) (struct device *, u8 *); int (*startup_irq_enabled) (struct device *, unsigned int); @@ -59181,9 +59538,9 @@ diff -urNp linux-3.0.7/include/linux/mfd/abx500.h linux-3.0.7/include/linux/mfd/ int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops); void abx500_remove_ops(struct device *dev); -diff -urNp linux-3.0.7/include/linux/mm.h linux-3.0.7/include/linux/mm.h ---- linux-3.0.7/include/linux/mm.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/include/linux/mm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h +--- linux-3.0.8/include/linux/mm.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/include/linux/mm.h 2011-08-23 21:47:56.000000000 -0400 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ @@ -59306,9 +59663,9 @@ diff -urNp linux-3.0.7/include/linux/mm.h linux-3.0.7/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-3.0.7/include/linux/mm_types.h linux-3.0.7/include/linux/mm_types.h ---- linux-3.0.7/include/linux/mm_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mm_types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mm_types.h linux-3.0.8/include/linux/mm_types.h +--- linux-3.0.8/include/linux/mm_types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mm_types.h 2011-08-23 21:47:56.000000000 -0400 @@ -184,6 +184,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -59343,9 +59700,9 @@ diff -urNp linux-3.0.7/include/linux/mm_types.h linux-3.0.7/include/linux/mm_typ }; static inline void mm_init_cpumask(struct mm_struct *mm) -diff -urNp linux-3.0.7/include/linux/mmu_notifier.h linux-3.0.7/include/linux/mmu_notifier.h ---- linux-3.0.7/include/linux/mmu_notifier.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mmu_notifier.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mmu_notifier.h linux-3.0.8/include/linux/mmu_notifier.h +--- linux-3.0.8/include/linux/mmu_notifier.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mmu_notifier.h 2011-08-23 21:47:56.000000000 -0400 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -59362,9 +59719,9 @@ diff -urNp linux-3.0.7/include/linux/mmu_notifier.h linux-3.0.7/include/linux/mm }) #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ -diff -urNp linux-3.0.7/include/linux/mmzone.h linux-3.0.7/include/linux/mmzone.h ---- linux-3.0.7/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mmzone.h linux-3.0.8/include/linux/mmzone.h +--- linux-3.0.8/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400 @@ -350,7 +350,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -59374,9 +59731,9 @@ diff -urNp linux-3.0.7/include/linux/mmzone.h linux-3.0.7/include/linux/mmzone.h /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on -diff -urNp linux-3.0.7/include/linux/mod_devicetable.h linux-3.0.7/include/linux/mod_devicetable.h ---- linux-3.0.7/include/linux/mod_devicetable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/mod_devicetable.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/mod_devicetable.h linux-3.0.8/include/linux/mod_devicetable.h +--- linux-3.0.8/include/linux/mod_devicetable.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/mod_devicetable.h 2011-08-23 21:47:56.000000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -59395,9 +59752,9 @@ diff -urNp linux-3.0.7/include/linux/mod_devicetable.h linux-3.0.7/include/linux struct hid_device_id { __u16 bus; -diff -urNp linux-3.0.7/include/linux/module.h linux-3.0.7/include/linux/module.h ---- linux-3.0.7/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/module.h linux-3.0.8/include/linux/module.h +--- linux-3.0.8/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/kobject.h> #include <linux/moduleparam.h> @@ -59492,9 +59849,9 @@ diff -urNp linux-3.0.7/include/linux/module.h linux-3.0.7/include/linux/module.h } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-3.0.7/include/linux/moduleloader.h linux-3.0.7/include/linux/moduleloader.h ---- linux-3.0.7/include/linux/moduleloader.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/moduleloader.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/moduleloader.h linux-3.0.8/include/linux/moduleloader.h +--- linux-3.0.8/include/linux/moduleloader.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/moduleloader.h 2011-08-23 21:47:56.000000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -59517,9 +59874,9 @@ diff -urNp linux-3.0.7/include/linux/moduleloader.h linux-3.0.7/include/linux/mo /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-3.0.7/include/linux/moduleparam.h linux-3.0.7/include/linux/moduleparam.h ---- linux-3.0.7/include/linux/moduleparam.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/moduleparam.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/moduleparam.h linux-3.0.8/include/linux/moduleparam.h +--- linux-3.0.8/include/linux/moduleparam.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/moduleparam.h 2011-08-23 21:47:56.000000000 -0400 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock * @len is usually just sizeof(string). */ @@ -59538,9 +59895,9 @@ diff -urNp linux-3.0.7/include/linux/moduleparam.h linux-3.0.7/include/linux/mod = { .max = ARRAY_SIZE(array), .num = nump, \ .ops = ¶m_ops_##type, \ .elemsize = sizeof(array[0]), .elem = array }; \ -diff -urNp linux-3.0.7/include/linux/namei.h linux-3.0.7/include/linux/namei.h ---- linux-3.0.7/include/linux/namei.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/namei.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/namei.h linux-3.0.8/include/linux/namei.h +--- linux-3.0.8/include/linux/namei.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/namei.h 2011-08-23 21:47:56.000000000 -0400 @@ -24,7 +24,7 @@ struct nameidata { unsigned seq; int last_type; @@ -59565,9 +59922,9 @@ diff -urNp linux-3.0.7/include/linux/namei.h linux-3.0.7/include/linux/namei.h { return nd->saved_names[nd->depth]; } -diff -urNp linux-3.0.7/include/linux/netdevice.h linux-3.0.7/include/linux/netdevice.h ---- linux-3.0.7/include/linux/netdevice.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/include/linux/netdevice.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/netdevice.h linux-3.0.8/include/linux/netdevice.h +--- linux-3.0.8/include/linux/netdevice.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/include/linux/netdevice.h 2011-08-23 21:47:56.000000000 -0400 @@ -979,6 +979,7 @@ struct net_device_ops { int (*ndo_set_features)(struct net_device *dev, u32 features); @@ -59576,9 +59933,9 @@ diff -urNp linux-3.0.7/include/linux/netdevice.h linux-3.0.7/include/linux/netde /* * The DEVICE structure. -diff -urNp linux-3.0.7/include/linux/netfilter/xt_gradm.h linux-3.0.7/include/linux/netfilter/xt_gradm.h ---- linux-3.0.7/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/include/linux/netfilter/xt_gradm.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/netfilter/xt_gradm.h linux-3.0.8/include/linux/netfilter/xt_gradm.h +--- linux-3.0.8/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/include/linux/netfilter/xt_gradm.h 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -59589,9 +59946,9 @@ diff -urNp linux-3.0.7/include/linux/netfilter/xt_gradm.h linux-3.0.7/include/li +}; + +#endif -diff -urNp linux-3.0.7/include/linux/of_pdt.h linux-3.0.7/include/linux/of_pdt.h ---- linux-3.0.7/include/linux/of_pdt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/of_pdt.h 2011-08-30 06:20:11.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/of_pdt.h linux-3.0.8/include/linux/of_pdt.h +--- linux-3.0.8/include/linux/of_pdt.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/of_pdt.h 2011-08-30 06:20:11.000000000 -0400 @@ -32,7 +32,7 @@ struct of_pdt_ops { /* return 0 on success; fill in 'len' with number of bytes in path */ @@ -59601,9 +59958,9 @@ diff -urNp linux-3.0.7/include/linux/of_pdt.h linux-3.0.7/include/linux/of_pdt.h extern void *prom_early_alloc(unsigned long size); -diff -urNp linux-3.0.7/include/linux/oprofile.h linux-3.0.7/include/linux/oprofile.h ---- linux-3.0.7/include/linux/oprofile.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/oprofile.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/oprofile.h linux-3.0.8/include/linux/oprofile.h +--- linux-3.0.8/include/linux/oprofile.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/oprofile.h 2011-08-23 21:47:56.000000000 -0400 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -59616,9 +59973,9 @@ diff -urNp linux-3.0.7/include/linux/oprofile.h linux-3.0.7/include/linux/oprofi /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-3.0.7/include/linux/padata.h linux-3.0.7/include/linux/padata.h ---- linux-3.0.7/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/padata.h linux-3.0.8/include/linux/padata.h +--- linux-3.0.8/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400 @@ -129,7 +129,7 @@ struct parallel_data { struct padata_instance *pinst; struct padata_parallel_queue __percpu *pqueue; @@ -59628,9 +59985,9 @@ diff -urNp linux-3.0.7/include/linux/padata.h linux-3.0.7/include/linux/padata.h atomic_t reorder_objects; atomic_t refcnt; unsigned int max_seq_nr; -diff -urNp linux-3.0.7/include/linux/perf_event.h linux-3.0.7/include/linux/perf_event.h ---- linux-3.0.7/include/linux/perf_event.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/perf_event.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/perf_event.h linux-3.0.8/include/linux/perf_event.h +--- linux-3.0.8/include/linux/perf_event.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/perf_event.h 2011-08-23 21:47:56.000000000 -0400 @@ -761,8 +761,8 @@ struct perf_event { enum perf_event_active_state state; @@ -59653,9 +60010,9 @@ diff -urNp linux-3.0.7/include/linux/perf_event.h linux-3.0.7/include/linux/perf /* * Protect attach/detach and child_list: -diff -urNp linux-3.0.7/include/linux/pipe_fs_i.h linux-3.0.7/include/linux/pipe_fs_i.h ---- linux-3.0.7/include/linux/pipe_fs_i.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/pipe_fs_i.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/pipe_fs_i.h linux-3.0.8/include/linux/pipe_fs_i.h +--- linux-3.0.8/include/linux/pipe_fs_i.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/pipe_fs_i.h 2011-08-23 21:47:56.000000000 -0400 @@ -46,9 +46,9 @@ struct pipe_buffer { struct pipe_inode_info { wait_queue_head_t wait; @@ -59669,9 +60026,9 @@ diff -urNp linux-3.0.7/include/linux/pipe_fs_i.h linux-3.0.7/include/linux/pipe_ unsigned int r_counter; unsigned int w_counter; struct page *tmp_page; -diff -urNp linux-3.0.7/include/linux/pm_runtime.h linux-3.0.7/include/linux/pm_runtime.h ---- linux-3.0.7/include/linux/pm_runtime.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/pm_runtime.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/pm_runtime.h linux-3.0.8/include/linux/pm_runtime.h +--- linux-3.0.8/include/linux/pm_runtime.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/pm_runtime.h 2011-08-23 21:47:56.000000000 -0400 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_ static inline void pm_runtime_mark_last_busy(struct device *dev) @@ -59681,9 +60038,9 @@ diff -urNp linux-3.0.7/include/linux/pm_runtime.h linux-3.0.7/include/linux/pm_r } #else /* !CONFIG_PM_RUNTIME */ -diff -urNp linux-3.0.7/include/linux/poison.h linux-3.0.7/include/linux/poison.h ---- linux-3.0.7/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/poison.h linux-3.0.8/include/linux/poison.h +--- linux-3.0.8/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -59695,9 +60052,9 @@ diff -urNp linux-3.0.7/include/linux/poison.h linux-3.0.7/include/linux/poison.h /********** include/linux/timer.h **********/ /* -diff -urNp linux-3.0.7/include/linux/preempt.h linux-3.0.7/include/linux/preempt.h ---- linux-3.0.7/include/linux/preempt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/preempt.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/preempt.h linux-3.0.8/include/linux/preempt.h +--- linux-3.0.8/include/linux/preempt.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/preempt.h 2011-08-23 21:47:56.000000000 -0400 @@ -115,7 +115,7 @@ struct preempt_ops { void (*sched_in)(struct preempt_notifier *notifier, int cpu); void (*sched_out)(struct preempt_notifier *notifier, @@ -59707,9 +60064,9 @@ diff -urNp linux-3.0.7/include/linux/preempt.h linux-3.0.7/include/linux/preempt /** * preempt_notifier - key for installing preemption notifiers -diff -urNp linux-3.0.7/include/linux/proc_fs.h linux-3.0.7/include/linux/proc_fs.h ---- linux-3.0.7/include/linux/proc_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/proc_fs.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/proc_fs.h linux-3.0.8/include/linux/proc_fs.h +--- linux-3.0.8/include/linux/proc_fs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/proc_fs.h 2011-08-23 21:48:14.000000000 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -59739,9 +60096,9 @@ diff -urNp linux-3.0.7/include/linux/proc_fs.h linux-3.0.7/include/linux/proc_fs struct ctl_table_header; struct ctl_table; -diff -urNp linux-3.0.7/include/linux/ptrace.h linux-3.0.7/include/linux/ptrace.h ---- linux-3.0.7/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/ptrace.h linux-3.0.8/include/linux/ptrace.h +--- linux-3.0.8/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -59755,9 +60112,9 @@ diff -urNp linux-3.0.7/include/linux/ptrace.h linux-3.0.7/include/linux/ptrace.h static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-3.0.7/include/linux/random.h linux-3.0.7/include/linux/random.h ---- linux-3.0.7/include/linux/random.h 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/random.h linux-3.0.8/include/linux/random.h +--- linux-3.0.8/include/linux/random.h 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400 @@ -69,12 +69,17 @@ void srandom32(u32 seed); u32 prandom32(struct rnd_state *); @@ -59777,9 +60134,9 @@ diff -urNp linux-3.0.7/include/linux/random.h linux-3.0.7/include/linux/random.h } /** -diff -urNp linux-3.0.7/include/linux/reboot.h linux-3.0.7/include/linux/reboot.h ---- linux-3.0.7/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/reboot.h linux-3.0.8/include/linux/reboot.h +--- linux-3.0.8/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st * Architecture-specific implementations of sys_reboot commands. */ @@ -59815,9 +60172,9 @@ diff -urNp linux-3.0.7/include/linux/reboot.h linux-3.0.7/include/linux/reboot.h #include <asm/emergency-restart.h> #endif -diff -urNp linux-3.0.7/include/linux/reiserfs_fs.h linux-3.0.7/include/linux/reiserfs_fs.h ---- linux-3.0.7/include/linux/reiserfs_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/reiserfs_fs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/reiserfs_fs.h linux-3.0.8/include/linux/reiserfs_fs.h +--- linux-3.0.8/include/linux/reiserfs_fs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/reiserfs_fs.h 2011-08-23 21:47:56.000000000 -0400 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -59827,9 +60184,9 @@ diff -urNp linux-3.0.7/include/linux/reiserfs_fs.h linux-3.0.7/include/linux/rei #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen) #define __fs_changed(gen,s) (gen != get_generation (s)) #define fs_changed(gen,s) \ -diff -urNp linux-3.0.7/include/linux/reiserfs_fs_sb.h linux-3.0.7/include/linux/reiserfs_fs_sb.h ---- linux-3.0.7/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/reiserfs_fs_sb.h linux-3.0.8/include/linux/reiserfs_fs_sb.h +--- linux-3.0.8/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400 @@ -386,7 +386,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -59839,9 +60196,9 @@ diff -urNp linux-3.0.7/include/linux/reiserfs_fs_sb.h linux-3.0.7/include/linux/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-3.0.7/include/linux/relay.h linux-3.0.7/include/linux/relay.h ---- linux-3.0.7/include/linux/relay.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/relay.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/relay.h linux-3.0.8/include/linux/relay.h +--- linux-3.0.8/include/linux/relay.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/relay.h 2011-08-23 21:47:56.000000000 -0400 @@ -159,7 +159,7 @@ struct rchan_callbacks * The callback should return 0 if successful, negative if not. */ @@ -59851,9 +60208,9 @@ diff -urNp linux-3.0.7/include/linux/relay.h linux-3.0.7/include/linux/relay.h /* * CONFIG_RELAY kernel API, kernel/relay.c -diff -urNp linux-3.0.7/include/linux/rfkill.h linux-3.0.7/include/linux/rfkill.h ---- linux-3.0.7/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/rfkill.h linux-3.0.8/include/linux/rfkill.h +--- linux-3.0.8/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400 @@ -147,6 +147,7 @@ struct rfkill_ops { void (*query)(struct rfkill *rfkill, void *data); int (*set_block)(void *data, bool blocked); @@ -59862,9 +60219,9 @@ diff -urNp linux-3.0.7/include/linux/rfkill.h linux-3.0.7/include/linux/rfkill.h #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) /** -diff -urNp linux-3.0.7/include/linux/rmap.h linux-3.0.7/include/linux/rmap.h ---- linux-3.0.7/include/linux/rmap.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/rmap.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/rmap.h linux-3.0.8/include/linux/rmap.h +--- linux-3.0.8/include/linux/rmap.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/rmap.h 2011-08-23 21:47:56.000000000 -0400 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc void anon_vma_init(void); /* create anon_vma_cachep */ int anon_vma_prepare(struct vm_area_struct *); @@ -59876,9 +60233,9 @@ diff -urNp linux-3.0.7/include/linux/rmap.h linux-3.0.7/include/linux/rmap.h void __anon_vma_link(struct vm_area_struct *); static inline void anon_vma_merge(struct vm_area_struct *vma, -diff -urNp linux-3.0.7/include/linux/sched.h linux-3.0.7/include/linux/sched.h ---- linux-3.0.7/include/linux/sched.h 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/include/linux/sched.h 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/sched.h linux-3.0.8/include/linux/sched.h +--- linux-3.0.8/include/linux/sched.h 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/include/linux/sched.h 2011-10-17 23:17:19.000000000 -0400 @@ -100,6 +100,7 @@ struct bio_list; struct fs_struct; struct perf_event_context; @@ -60120,9 +60477,9 @@ diff -urNp linux-3.0.7/include/linux/sched.h linux-3.0.7/include/linux/sched.h extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-3.0.7/include/linux/screen_info.h linux-3.0.7/include/linux/screen_info.h ---- linux-3.0.7/include/linux/screen_info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/screen_info.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/screen_info.h linux-3.0.8/include/linux/screen_info.h +--- linux-3.0.8/include/linux/screen_info.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/screen_info.h 2011-08-23 21:47:56.000000000 -0400 @@ -43,7 +43,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -60133,9 +60490,9 @@ diff -urNp linux-3.0.7/include/linux/screen_info.h linux-3.0.7/include/linux/scr } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-3.0.7/include/linux/security.h linux-3.0.7/include/linux/security.h ---- linux-3.0.7/include/linux/security.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/security.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/security.h linux-3.0.8/include/linux/security.h +--- linux-3.0.8/include/linux/security.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/security.h 2011-08-23 21:48:14.000000000 -0400 @@ -36,6 +36,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -60144,9 +60501,9 @@ diff -urNp linux-3.0.7/include/linux/security.h linux-3.0.7/include/linux/securi #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-3.0.7/include/linux/seq_file.h linux-3.0.7/include/linux/seq_file.h ---- linux-3.0.7/include/linux/seq_file.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/seq_file.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/seq_file.h linux-3.0.8/include/linux/seq_file.h +--- linux-3.0.8/include/linux/seq_file.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/seq_file.h 2011-08-23 21:47:56.000000000 -0400 @@ -32,6 +32,7 @@ struct seq_operations { void * (*next) (struct seq_file *m, void *v, loff_t *pos); int (*show) (struct seq_file *m, void *v); @@ -60155,9 +60512,21 @@ diff -urNp linux-3.0.7/include/linux/seq_file.h linux-3.0.7/include/linux/seq_fi #define SEQ_SKIP 1 -diff -urNp linux-3.0.7/include/linux/shm.h linux-3.0.7/include/linux/shm.h ---- linux-3.0.7/include/linux/shm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/shm.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/shmem_fs.h linux-3.0.8/include/linux/shmem_fs.h +--- linux-3.0.8/include/linux/shmem_fs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/shmem_fs.h 2011-08-23 21:47:56.000000000 -0400 +@@ -10,7 +10,7 @@ + + #define SHMEM_NR_DIRECT 16 + +-#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t)) ++#define SHMEM_SYMLINK_INLINE_LEN 64 + + struct shmem_inode_info { + spinlock_t lock; +diff -urNp linux-3.0.8/include/linux/shm.h linux-3.0.8/include/linux/shm.h +--- linux-3.0.8/include/linux/shm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/shm.h 2011-08-23 21:48:14.000000000 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -60169,21 +60538,9 @@ diff -urNp linux-3.0.7/include/linux/shm.h linux-3.0.7/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-3.0.7/include/linux/shmem_fs.h linux-3.0.7/include/linux/shmem_fs.h ---- linux-3.0.7/include/linux/shmem_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/shmem_fs.h 2011-08-23 21:47:56.000000000 -0400 -@@ -10,7 +10,7 @@ - - #define SHMEM_NR_DIRECT 16 - --#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t)) -+#define SHMEM_SYMLINK_INLINE_LEN 64 - - struct shmem_inode_info { - spinlock_t lock; -diff -urNp linux-3.0.7/include/linux/skbuff.h linux-3.0.7/include/linux/skbuff.h ---- linux-3.0.7/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/skbuff.h linux-3.0.8/include/linux/skbuff.h +--- linux-3.0.8/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp */ static inline int skb_queue_empty(const struct sk_buff_head *list) @@ -60220,9 +60577,27 @@ diff -urNp linux-3.0.7/include/linux/skbuff.h linux-3.0.7/include/linux/skbuff.h #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -diff -urNp linux-3.0.7/include/linux/slab.h linux-3.0.7/include/linux/slab.h ---- linux-3.0.7/include/linux/slab.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/slab.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/slab_def.h linux-3.0.8/include/linux/slab_def.h +--- linux-3.0.8/include/linux/slab_def.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/slab_def.h 2011-08-23 21:47:56.000000000 -0400 +@@ -96,10 +96,10 @@ struct kmem_cache { + unsigned long node_allocs; + unsigned long node_frees; + unsigned long node_overflow; +- atomic_t allochit; +- atomic_t allocmiss; +- atomic_t freehit; +- atomic_t freemiss; ++ atomic_unchecked_t allochit; ++ atomic_unchecked_t allocmiss; ++ atomic_unchecked_t freehit; ++ atomic_unchecked_t freemiss; + + /* + * If debugging is enabled, then the allocator can add additional +diff -urNp linux-3.0.8/include/linux/slab.h linux-3.0.8/include/linux/slab.h +--- linux-3.0.8/include/linux/slab.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/slab.h 2011-08-23 21:47:56.000000000 -0400 @@ -11,12 +11,20 @@ #include <linux/gfp.h> @@ -60329,27 +60704,9 @@ diff -urNp linux-3.0.7/include/linux/slab.h linux-3.0.7/include/linux/slab.h +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-3.0.7/include/linux/slab_def.h linux-3.0.7/include/linux/slab_def.h ---- linux-3.0.7/include/linux/slab_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/slab_def.h 2011-08-23 21:47:56.000000000 -0400 -@@ -96,10 +96,10 @@ struct kmem_cache { - unsigned long node_allocs; - unsigned long node_frees; - unsigned long node_overflow; -- atomic_t allochit; -- atomic_t allocmiss; -- atomic_t freehit; -- atomic_t freemiss; -+ atomic_unchecked_t allochit; -+ atomic_unchecked_t allocmiss; -+ atomic_unchecked_t freehit; -+ atomic_unchecked_t freemiss; - - /* - * If debugging is enabled, then the allocator can add additional -diff -urNp linux-3.0.7/include/linux/slub_def.h linux-3.0.7/include/linux/slub_def.h ---- linux-3.0.7/include/linux/slub_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/slub_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/slub_def.h linux-3.0.8/include/linux/slub_def.h +--- linux-3.0.8/include/linux/slub_def.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/slub_def.h 2011-08-23 21:47:56.000000000 -0400 @@ -82,7 +82,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -60368,9 +60725,9 @@ diff -urNp linux-3.0.7/include/linux/slub_def.h linux-3.0.7/include/linux/slub_d static __always_inline void * kmalloc_order(size_t size, gfp_t flags, unsigned int order) -diff -urNp linux-3.0.7/include/linux/sonet.h linux-3.0.7/include/linux/sonet.h ---- linux-3.0.7/include/linux/sonet.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/sonet.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/sonet.h linux-3.0.8/include/linux/sonet.h +--- linux-3.0.8/include/linux/sonet.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/sonet.h 2011-08-23 21:47:56.000000000 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -60380,9 +60737,9 @@ diff -urNp linux-3.0.7/include/linux/sonet.h linux-3.0.7/include/linux/sonet.h __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-3.0.7/include/linux/sunrpc/clnt.h linux-3.0.7/include/linux/sunrpc/clnt.h ---- linux-3.0.7/include/linux/sunrpc/clnt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/sunrpc/clnt.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/sunrpc/clnt.h linux-3.0.8/include/linux/sunrpc/clnt.h +--- linux-3.0.8/include/linux/sunrpc/clnt.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/sunrpc/clnt.h 2011-08-23 21:47:56.000000000 -0400 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -60413,9 +60770,9 @@ diff -urNp linux-3.0.7/include/linux/sunrpc/clnt.h linux-3.0.7/include/linux/sun } #endif /* __KERNEL__ */ -diff -urNp linux-3.0.7/include/linux/sunrpc/svc_rdma.h linux-3.0.7/include/linux/sunrpc/svc_rdma.h ---- linux-3.0.7/include/linux/sunrpc/svc_rdma.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/sunrpc/svc_rdma.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/sunrpc/svc_rdma.h linux-3.0.8/include/linux/sunrpc/svc_rdma.h +--- linux-3.0.8/include/linux/sunrpc/svc_rdma.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/sunrpc/svc_rdma.h 2011-08-23 21:47:56.000000000 -0400 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord; extern unsigned int svcrdma_max_requests; extern unsigned int svcrdma_max_req_size; @@ -60441,9 +60798,9 @@ diff -urNp linux-3.0.7/include/linux/sunrpc/svc_rdma.h linux-3.0.7/include/linux #define RPCRDMA_VERSION 1 -diff -urNp linux-3.0.7/include/linux/sysctl.h linux-3.0.7/include/linux/sysctl.h ---- linux-3.0.7/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/sysctl.h linux-3.0.8/include/linux/sysctl.h +--- linux-3.0.8/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400 @@ -155,7 +155,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -60466,9 +60823,9 @@ diff -urNp linux-3.0.7/include/linux/sysctl.h linux-3.0.7/include/linux/sysctl.h extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, -diff -urNp linux-3.0.7/include/linux/tty_ldisc.h linux-3.0.7/include/linux/tty_ldisc.h ---- linux-3.0.7/include/linux/tty_ldisc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/tty_ldisc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/tty_ldisc.h linux-3.0.8/include/linux/tty_ldisc.h +--- linux-3.0.8/include/linux/tty_ldisc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/tty_ldisc.h 2011-08-23 21:47:56.000000000 -0400 @@ -148,7 +148,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -60478,9 +60835,9 @@ diff -urNp linux-3.0.7/include/linux/tty_ldisc.h linux-3.0.7/include/linux/tty_l }; struct tty_ldisc { -diff -urNp linux-3.0.7/include/linux/types.h linux-3.0.7/include/linux/types.h ---- linux-3.0.7/include/linux/types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/types.h linux-3.0.8/include/linux/types.h +--- linux-3.0.8/include/linux/types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/types.h 2011-08-23 21:47:56.000000000 -0400 @@ -213,10 +213,26 @@ typedef struct { int counter; } atomic_t; @@ -60508,9 +60865,9 @@ diff -urNp linux-3.0.7/include/linux/types.h linux-3.0.7/include/linux/types.h #endif struct list_head { -diff -urNp linux-3.0.7/include/linux/uaccess.h linux-3.0.7/include/linux/uaccess.h ---- linux-3.0.7/include/linux/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/uaccess.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/uaccess.h linux-3.0.8/include/linux/uaccess.h +--- linux-3.0.8/include/linux/uaccess.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/uaccess.h 2011-10-06 04:17:55.000000000 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -60526,9 +60883,9 @@ diff -urNp linux-3.0.7/include/linux/uaccess.h linux-3.0.7/include/linux/uaccess ret; \ }) -diff -urNp linux-3.0.7/include/linux/unaligned/access_ok.h linux-3.0.7/include/linux/unaligned/access_ok.h ---- linux-3.0.7/include/linux/unaligned/access_ok.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/unaligned/access_ok.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/unaligned/access_ok.h linux-3.0.8/include/linux/unaligned/access_ok.h +--- linux-3.0.8/include/linux/unaligned/access_ok.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/unaligned/access_ok.h 2011-08-23 21:47:56.000000000 -0400 @@ -6,32 +6,32 @@ static inline u16 get_unaligned_le16(const void *p) @@ -60568,9 +60925,9 @@ diff -urNp linux-3.0.7/include/linux/unaligned/access_ok.h linux-3.0.7/include/l } static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-3.0.7/include/linux/vermagic.h linux-3.0.7/include/linux/vermagic.h ---- linux-3.0.7/include/linux/vermagic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/vermagic.h 2011-10-07 19:25:35.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/vermagic.h linux-3.0.8/include/linux/vermagic.h +--- linux-3.0.8/include/linux/vermagic.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/vermagic.h 2011-10-07 19:25:35.000000000 -0400 @@ -26,9 +26,28 @@ #define MODULE_ARCH_VERMAGIC "" #endif @@ -60601,9 +60958,9 @@ diff -urNp linux-3.0.7/include/linux/vermagic.h linux-3.0.7/include/linux/vermag + MODULE_ARCH_VERMAGIC \ + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC -diff -urNp linux-3.0.7/include/linux/vmalloc.h linux-3.0.7/include/linux/vmalloc.h ---- linux-3.0.7/include/linux/vmalloc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/vmalloc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/vmalloc.h linux-3.0.8/include/linux/vmalloc.h +--- linux-3.0.8/include/linux/vmalloc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/vmalloc.h 2011-08-23 21:47:56.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 */ @@ -60720,9 +61077,9 @@ diff -urNp linux-3.0.7/include/linux/vmalloc.h linux-3.0.7/include/linux/vmalloc +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-3.0.7/include/linux/vmstat.h linux-3.0.7/include/linux/vmstat.h ---- linux-3.0.7/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/linux/vmstat.h linux-3.0.8/include/linux/vmstat.h +--- linux-3.0.8/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -60786,9 +61143,9 @@ diff -urNp linux-3.0.7/include/linux/vmstat.h linux-3.0.7/include/linux/vmstat.h } static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-3.0.7/include/media/saa7146_vv.h linux-3.0.7/include/media/saa7146_vv.h ---- linux-3.0.7/include/media/saa7146_vv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/media/saa7146_vv.h 2011-10-07 19:07:40.000000000 -0400 +diff -urNp linux-3.0.8/include/media/saa7146_vv.h linux-3.0.8/include/media/saa7146_vv.h +--- linux-3.0.8/include/media/saa7146_vv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/media/saa7146_vv.h 2011-10-07 19:07:40.000000000 -0400 @@ -163,7 +163,7 @@ struct saa7146_ext_vv int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *); @@ -60798,9 +61155,9 @@ diff -urNp linux-3.0.7/include/media/saa7146_vv.h linux-3.0.7/include/media/saa7 /* pointer to the saa7146 core ops */ const struct v4l2_ioctl_ops *core_ops; -diff -urNp linux-3.0.7/include/media/v4l2-dev.h linux-3.0.7/include/media/v4l2-dev.h ---- linux-3.0.7/include/media/v4l2-dev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/media/v4l2-dev.h 2011-10-07 19:07:40.000000000 -0400 +diff -urNp linux-3.0.8/include/media/v4l2-dev.h linux-3.0.8/include/media/v4l2-dev.h +--- linux-3.0.8/include/media/v4l2-dev.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/media/v4l2-dev.h 2011-10-07 19:07:40.000000000 -0400 @@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta @@ -60818,9 +61175,9 @@ diff -urNp linux-3.0.7/include/media/v4l2-dev.h linux-3.0.7/include/media/v4l2-d /* * Newer version of video_device, handled by videodev2.c -diff -urNp linux-3.0.7/include/media/v4l2-ioctl.h linux-3.0.7/include/media/v4l2-ioctl.h ---- linux-3.0.7/include/media/v4l2-ioctl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/media/v4l2-ioctl.h 2011-08-24 18:25:45.000000000 -0400 +diff -urNp linux-3.0.8/include/media/v4l2-ioctl.h linux-3.0.8/include/media/v4l2-ioctl.h +--- linux-3.0.8/include/media/v4l2-ioctl.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/media/v4l2-ioctl.h 2011-08-24 18:25:45.000000000 -0400 @@ -272,6 +272,7 @@ struct v4l2_ioctl_ops { long (*vidioc_default) (struct file *file, void *fh, bool valid_prio, int cmd, void *arg); @@ -60829,9 +61186,9 @@ diff -urNp linux-3.0.7/include/media/v4l2-ioctl.h linux-3.0.7/include/media/v4l2 /* v4l debugging and diagnostics */ -diff -urNp linux-3.0.7/include/net/caif/cfctrl.h linux-3.0.7/include/net/caif/cfctrl.h ---- linux-3.0.7/include/net/caif/cfctrl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/caif/cfctrl.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/caif/cfctrl.h linux-3.0.8/include/net/caif/cfctrl.h +--- linux-3.0.8/include/net/caif/cfctrl.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/caif/cfctrl.h 2011-08-23 21:47:56.000000000 -0400 @@ -52,7 +52,7 @@ struct cfctrl_rsp { void (*radioset_rsp)(void); void (*reject_rsp)(struct cflayer *layer, u8 linkid, @@ -60852,9 +61209,9 @@ diff -urNp linux-3.0.7/include/net/caif/cfctrl.h linux-3.0.7/include/net/caif/cf struct list_head list; /* Protects from simultaneous access to first_req list */ spinlock_t info_list_lock; -diff -urNp linux-3.0.7/include/net/flow.h linux-3.0.7/include/net/flow.h ---- linux-3.0.7/include/net/flow.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/flow.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/flow.h linux-3.0.8/include/net/flow.h +--- linux-3.0.8/include/net/flow.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/flow.h 2011-08-23 21:47:56.000000000 -0400 @@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca u8 dir, flow_resolve_t resolver, void *ctx); @@ -60863,9 +61220,9 @@ diff -urNp linux-3.0.7/include/net/flow.h linux-3.0.7/include/net/flow.h +extern atomic_unchecked_t flow_cache_genid; #endif -diff -urNp linux-3.0.7/include/net/inetpeer.h linux-3.0.7/include/net/inetpeer.h ---- linux-3.0.7/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/inetpeer.h linux-3.0.8/include/net/inetpeer.h +--- linux-3.0.8/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400 @@ -43,8 +43,8 @@ struct inet_peer { */ union { @@ -60886,9 +61243,9 @@ diff -urNp linux-3.0.7/include/net/inetpeer.h linux-3.0.7/include/net/inetpeer.h } #endif /* _NET_INETPEER_H */ -diff -urNp linux-3.0.7/include/net/ip_fib.h linux-3.0.7/include/net/ip_fib.h ---- linux-3.0.7/include/net/ip_fib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/ip_fib.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/ip_fib.h linux-3.0.8/include/net/ip_fib.h +--- linux-3.0.8/include/net/ip_fib.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/ip_fib.h 2011-08-23 21:47:56.000000000 -0400 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s #define FIB_RES_SADDR(net, res) \ @@ -60898,9 +61255,9 @@ diff -urNp linux-3.0.7/include/net/ip_fib.h linux-3.0.7/include/net/ip_fib.h FIB_RES_NH(res).nh_saddr : \ fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) -diff -urNp linux-3.0.7/include/net/ip_vs.h linux-3.0.7/include/net/ip_vs.h ---- linux-3.0.7/include/net/ip_vs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/ip_vs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/ip_vs.h linux-3.0.8/include/net/ip_vs.h +--- linux-3.0.8/include/net/ip_vs.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/ip_vs.h 2011-08-23 21:47:56.000000000 -0400 @@ -509,7 +509,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection */ atomic_t n_control; /* Number of controlled ones */ @@ -60919,9 +61276,9 @@ diff -urNp linux-3.0.7/include/net/ip_vs.h linux-3.0.7/include/net/ip_vs.h atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -diff -urNp linux-3.0.7/include/net/irda/ircomm_core.h linux-3.0.7/include/net/irda/ircomm_core.h ---- linux-3.0.7/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/irda/ircomm_core.h linux-3.0.8/include/net/irda/ircomm_core.h +--- linux-3.0.8/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400 @@ -51,7 +51,7 @@ typedef struct { int (*connect_response)(struct ircomm_cb *, struct sk_buff *); int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, @@ -60931,9 +61288,9 @@ diff -urNp linux-3.0.7/include/net/irda/ircomm_core.h linux-3.0.7/include/net/ir struct ircomm_cb { irda_queue_t queue; -diff -urNp linux-3.0.7/include/net/irda/ircomm_tty.h linux-3.0.7/include/net/irda/ircomm_tty.h ---- linux-3.0.7/include/net/irda/ircomm_tty.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/irda/ircomm_tty.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/irda/ircomm_tty.h linux-3.0.8/include/net/irda/ircomm_tty.h +--- linux-3.0.8/include/net/irda/ircomm_tty.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/irda/ircomm_tty.h 2011-08-23 21:47:56.000000000 -0400 @@ -35,6 +35,7 @@ #include <linux/termios.h> #include <linux/timer.h> @@ -60953,9 +61310,9 @@ diff -urNp linux-3.0.7/include/net/irda/ircomm_tty.h linux-3.0.7/include/net/ird /* Protect concurent access to : * o self->open_count -diff -urNp linux-3.0.7/include/net/iucv/af_iucv.h linux-3.0.7/include/net/iucv/af_iucv.h ---- linux-3.0.7/include/net/iucv/af_iucv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/iucv/af_iucv.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/iucv/af_iucv.h linux-3.0.8/include/net/iucv/af_iucv.h +--- linux-3.0.8/include/net/iucv/af_iucv.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/iucv/af_iucv.h 2011-08-23 21:47:56.000000000 -0400 @@ -87,7 +87,7 @@ struct iucv_sock { struct iucv_sock_list { struct hlist_head head; @@ -60965,9 +61322,9 @@ diff -urNp linux-3.0.7/include/net/iucv/af_iucv.h linux-3.0.7/include/net/iucv/a }; unsigned int iucv_sock_poll(struct file *file, struct socket *sock, -diff -urNp linux-3.0.7/include/net/lapb.h linux-3.0.7/include/net/lapb.h ---- linux-3.0.7/include/net/lapb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/lapb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/lapb.h linux-3.0.8/include/net/lapb.h +--- linux-3.0.8/include/net/lapb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/lapb.h 2011-08-23 21:47:56.000000000 -0400 @@ -95,7 +95,7 @@ struct lapb_cb { struct sk_buff_head write_queue; struct sk_buff_head ack_queue; @@ -60977,9 +61334,9 @@ diff -urNp linux-3.0.7/include/net/lapb.h linux-3.0.7/include/net/lapb.h /* FRMR control information */ struct lapb_frame frmr_data; -diff -urNp linux-3.0.7/include/net/neighbour.h linux-3.0.7/include/net/neighbour.h ---- linux-3.0.7/include/net/neighbour.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/neighbour.h 2011-08-31 18:39:25.000000000 -0400 +diff -urNp linux-3.0.8/include/net/neighbour.h linux-3.0.8/include/net/neighbour.h +--- linux-3.0.8/include/net/neighbour.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/neighbour.h 2011-08-31 18:39:25.000000000 -0400 @@ -124,7 +124,7 @@ struct neigh_ops { int (*connected_output)(struct sk_buff*); int (*hh_output)(struct sk_buff*); @@ -60989,9 +61346,9 @@ diff -urNp linux-3.0.7/include/net/neighbour.h linux-3.0.7/include/net/neighbour struct pneigh_entry { struct pneigh_entry *next; -diff -urNp linux-3.0.7/include/net/netlink.h linux-3.0.7/include/net/netlink.h ---- linux-3.0.7/include/net/netlink.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/netlink.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/netlink.h linux-3.0.8/include/net/netlink.h +--- linux-3.0.8/include/net/netlink.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/netlink.h 2011-08-23 21:47:56.000000000 -0400 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { @@ -61001,9 +61358,9 @@ diff -urNp linux-3.0.7/include/net/netlink.h linux-3.0.7/include/net/netlink.h } /** -diff -urNp linux-3.0.7/include/net/netns/ipv4.h linux-3.0.7/include/net/netns/ipv4.h ---- linux-3.0.7/include/net/netns/ipv4.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/netns/ipv4.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/netns/ipv4.h linux-3.0.8/include/net/netns/ipv4.h +--- linux-3.0.8/include/net/netns/ipv4.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/netns/ipv4.h 2011-08-23 21:47:56.000000000 -0400 @@ -56,8 +56,8 @@ struct netns_ipv4 { unsigned int sysctl_ping_group_range[2]; @@ -61015,9 +61372,9 @@ diff -urNp linux-3.0.7/include/net/netns/ipv4.h linux-3.0.7/include/net/netns/ip #ifdef CONFIG_IP_MROUTE #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES -diff -urNp linux-3.0.7/include/net/sctp/sctp.h linux-3.0.7/include/net/sctp/sctp.h ---- linux-3.0.7/include/net/sctp/sctp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/sctp/sctp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/sctp/sctp.h linux-3.0.8/include/net/sctp/sctp.h +--- linux-3.0.8/include/net/sctp/sctp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/sctp/sctp.h 2011-08-23 21:47:56.000000000 -0400 @@ -315,9 +315,9 @@ do { \ #else /* SCTP_DEBUG */ @@ -61031,9 +61388,9 @@ diff -urNp linux-3.0.7/include/net/sctp/sctp.h linux-3.0.7/include/net/sctp/sctp #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-3.0.7/include/net/sock.h linux-3.0.7/include/net/sock.h ---- linux-3.0.7/include/net/sock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/sock.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/sock.h linux-3.0.8/include/net/sock.h +--- linux-3.0.8/include/net/sock.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/sock.h 2011-08-23 21:47:56.000000000 -0400 @@ -277,7 +277,7 @@ struct sock { #ifdef CONFIG_RPS __u32 sk_rxhash; @@ -61052,9 +61409,9 @@ diff -urNp linux-3.0.7/include/net/sock.h linux-3.0.7/include/net/sock.h int copy, int offset) { if (skb->ip_summed == CHECKSUM_NONE) { -diff -urNp linux-3.0.7/include/net/tcp.h linux-3.0.7/include/net/tcp.h ---- linux-3.0.7/include/net/tcp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/tcp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/tcp.h linux-3.0.8/include/net/tcp.h +--- linux-3.0.8/include/net/tcp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/tcp.h 2011-08-23 21:47:56.000000000 -0400 @@ -1374,8 +1374,8 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -61066,9 +61423,9 @@ diff -urNp linux-3.0.7/include/net/tcp.h linux-3.0.7/include/net/tcp.h }; struct tcp_iter_state { -diff -urNp linux-3.0.7/include/net/udp.h linux-3.0.7/include/net/udp.h ---- linux-3.0.7/include/net/udp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/udp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/udp.h linux-3.0.8/include/net/udp.h +--- linux-3.0.8/include/net/udp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/udp.h 2011-08-23 21:47:56.000000000 -0400 @@ -234,8 +234,8 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -61080,9 +61437,9 @@ diff -urNp linux-3.0.7/include/net/udp.h linux-3.0.7/include/net/udp.h }; struct udp_iter_state { -diff -urNp linux-3.0.7/include/net/xfrm.h linux-3.0.7/include/net/xfrm.h ---- linux-3.0.7/include/net/xfrm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/net/xfrm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/net/xfrm.h linux-3.0.8/include/net/xfrm.h +--- linux-3.0.8/include/net/xfrm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/net/xfrm.h 2011-08-23 21:47:56.000000000 -0400 @@ -505,7 +505,7 @@ struct xfrm_policy { struct timer_list timer; @@ -61092,9 +61449,9 @@ diff -urNp linux-3.0.7/include/net/xfrm.h linux-3.0.7/include/net/xfrm.h u32 priority; u32 index; struct xfrm_mark mark; -diff -urNp linux-3.0.7/include/rdma/iw_cm.h linux-3.0.7/include/rdma/iw_cm.h ---- linux-3.0.7/include/rdma/iw_cm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/rdma/iw_cm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/rdma/iw_cm.h linux-3.0.8/include/rdma/iw_cm.h +--- linux-3.0.8/include/rdma/iw_cm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/rdma/iw_cm.h 2011-08-23 21:47:56.000000000 -0400 @@ -120,7 +120,7 @@ struct iw_cm_verbs { int backlog); @@ -61104,9 +61461,9 @@ diff -urNp linux-3.0.7/include/rdma/iw_cm.h linux-3.0.7/include/rdma/iw_cm.h /** * iw_create_cm_id - Create an IW CM identifier. -diff -urNp linux-3.0.7/include/scsi/libfc.h linux-3.0.7/include/scsi/libfc.h ---- linux-3.0.7/include/scsi/libfc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/scsi/libfc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/scsi/libfc.h linux-3.0.8/include/scsi/libfc.h +--- linux-3.0.8/include/scsi/libfc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/scsi/libfc.h 2011-08-23 21:47:56.000000000 -0400 @@ -750,6 +750,7 @@ struct libfc_function_template { */ void (*disc_stop_final) (struct fc_lport *); @@ -61124,9 +61481,9 @@ diff -urNp linux-3.0.7/include/scsi/libfc.h linux-3.0.7/include/scsi/libfc.h u8 link_up; u8 qfull; enum fc_lport_state state; -diff -urNp linux-3.0.7/include/scsi/scsi_device.h linux-3.0.7/include/scsi/scsi_device.h ---- linux-3.0.7/include/scsi/scsi_device.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/scsi/scsi_device.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/scsi/scsi_device.h linux-3.0.8/include/scsi/scsi_device.h +--- linux-3.0.8/include/scsi/scsi_device.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/scsi/scsi_device.h 2011-08-23 21:47:56.000000000 -0400 @@ -161,9 +161,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -61140,9 +61497,9 @@ diff -urNp linux-3.0.7/include/scsi/scsi_device.h linux-3.0.7/include/scsi/scsi_ struct device sdev_gendev, sdev_dev; -diff -urNp linux-3.0.7/include/scsi/scsi_transport_fc.h linux-3.0.7/include/scsi/scsi_transport_fc.h ---- linux-3.0.7/include/scsi/scsi_transport_fc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/scsi/scsi_transport_fc.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/scsi/scsi_transport_fc.h linux-3.0.8/include/scsi/scsi_transport_fc.h +--- linux-3.0.8/include/scsi/scsi_transport_fc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/scsi/scsi_transport_fc.h 2011-08-26 19:49:56.000000000 -0400 @@ -711,7 +711,7 @@ struct fc_function_template { unsigned long show_host_system_hostname:1; @@ -61152,9 +61509,9 @@ diff -urNp linux-3.0.7/include/scsi/scsi_transport_fc.h linux-3.0.7/include/scsi /** -diff -urNp linux-3.0.7/include/sound/ak4xxx-adda.h linux-3.0.7/include/sound/ak4xxx-adda.h ---- linux-3.0.7/include/sound/ak4xxx-adda.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/ak4xxx-adda.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/ak4xxx-adda.h linux-3.0.8/include/sound/ak4xxx-adda.h +--- linux-3.0.8/include/sound/ak4xxx-adda.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/ak4xxx-adda.h 2011-08-23 21:47:56.000000000 -0400 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops { void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg, unsigned char val); @@ -61164,9 +61521,9 @@ diff -urNp linux-3.0.7/include/sound/ak4xxx-adda.h linux-3.0.7/include/sound/ak4 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */ -diff -urNp linux-3.0.7/include/sound/hwdep.h linux-3.0.7/include/sound/hwdep.h ---- linux-3.0.7/include/sound/hwdep.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/hwdep.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/hwdep.h linux-3.0.8/include/sound/hwdep.h +--- linux-3.0.8/include/sound/hwdep.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/hwdep.h 2011-08-23 21:47:56.000000000 -0400 @@ -49,7 +49,7 @@ struct snd_hwdep_ops { struct snd_hwdep_dsp_status *status); int (*dsp_load)(struct snd_hwdep *hw, @@ -61176,9 +61533,9 @@ diff -urNp linux-3.0.7/include/sound/hwdep.h linux-3.0.7/include/sound/hwdep.h struct snd_hwdep { struct snd_card *card; -diff -urNp linux-3.0.7/include/sound/info.h linux-3.0.7/include/sound/info.h ---- linux-3.0.7/include/sound/info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/info.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/info.h linux-3.0.8/include/sound/info.h +--- linux-3.0.8/include/sound/info.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/info.h 2011-08-23 21:47:56.000000000 -0400 @@ -44,7 +44,7 @@ struct snd_info_entry_text { struct snd_info_buffer *buffer); void (*write)(struct snd_info_entry *entry, @@ -61188,9 +61545,9 @@ diff -urNp linux-3.0.7/include/sound/info.h linux-3.0.7/include/sound/info.h struct snd_info_entry_ops { int (*open)(struct snd_info_entry *entry, -diff -urNp linux-3.0.7/include/sound/pcm.h linux-3.0.7/include/sound/pcm.h ---- linux-3.0.7/include/sound/pcm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/pcm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/pcm.h linux-3.0.8/include/sound/pcm.h +--- linux-3.0.8/include/sound/pcm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/pcm.h 2011-08-23 21:47:56.000000000 -0400 @@ -81,6 +81,7 @@ struct snd_pcm_ops { int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma); int (*ack)(struct snd_pcm_substream *substream); @@ -61199,9 +61556,9 @@ diff -urNp linux-3.0.7/include/sound/pcm.h linux-3.0.7/include/sound/pcm.h /* * -diff -urNp linux-3.0.7/include/sound/sb16_csp.h linux-3.0.7/include/sound/sb16_csp.h ---- linux-3.0.7/include/sound/sb16_csp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/sb16_csp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/sb16_csp.h linux-3.0.8/include/sound/sb16_csp.h +--- linux-3.0.8/include/sound/sb16_csp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/sb16_csp.h 2011-08-23 21:47:56.000000000 -0400 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops { int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels); int (*csp_stop) (struct snd_sb_csp * p); @@ -61211,9 +61568,9 @@ diff -urNp linux-3.0.7/include/sound/sb16_csp.h linux-3.0.7/include/sound/sb16_c /* * CSP private data -diff -urNp linux-3.0.7/include/sound/soc.h linux-3.0.7/include/sound/soc.h ---- linux-3.0.7/include/sound/soc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/soc.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/soc.h linux-3.0.8/include/sound/soc.h +--- linux-3.0.8/include/sound/soc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/soc.h 2011-08-26 19:49:56.000000000 -0400 @@ -636,7 +636,7 @@ struct snd_soc_platform_driver { /* platform stream ops */ @@ -61223,9 +61580,9 @@ diff -urNp linux-3.0.7/include/sound/soc.h linux-3.0.7/include/sound/soc.h struct snd_soc_platform { const char *name; -diff -urNp linux-3.0.7/include/sound/ymfpci.h linux-3.0.7/include/sound/ymfpci.h ---- linux-3.0.7/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/sound/ymfpci.h linux-3.0.8/include/sound/ymfpci.h +--- linux-3.0.8/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400 @@ -358,7 +358,7 @@ struct snd_ymfpci { spinlock_t reg_lock; spinlock_t voice_lock; @@ -61235,9 +61592,9 @@ diff -urNp linux-3.0.7/include/sound/ymfpci.h linux-3.0.7/include/sound/ymfpci.h struct snd_info_entry *proc_entry; const struct firmware *dsp_microcode; const struct firmware *controller_microcode; -diff -urNp linux-3.0.7/include/target/target_core_base.h linux-3.0.7/include/target/target_core_base.h ---- linux-3.0.7/include/target/target_core_base.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/target/target_core_base.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/target/target_core_base.h linux-3.0.8/include/target/target_core_base.h +--- linux-3.0.8/include/target/target_core_base.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/target/target_core_base.h 2011-08-23 21:47:56.000000000 -0400 @@ -364,7 +364,7 @@ struct t10_reservation_ops { int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32); int (*t10_pr_register)(struct se_cmd *); @@ -61267,9 +61624,9 @@ diff -urNp linux-3.0.7/include/target/target_core_base.h linux-3.0.7/include/tar atomic_t dev_tur_active; atomic_t execute_tasks; atomic_t dev_status_thr_count; -diff -urNp linux-3.0.7/include/trace/events/irq.h linux-3.0.7/include/trace/events/irq.h ---- linux-3.0.7/include/trace/events/irq.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/trace/events/irq.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/trace/events/irq.h linux-3.0.8/include/trace/events/irq.h +--- linux-3.0.8/include/trace/events/irq.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/trace/events/irq.h 2011-08-23 21:47:56.000000000 -0400 @@ -36,7 +36,7 @@ struct softirq_action; */ TRACE_EVENT(irq_handler_entry, @@ -61288,9 +61645,9 @@ diff -urNp linux-3.0.7/include/trace/events/irq.h linux-3.0.7/include/trace/even TP_ARGS(irq, action, ret), -diff -urNp linux-3.0.7/include/video/udlfb.h linux-3.0.7/include/video/udlfb.h ---- linux-3.0.7/include/video/udlfb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/video/udlfb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/video/udlfb.h linux-3.0.8/include/video/udlfb.h +--- linux-3.0.8/include/video/udlfb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/video/udlfb.h 2011-08-23 21:47:56.000000000 -0400 @@ -51,10 +51,10 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; @@ -61306,9 +61663,9 @@ diff -urNp linux-3.0.7/include/video/udlfb.h linux-3.0.7/include/video/udlfb.h }; #define NR_USB_REQUEST_I2C_SUB_IO 0x02 -diff -urNp linux-3.0.7/include/video/uvesafb.h linux-3.0.7/include/video/uvesafb.h ---- linux-3.0.7/include/video/uvesafb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/include/video/uvesafb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/include/video/uvesafb.h linux-3.0.8/include/video/uvesafb.h +--- linux-3.0.8/include/video/uvesafb.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/include/video/uvesafb.h 2011-08-23 21:47:56.000000000 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -61317,21 +61674,9 @@ diff -urNp linux-3.0.7/include/video/uvesafb.h linux-3.0.7/include/video/uvesafb void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-3.0.7/init/Kconfig linux-3.0.7/init/Kconfig ---- linux-3.0.7/init/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/Kconfig 2011-08-23 21:47:56.000000000 -0400 -@@ -1195,7 +1195,7 @@ config SLUB_DEBUG - - config COMPAT_BRK - bool "Disable heap randomization" -- default y -+ default n - help - Randomizing heap placement makes heap exploits harder, but it - also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-3.0.7/init/do_mounts.c linux-3.0.7/init/do_mounts.c ---- linux-3.0.7/init/do_mounts.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/do_mounts.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/do_mounts.c linux-3.0.8/init/do_mounts.c +--- linux-3.0.8/init/do_mounts.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/do_mounts.c 2011-10-06 04:17:55.000000000 -0400 @@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -61377,9 +61722,9 @@ diff -urNp linux-3.0.7/init/do_mounts.c linux-3.0.7/init/do_mounts.c + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((const char __force_user *)"."); } -diff -urNp linux-3.0.7/init/do_mounts.h linux-3.0.7/init/do_mounts.h ---- linux-3.0.7/init/do_mounts.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/do_mounts.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/do_mounts.h linux-3.0.8/init/do_mounts.h +--- linux-3.0.8/init/do_mounts.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/do_mounts.h 2011-10-06 04:17:55.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -61408,9 +61753,9 @@ diff -urNp linux-3.0.7/init/do_mounts.h linux-3.0.7/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-3.0.7/init/do_mounts_initrd.c linux-3.0.7/init/do_mounts_initrd.c ---- linux-3.0.7/init/do_mounts_initrd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/do_mounts_initrd.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/do_mounts_initrd.c linux-3.0.8/init/do_mounts_initrd.c +--- linux-3.0.8/init/do_mounts_initrd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/do_mounts_initrd.c 2011-10-06 04:17:55.000000000 -0400 @@ -44,13 +44,13 @@ static void __init handle_initrd(void) create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ @@ -61485,9 +61830,9 @@ diff -urNp linux-3.0.7/init/do_mounts_initrd.c linux-3.0.7/init/do_mounts_initrd + sys_unlink((const char __force_user *)"/initrd.image"); return 0; } -diff -urNp linux-3.0.7/init/do_mounts_md.c linux-3.0.7/init/do_mounts_md.c ---- linux-3.0.7/init/do_mounts_md.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/do_mounts_md.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/do_mounts_md.c linux-3.0.8/init/do_mounts_md.c +--- linux-3.0.8/init/do_mounts_md.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/do_mounts_md.c 2011-10-06 04:17:55.000000000 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -61515,9 +61860,9 @@ diff -urNp linux-3.0.7/init/do_mounts_md.c linux-3.0.7/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-3.0.7/init/initramfs.c linux-3.0.7/init/initramfs.c ---- linux-3.0.7/init/initramfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/initramfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/initramfs.c linux-3.0.8/init/initramfs.c +--- linux-3.0.8/init/initramfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/initramfs.c 2011-10-06 04:17:55.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -61626,9 +61971,21 @@ diff -urNp linux-3.0.7/init/initramfs.c linux-3.0.7/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-3.0.7/init/main.c linux-3.0.7/init/main.c ---- linux-3.0.7/init/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/init/main.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/init/Kconfig linux-3.0.8/init/Kconfig +--- linux-3.0.8/init/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/Kconfig 2011-08-23 21:47:56.000000000 -0400 +@@ -1195,7 +1195,7 @@ config SLUB_DEBUG + + config COMPAT_BRK + bool "Disable heap randomization" +- default y ++ default n + help + Randomizing heap placement makes heap exploits harder, but it + also breaks ancient binaries (including anything libc5 based). +diff -urNp linux-3.0.8/init/main.c linux-3.0.8/init/main.c +--- linux-3.0.8/init/main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/init/main.c 2011-10-06 04:17:55.000000000 -0400 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) extern void tc_init(void); #endif @@ -61740,9 +62097,9 @@ diff -urNp linux-3.0.7/init/main.c linux-3.0.7/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-3.0.7/ipc/mqueue.c linux-3.0.7/ipc/mqueue.c ---- linux-3.0.7/ipc/mqueue.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/ipc/mqueue.c 2011-10-16 21:59:31.000000000 -0400 +diff -urNp linux-3.0.8/ipc/mqueue.c linux-3.0.8/ipc/mqueue.c +--- linux-3.0.8/ipc/mqueue.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/ipc/mqueue.c 2011-10-16 21:59:31.000000000 -0400 @@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -61751,9 +62108,9 @@ diff -urNp linux-3.0.7/ipc/mqueue.c linux-3.0.7/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) { -diff -urNp linux-3.0.7/ipc/msg.c linux-3.0.7/ipc/msg.c ---- linux-3.0.7/ipc/msg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/ipc/msg.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/ipc/msg.c linux-3.0.8/ipc/msg.c +--- linux-3.0.8/ipc/msg.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/ipc/msg.c 2011-08-23 21:47:56.000000000 -0400 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke return security_msg_queue_associate(msq, msgflg); } @@ -61779,9 +62136,9 @@ diff -urNp linux-3.0.7/ipc/msg.c linux-3.0.7/ipc/msg.c msg_params.key = key; msg_params.flg = msgflg; -diff -urNp linux-3.0.7/ipc/sem.c linux-3.0.7/ipc/sem.c ---- linux-3.0.7/ipc/sem.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/ipc/sem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/ipc/sem.c linux-3.0.8/ipc/sem.c +--- linux-3.0.8/ipc/sem.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/ipc/sem.c 2011-08-23 21:48:14.000000000 -0400 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct return 0; } @@ -61828,9 +62185,9 @@ diff -urNp linux-3.0.7/ipc/sem.c linux-3.0.7/ipc/sem.c ns = current->nsproxy->ipc_ns; if (nsops < 1 || semid < 0) -diff -urNp linux-3.0.7/ipc/shm.c linux-3.0.7/ipc/shm.c ---- linux-3.0.7/ipc/shm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/ipc/shm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/ipc/shm.c linux-3.0.8/ipc/shm.c +--- linux-3.0.8/ipc/shm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/ipc/shm.c 2011-08-23 21:48:14.000000000 -0400 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -61917,9 +62274,9 @@ diff -urNp linux-3.0.7/ipc/shm.c linux-3.0.7/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-3.0.7/kernel/acct.c linux-3.0.7/kernel/acct.c ---- linux-3.0.7/kernel/acct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/acct.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/acct.c linux-3.0.8/kernel/acct.c +--- linux-3.0.8/kernel/acct.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/acct.c 2011-10-06 04:17:55.000000000 -0400 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -61929,9 +62286,9 @@ diff -urNp linux-3.0.7/kernel/acct.c linux-3.0.7/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-3.0.7/kernel/audit.c linux-3.0.7/kernel/audit.c ---- linux-3.0.7/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/audit.c linux-3.0.8/kernel/audit.c +--- linux-3.0.8/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400 @@ -112,7 +112,7 @@ u32 audit_sig_sid = 0; 3) suppressed due to audit_rate_limit 4) suppressed due to audit_backlog_limit @@ -61968,9 +62325,9 @@ diff -urNp linux-3.0.7/kernel/audit.c linux-3.0.7/kernel/audit.c status_set.backlog = skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); -diff -urNp linux-3.0.7/kernel/auditsc.c linux-3.0.7/kernel/auditsc.c ---- linux-3.0.7/kernel/auditsc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/auditsc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/auditsc.c linux-3.0.8/kernel/auditsc.c +--- linux-3.0.8/kernel/auditsc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/auditsc.c 2011-08-23 21:47:56.000000000 -0400 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte } @@ -61989,9 +62346,9 @@ diff -urNp linux-3.0.7/kernel/auditsc.c linux-3.0.7/kernel/auditsc.c struct audit_context *context = task->audit_context; if (context && context->in_syscall) { -diff -urNp linux-3.0.7/kernel/capability.c linux-3.0.7/kernel/capability.c ---- linux-3.0.7/kernel/capability.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/capability.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/capability.c linux-3.0.8/kernel/capability.c +--- linux-3.0.8/kernel/capability.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/capability.c 2011-08-23 21:48:14.000000000 -0400 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ * before modification is attempted and the application * fails. @@ -62052,9 +62409,9 @@ diff -urNp linux-3.0.7/kernel/capability.c linux-3.0.7/kernel/capability.c /** * nsown_capable - Check superior capability to one's own user_ns * @cap: The capability in question -diff -urNp linux-3.0.7/kernel/cgroup.c linux-3.0.7/kernel/cgroup.c ---- linux-3.0.7/kernel/cgroup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/cgroup.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/cgroup.c linux-3.0.8/kernel/cgroup.c +--- linux-3.0.8/kernel/cgroup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/cgroup.c 2011-08-23 21:48:14.000000000 -0400 @@ -593,6 +593,8 @@ static struct css_set *find_css_set( struct hlist_head *hhead; struct cg_cgroup_link *link; @@ -62064,9 +62421,9 @@ diff -urNp linux-3.0.7/kernel/cgroup.c linux-3.0.7/kernel/cgroup.c /* First see if we already have a cgroup group that matches * the desired set */ read_lock(&css_set_lock); -diff -urNp linux-3.0.7/kernel/compat.c linux-3.0.7/kernel/compat.c ---- linux-3.0.7/kernel/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/compat.c linux-3.0.8/kernel/compat.c +--- linux-3.0.8/kernel/compat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/compat.c 2011-10-06 04:17:55.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/linkage.h> @@ -62232,9 +62589,9 @@ diff -urNp linux-3.0.7/kernel/compat.c linux-3.0.7/kernel/compat.c set_fs(oldfs); if ((err == -ERESTART_RESTARTBLOCK) && rmtp && -diff -urNp linux-3.0.7/kernel/configs.c linux-3.0.7/kernel/configs.c ---- linux-3.0.7/kernel/configs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/configs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/configs.c linux-3.0.8/kernel/configs.c +--- linux-3.0.8/kernel/configs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/configs.c 2011-08-23 21:48:14.000000000 -0400 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -62255,9 +62612,9 @@ diff -urNp linux-3.0.7/kernel/configs.c linux-3.0.7/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-3.0.7/kernel/cred.c linux-3.0.7/kernel/cred.c ---- linux-3.0.7/kernel/cred.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/cred.c 2011-08-25 17:23:03.000000000 -0400 +diff -urNp linux-3.0.8/kernel/cred.c linux-3.0.8/kernel/cred.c +--- linux-3.0.8/kernel/cred.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/cred.c 2011-08-25 17:23:03.000000000 -0400 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head */ void __put_cred(struct cred *cred) @@ -62406,9 +62763,9 @@ diff -urNp linux-3.0.7/kernel/cred.c linux-3.0.7/kernel/cred.c ret = security_secctx_to_secid(secctx, strlen(secctx), &secid); if (ret < 0) return ret; -diff -urNp linux-3.0.7/kernel/debug/debug_core.c linux-3.0.7/kernel/debug/debug_core.c ---- linux-3.0.7/kernel/debug/debug_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/debug/debug_core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/debug/debug_core.c linux-3.0.8/kernel/debug/debug_core.c +--- linux-3.0.8/kernel/debug/debug_core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/debug/debug_core.c 2011-08-23 21:47:56.000000000 -0400 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc */ static atomic_t masters_in_kgdb; @@ -62469,9 +62826,9 @@ diff -urNp linux-3.0.7/kernel/debug/debug_core.c linux-3.0.7/kernel/debug/debug_ tasklet_schedule(&kgdb_tasklet_breakpoint); } EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint); -diff -urNp linux-3.0.7/kernel/debug/kdb/kdb_main.c linux-3.0.7/kernel/debug/kdb/kdb_main.c ---- linux-3.0.7/kernel/debug/kdb/kdb_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/debug/kdb/kdb_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/debug/kdb/kdb_main.c linux-3.0.8/kernel/debug/kdb/kdb_main.c +--- linux-3.0.8/kernel/debug/kdb/kdb_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/debug/kdb/kdb_main.c 2011-08-23 21:47:56.000000000 -0400 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha list_for_each_entry(mod, kdb_modules, list) { @@ -62490,9 +62847,9 @@ diff -urNp linux-3.0.7/kernel/debug/kdb/kdb_main.c linux-3.0.7/kernel/debug/kdb/ #ifdef CONFIG_MODULE_UNLOAD { -diff -urNp linux-3.0.7/kernel/events/core.c linux-3.0.7/kernel/events/core.c ---- linux-3.0.7/kernel/events/core.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/kernel/events/core.c 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.8/kernel/events/core.c linux-3.0.8/kernel/events/core.c +--- linux-3.0.8/kernel/events/core.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/kernel/events/core.c 2011-09-14 09:08:05.000000000 -0400 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_ return 0; } @@ -62588,9 +62945,9 @@ diff -urNp linux-3.0.7/kernel/events/core.c linux-3.0.7/kernel/events/core.c &parent_event->child_total_time_running); /* -diff -urNp linux-3.0.7/kernel/exit.c linux-3.0.7/kernel/exit.c ---- linux-3.0.7/kernel/exit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/exit.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/exit.c linux-3.0.8/kernel/exit.c +--- linux-3.0.8/kernel/exit.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/exit.c 2011-08-23 21:48:14.000000000 -0400 @@ -57,6 +57,10 @@ #include <asm/pgtable.h> #include <asm/mmu_context.h> @@ -62704,9 +63061,9 @@ diff -urNp linux-3.0.7/kernel/exit.c linux-3.0.7/kernel/exit.c exit_mm(tsk); if (group_dead) -diff -urNp linux-3.0.7/kernel/fork.c linux-3.0.7/kernel/fork.c ---- linux-3.0.7/kernel/fork.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/fork.c 2011-08-25 17:23:36.000000000 -0400 +diff -urNp linux-3.0.8/kernel/fork.c linux-3.0.8/kernel/fork.c +--- linux-3.0.8/kernel/fork.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/fork.c 2011-08-25 17:23:36.000000000 -0400 @@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -63004,9 +63361,9 @@ diff -urNp linux-3.0.7/kernel/fork.c linux-3.0.7/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-3.0.7/kernel/futex.c linux-3.0.7/kernel/futex.c ---- linux-3.0.7/kernel/futex.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/futex.c linux-3.0.8/kernel/futex.c +--- linux-3.0.8/kernel/futex.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -63094,9 +63451,9 @@ diff -urNp linux-3.0.7/kernel/futex.c linux-3.0.7/kernel/futex.c for (i = 0; i < ARRAY_SIZE(futex_queues); i++) { plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock); -diff -urNp linux-3.0.7/kernel/futex_compat.c linux-3.0.7/kernel/futex_compat.c ---- linux-3.0.7/kernel/futex_compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/futex_compat.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/futex_compat.c linux-3.0.8/kernel/futex_compat.c +--- linux-3.0.8/kernel/futex_compat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/futex_compat.c 2011-08-23 21:48:14.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -63136,9 +63493,9 @@ diff -urNp linux-3.0.7/kernel/futex_compat.c linux-3.0.7/kernel/futex_compat.c head = p->compat_robust_list; rcu_read_unlock(); } -diff -urNp linux-3.0.7/kernel/gcov/base.c linux-3.0.7/kernel/gcov/base.c ---- linux-3.0.7/kernel/gcov/base.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/gcov/base.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/gcov/base.c linux-3.0.8/kernel/gcov/base.c +--- linux-3.0.8/kernel/gcov/base.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/gcov/base.c 2011-08-23 21:47:56.000000000 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -63160,9 +63517,9 @@ diff -urNp linux-3.0.7/kernel/gcov/base.c linux-3.0.7/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-3.0.7/kernel/hrtimer.c linux-3.0.7/kernel/hrtimer.c ---- linux-3.0.7/kernel/hrtimer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/hrtimer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/hrtimer.c linux-3.0.8/kernel/hrtimer.c +--- linux-3.0.8/kernel/hrtimer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/hrtimer.c 2011-08-23 21:47:56.000000000 -0400 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -63172,9 +63529,9 @@ diff -urNp linux-3.0.7/kernel/hrtimer.c linux-3.0.7/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-3.0.7/kernel/jump_label.c linux-3.0.7/kernel/jump_label.c ---- linux-3.0.7/kernel/jump_label.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/jump_label.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/jump_label.c linux-3.0.8/kernel/jump_label.c +--- linux-3.0.8/kernel/jump_label.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/jump_label.c 2011-08-23 21:47:56.000000000 -0400 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr size = (((unsigned long)stop - (unsigned long)start) @@ -63198,9 +63555,9 @@ diff -urNp linux-3.0.7/kernel/jump_label.c linux-3.0.7/kernel/jump_label.c } static int -diff -urNp linux-3.0.7/kernel/kallsyms.c linux-3.0.7/kernel/kallsyms.c ---- linux-3.0.7/kernel/kallsyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/kallsyms.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/kallsyms.c linux-3.0.8/kernel/kallsyms.c +--- linux-3.0.8/kernel/kallsyms.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/kallsyms.c 2011-08-23 21:48:14.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) @@ -63303,9 +63660,9 @@ diff -urNp linux-3.0.7/kernel/kallsyms.c linux-3.0.7/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-3.0.7/kernel/kexec.c linux-3.0.7/kernel/kexec.c ---- linux-3.0.7/kernel/kexec.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/kexec.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/kexec.c linux-3.0.8/kernel/kexec.c +--- linux-3.0.8/kernel/kexec.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/kexec.c 2011-10-06 04:17:55.000000000 -0400 @@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un unsigned long flags) { @@ -63316,9 +63673,9 @@ diff -urNp linux-3.0.7/kernel/kexec.c linux-3.0.7/kernel/kexec.c unsigned long i, result; /* Don't allow clients that don't understand the native -diff -urNp linux-3.0.7/kernel/kmod.c linux-3.0.7/kernel/kmod.c ---- linux-3.0.7/kernel/kmod.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/kmod.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/kmod.c linux-3.0.8/kernel/kmod.c +--- linux-3.0.8/kernel/kmod.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/kmod.c 2011-10-06 04:17:55.000000000 -0400 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -63424,9 +63781,9 @@ diff -urNp linux-3.0.7/kernel/kmod.c linux-3.0.7/kernel/kmod.c /* * If ret is 0, either ____call_usermodehelper failed and the -diff -urNp linux-3.0.7/kernel/kprobes.c linux-3.0.7/kernel/kprobes.c ---- linux-3.0.7/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/kprobes.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/kprobes.c linux-3.0.8/kernel/kprobes.c +--- linux-3.0.8/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/kprobes.c 2011-08-23 21:47:56.000000000 -0400 @@ -185,7 +185,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. @@ -63463,9 +63820,9 @@ diff -urNp linux-3.0.7/kernel/kprobes.c linux-3.0.7/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-3.0.7/kernel/lockdep.c linux-3.0.7/kernel/lockdep.c ---- linux-3.0.7/kernel/lockdep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/lockdep.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/lockdep.c linux-3.0.8/kernel/lockdep.c +--- linux-3.0.8/kernel/lockdep.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/lockdep.c 2011-08-23 21:47:56.000000000 -0400 @@ -583,6 +583,10 @@ static int static_obj(void *obj) end = (unsigned long) &_end, addr = (unsigned long) obj; @@ -63494,9 +63851,9 @@ diff -urNp linux-3.0.7/kernel/lockdep.c linux-3.0.7/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-3.0.7/kernel/lockdep_proc.c linux-3.0.7/kernel/lockdep_proc.c ---- linux-3.0.7/kernel/lockdep_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/lockdep_proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/lockdep_proc.c linux-3.0.8/kernel/lockdep_proc.c +--- linux-3.0.8/kernel/lockdep_proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/lockdep_proc.c 2011-08-23 21:47:56.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) @@ -63506,9 +63863,9 @@ diff -urNp linux-3.0.7/kernel/lockdep_proc.c linux-3.0.7/kernel/lockdep_proc.c const char *name = class->name; if (!name) { -diff -urNp linux-3.0.7/kernel/module.c linux-3.0.7/kernel/module.c ---- linux-3.0.7/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/module.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/module.c linux-3.0.8/kernel/module.c +--- linux-3.0.8/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/module.c 2011-08-23 21:48:14.000000000 -0400 @@ -58,6 +58,7 @@ #include <linux/jump_label.h> #include <linux/pfn.h> @@ -64237,9 +64594,40 @@ diff -urNp linux-3.0.7/kernel/module.c linux-3.0.7/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-3.0.7/kernel/mutex-debug.c linux-3.0.7/kernel/mutex-debug.c ---- linux-3.0.7/kernel/mutex-debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/mutex-debug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/mutex.c linux-3.0.8/kernel/mutex.c +--- linux-3.0.8/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400 +@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, + spin_lock_mutex(&lock->wait_lock, flags); + + debug_mutex_lock_common(lock, &waiter); +- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task)); ++ debug_mutex_add_waiter(lock, &waiter, task); + + /* add waiting tasks to the end of the waitqueue (FIFO): */ + list_add_tail(&waiter.list, &lock->wait_list); +@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, + * TASK_UNINTERRUPTIBLE case.) + */ + if (unlikely(signal_pending_state(state, task))) { +- mutex_remove_waiter(lock, &waiter, +- task_thread_info(task)); ++ mutex_remove_waiter(lock, &waiter, task); + mutex_release(&lock->dep_map, 1, ip); + spin_unlock_mutex(&lock->wait_lock, flags); + +@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, + done: + lock_acquired(&lock->dep_map, ip); + /* got the lock - rejoice! */ +- mutex_remove_waiter(lock, &waiter, current_thread_info()); ++ mutex_remove_waiter(lock, &waiter, task); + mutex_set_owner(lock); + + /* set it to 0 if there are no waiters left: */ +diff -urNp linux-3.0.8/kernel/mutex-debug.c linux-3.0.8/kernel/mutex-debug.c +--- linux-3.0.8/kernel/mutex-debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/mutex-debug.c 2011-08-23 21:47:56.000000000 -0400 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } @@ -64268,9 +64656,9 @@ diff -urNp linux-3.0.7/kernel/mutex-debug.c linux-3.0.7/kernel/mutex-debug.c list_del_init(&waiter->list); waiter->task = NULL; -diff -urNp linux-3.0.7/kernel/mutex-debug.h linux-3.0.7/kernel/mutex-debug.h ---- linux-3.0.7/kernel/mutex-debug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/mutex-debug.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/mutex-debug.h linux-3.0.8/kernel/mutex-debug.h +--- linux-3.0.8/kernel/mutex-debug.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/mutex-debug.h 2011-08-23 21:47:56.000000000 -0400 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -64283,40 +64671,9 @@ diff -urNp linux-3.0.7/kernel/mutex-debug.h linux-3.0.7/kernel/mutex-debug.h extern void debug_mutex_unlock(struct mutex *lock); extern void debug_mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key); -diff -urNp linux-3.0.7/kernel/mutex.c linux-3.0.7/kernel/mutex.c ---- linux-3.0.7/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400 -@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, - spin_lock_mutex(&lock->wait_lock, flags); - - debug_mutex_lock_common(lock, &waiter); -- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task)); -+ debug_mutex_add_waiter(lock, &waiter, task); - - /* add waiting tasks to the end of the waitqueue (FIFO): */ - list_add_tail(&waiter.list, &lock->wait_list); -@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, - * TASK_UNINTERRUPTIBLE case.) - */ - if (unlikely(signal_pending_state(state, task))) { -- mutex_remove_waiter(lock, &waiter, -- task_thread_info(task)); -+ mutex_remove_waiter(lock, &waiter, task); - mutex_release(&lock->dep_map, 1, ip); - spin_unlock_mutex(&lock->wait_lock, flags); - -@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, - done: - lock_acquired(&lock->dep_map, ip); - /* got the lock - rejoice! */ -- mutex_remove_waiter(lock, &waiter, current_thread_info()); -+ mutex_remove_waiter(lock, &waiter, task); - mutex_set_owner(lock); - - /* set it to 0 if there are no waiters left: */ -diff -urNp linux-3.0.7/kernel/padata.c linux-3.0.7/kernel/padata.c ---- linux-3.0.7/kernel/padata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/padata.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/padata.c linux-3.0.8/kernel/padata.c +--- linux-3.0.8/kernel/padata.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/padata.c 2011-08-23 21:47:56.000000000 -0400 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins padata->pd = pd; padata->cb_cpu = cb_cpu; @@ -64340,9 +64697,9 @@ diff -urNp linux-3.0.7/kernel/padata.c linux-3.0.7/kernel/padata.c atomic_set(&pd->reorder_objects, 0); atomic_set(&pd->refcnt, 0); pd->pinst = pinst; -diff -urNp linux-3.0.7/kernel/panic.c linux-3.0.7/kernel/panic.c ---- linux-3.0.7/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/panic.c linux-3.0.8/kernel/panic.c +--- linux-3.0.8/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c const char *board; @@ -64362,9 +64719,9 @@ diff -urNp linux-3.0.7/kernel/panic.c linux-3.0.7/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-3.0.7/kernel/pid.c linux-3.0.7/kernel/pid.c ---- linux-3.0.7/kernel/pid.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/pid.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/pid.c linux-3.0.8/kernel/pid.c +--- linux-3.0.8/kernel/pid.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/pid.c 2011-08-23 21:48:14.000000000 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -64412,9 +64769,9 @@ diff -urNp linux-3.0.7/kernel/pid.c linux-3.0.7/kernel/pid.c struct pid *get_task_pid(struct task_struct *task, enum pid_type type) { struct pid *pid; -diff -urNp linux-3.0.7/kernel/posix-cpu-timers.c linux-3.0.7/kernel/posix-cpu-timers.c ---- linux-3.0.7/kernel/posix-cpu-timers.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/kernel/posix-cpu-timers.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/kernel/posix-cpu-timers.c linux-3.0.8/kernel/posix-cpu-timers.c +--- linux-3.0.8/kernel/posix-cpu-timers.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/kernel/posix-cpu-timers.c 2011-10-25 09:10:41.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -64423,7 +64780,7 @@ diff -urNp linux-3.0.7/kernel/posix-cpu-timers.c linux-3.0.7/kernel/posix-cpu-ti #include <asm/uaccess.h> #include <linux/kernel_stat.h> #include <trace/events/timer.h> -@@ -1605,14 +1606,14 @@ struct k_clock clock_posix_cpu = { +@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = { static __init int init_posix_cpu_timers(void) { @@ -64440,9 +64797,9 @@ diff -urNp linux-3.0.7/kernel/posix-cpu-timers.c linux-3.0.7/kernel/posix-cpu-ti .clock_getres = thread_cpu_clock_getres, .clock_get = thread_cpu_clock_get, .timer_create = thread_cpu_timer_create, -diff -urNp linux-3.0.7/kernel/posix-timers.c linux-3.0.7/kernel/posix-timers.c ---- linux-3.0.7/kernel/posix-timers.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/posix-timers.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/posix-timers.c linux-3.0.8/kernel/posix-timers.c +--- linux-3.0.8/kernel/posix-timers.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/posix-timers.c 2011-08-23 21:48:14.000000000 -0400 @@ -43,6 +43,7 @@ #include <linux/idr.h> #include <linux/posix-clock.h> @@ -64546,9 +64903,9 @@ diff -urNp linux-3.0.7/kernel/posix-timers.c linux-3.0.7/kernel/posix-timers.c return kc->clock_set(which_clock, &new_tp); } -diff -urNp linux-3.0.7/kernel/power/poweroff.c linux-3.0.7/kernel/power/poweroff.c ---- linux-3.0.7/kernel/power/poweroff.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/power/poweroff.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/power/poweroff.c linux-3.0.8/kernel/power/poweroff.c +--- linux-3.0.8/kernel/power/poweroff.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/power/poweroff.c 2011-08-23 21:47:56.000000000 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -64558,9 +64915,9 @@ diff -urNp linux-3.0.7/kernel/power/poweroff.c linux-3.0.7/kernel/power/poweroff { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-3.0.7/kernel/power/process.c linux-3.0.7/kernel/power/process.c ---- linux-3.0.7/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/power/process.c linux-3.0.8/kernel/power/process.c +--- linux-3.0.8/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ u64 elapsed_csecs64; unsigned int elapsed_csecs; @@ -64603,9 +64960,9 @@ diff -urNp linux-3.0.7/kernel/power/process.c linux-3.0.7/kernel/power/process.c break; if (pm_wakeup_pending()) { -diff -urNp linux-3.0.7/kernel/printk.c linux-3.0.7/kernel/printk.c ---- linux-3.0.7/kernel/printk.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/kernel/printk.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/kernel/printk.c linux-3.0.8/kernel/printk.c +--- linux-3.0.8/kernel/printk.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/kernel/printk.c 2011-10-16 21:55:28.000000000 -0400 @@ -313,12 +313,17 @@ static int check_syslog_permissions(int if (from_file && type != SYSLOG_ACTION_OPEN) return 0; @@ -64625,9 +64982,9 @@ diff -urNp linux-3.0.7/kernel/printk.c linux-3.0.7/kernel/printk.c "but no CAP_SYSLOG (deprecated).\n"); return 0; } -diff -urNp linux-3.0.7/kernel/profile.c linux-3.0.7/kernel/profile.c ---- linux-3.0.7/kernel/profile.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/profile.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/profile.c linux-3.0.8/kernel/profile.c +--- linux-3.0.8/kernel/profile.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/profile.c 2011-08-23 21:47:56.000000000 -0400 @@ -39,7 +39,7 @@ struct profile_hit { /* Oprofile timer tick hook */ static int (*timer_hook)(struct pt_regs *) __read_mostly; @@ -64685,9 +65042,9 @@ diff -urNp linux-3.0.7/kernel/profile.c linux-3.0.7/kernel/profile.c return count; } -diff -urNp linux-3.0.7/kernel/ptrace.c linux-3.0.7/kernel/ptrace.c ---- linux-3.0.7/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/ptrace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/ptrace.c linux-3.0.8/kernel/ptrace.c +--- linux-3.0.8/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/ptrace.c 2011-08-23 21:48:14.000000000 -0400 @@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -64859,9 +65216,9 @@ diff -urNp linux-3.0.7/kernel/ptrace.c linux-3.0.7/kernel/ptrace.c goto out_put_task_struct; } -diff -urNp linux-3.0.7/kernel/rcutorture.c linux-3.0.7/kernel/rcutorture.c ---- linux-3.0.7/kernel/rcutorture.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/rcutorture.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/rcutorture.c linux-3.0.8/kernel/rcutorture.c +--- linux-3.0.8/kernel/rcutorture.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/rcutorture.c 2011-08-23 21:47:56.000000000 -0400 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_ { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = @@ -65022,9 +65379,9 @@ diff -urNp linux-3.0.7/kernel/rcutorture.c linux-3.0.7/kernel/rcutorture.c for_each_possible_cpu(cpu) { for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; -diff -urNp linux-3.0.7/kernel/rcutree.c linux-3.0.7/kernel/rcutree.c ---- linux-3.0.7/kernel/rcutree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/rcutree.c 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.8/kernel/rcutree.c linux-3.0.8/kernel/rcutree.c +--- linux-3.0.8/kernel/rcutree.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/rcutree.c 2011-09-14 09:08:05.000000000 -0400 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void) } /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */ @@ -65107,9 +65464,9 @@ diff -urNp linux-3.0.7/kernel/rcutree.c linux-3.0.7/kernel/rcutree.c { __rcu_process_callbacks(&rcu_sched_state, &__get_cpu_var(rcu_sched_data)); -diff -urNp linux-3.0.7/kernel/rcutree.h linux-3.0.7/kernel/rcutree.h ---- linux-3.0.7/kernel/rcutree.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/rcutree.h 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.8/kernel/rcutree.h linux-3.0.8/kernel/rcutree.h +--- linux-3.0.8/kernel/rcutree.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/rcutree.h 2011-09-14 09:08:05.000000000 -0400 @@ -86,7 +86,7 @@ struct rcu_dynticks { int dynticks_nesting; /* Track irq/process nesting level. */ @@ -65119,9 +65476,9 @@ diff -urNp linux-3.0.7/kernel/rcutree.h linux-3.0.7/kernel/rcutree.h }; /* RCU's kthread states for tracing. */ -diff -urNp linux-3.0.7/kernel/rcutree_plugin.h linux-3.0.7/kernel/rcutree_plugin.h ---- linux-3.0.7/kernel/rcutree_plugin.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/rcutree_plugin.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/rcutree_plugin.h linux-3.0.8/kernel/rcutree_plugin.h +--- linux-3.0.8/kernel/rcutree_plugin.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/rcutree_plugin.h 2011-08-23 21:47:56.000000000 -0400 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void) /* Clean up and exit. */ @@ -65184,9 +65541,9 @@ diff -urNp linux-3.0.7/kernel/rcutree_plugin.h linux-3.0.7/kernel/rcutree_plugin put_online_cpus(); } -diff -urNp linux-3.0.7/kernel/relay.c linux-3.0.7/kernel/relay.c ---- linux-3.0.7/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/relay.c linux-3.0.8/kernel/relay.c +--- linux-3.0.8/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc }; ssize_t ret; @@ -65196,9 +65553,9 @@ diff -urNp linux-3.0.7/kernel/relay.c linux-3.0.7/kernel/relay.c if (rbuf->subbufs_produced == rbuf->subbufs_consumed) return 0; if (splice_grow_spd(pipe, &spd)) -diff -urNp linux-3.0.7/kernel/resource.c linux-3.0.7/kernel/resource.c ---- linux-3.0.7/kernel/resource.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/resource.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/resource.c linux-3.0.8/kernel/resource.c +--- linux-3.0.8/kernel/resource.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/resource.c 2011-08-23 21:48:14.000000000 -0400 @@ -141,8 +141,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -65218,9 +65575,9 @@ diff -urNp linux-3.0.7/kernel/resource.c linux-3.0.7/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-3.0.7/kernel/rtmutex-tester.c linux-3.0.7/kernel/rtmutex-tester.c ---- linux-3.0.7/kernel/rtmutex-tester.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/rtmutex-tester.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/rtmutex-tester.c linux-3.0.8/kernel/rtmutex-tester.c +--- linux-3.0.8/kernel/rtmutex-tester.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/rtmutex-tester.c 2011-08-23 21:47:56.000000000 -0400 @@ -20,7 +20,7 @@ #define MAX_RT_TEST_MUTEXES 8 @@ -65311,9 +65668,30 @@ diff -urNp linux-3.0.7/kernel/rtmutex-tester.c linux-3.0.7/kernel/rtmutex-tester return; default: -diff -urNp linux-3.0.7/kernel/sched.c linux-3.0.7/kernel/sched.c ---- linux-3.0.7/kernel/sched.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/kernel/sched.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/kernel/sched_autogroup.c linux-3.0.8/kernel/sched_autogroup.c +--- linux-3.0.8/kernel/sched_autogroup.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/sched_autogroup.c 2011-08-23 21:47:56.000000000 -0400 +@@ -7,7 +7,7 @@ + + unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1; + static struct autogroup autogroup_default; +-static atomic_t autogroup_seq_nr; ++static atomic_unchecked_t autogroup_seq_nr; + + static void __init autogroup_init(struct task_struct *init_task) + { +@@ -78,7 +78,7 @@ static inline struct autogroup *autogrou + + kref_init(&ag->kref); + init_rwsem(&ag->lock); +- ag->id = atomic_inc_return(&autogroup_seq_nr); ++ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr); + ag->tg = tg; + #ifdef CONFIG_RT_GROUP_SCHED + /* +diff -urNp linux-3.0.8/kernel/sched.c linux-3.0.8/kernel/sched.c +--- linux-3.0.8/kernel/sched.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/kernel/sched.c 2011-10-17 23:17:19.000000000 -0400 @@ -4227,6 +4227,8 @@ static void __sched __schedule(void) struct rq *rq; int cpu; @@ -65350,30 +65728,9 @@ diff -urNp linux-3.0.7/kernel/sched.c linux-3.0.7/kernel/sched.c /* can't set/change the rt policy */ if (policy != p->policy && !rlim_rtprio) return -EPERM; -diff -urNp linux-3.0.7/kernel/sched_autogroup.c linux-3.0.7/kernel/sched_autogroup.c ---- linux-3.0.7/kernel/sched_autogroup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/sched_autogroup.c 2011-08-23 21:47:56.000000000 -0400 -@@ -7,7 +7,7 @@ - - unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1; - static struct autogroup autogroup_default; --static atomic_t autogroup_seq_nr; -+static atomic_unchecked_t autogroup_seq_nr; - - static void __init autogroup_init(struct task_struct *init_task) - { -@@ -78,7 +78,7 @@ static inline struct autogroup *autogrou - - kref_init(&ag->kref); - init_rwsem(&ag->lock); -- ag->id = atomic_inc_return(&autogroup_seq_nr); -+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr); - ag->tg = tg; - #ifdef CONFIG_RT_GROUP_SCHED - /* -diff -urNp linux-3.0.7/kernel/sched_fair.c linux-3.0.7/kernel/sched_fair.c ---- linux-3.0.7/kernel/sched_fair.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/sched_fair.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/sched_fair.c linux-3.0.8/kernel/sched_fair.c +--- linux-3.0.8/kernel/sched_fair.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/sched_fair.c 2011-08-23 21:47:56.000000000 -0400 @@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c * run_rebalance_domains is triggered when needed from the scheduler tick. * Also triggered for nohz idle balancing (with nohz_balancing_kick set). @@ -65383,9 +65740,9 @@ diff -urNp linux-3.0.7/kernel/sched_fair.c linux-3.0.7/kernel/sched_fair.c { int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); -diff -urNp linux-3.0.7/kernel/signal.c linux-3.0.7/kernel/signal.c ---- linux-3.0.7/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/signal.c linux-3.0.8/kernel/signal.c +--- linux-3.0.8/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache int print_fatal_signals __read_mostly; @@ -65518,9 +65875,9 @@ diff -urNp linux-3.0.7/kernel/signal.c linux-3.0.7/kernel/signal.c if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) { error = check_kill_permission(sig, info, p); /* -diff -urNp linux-3.0.7/kernel/smp.c linux-3.0.7/kernel/smp.c ---- linux-3.0.7/kernel/smp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/smp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/smp.c linux-3.0.8/kernel/smp.c +--- linux-3.0.8/kernel/smp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/smp.c 2011-08-23 21:47:56.000000000 -0400 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu } EXPORT_SYMBOL(smp_call_function); @@ -65548,9 +65905,9 @@ diff -urNp linux-3.0.7/kernel/smp.c linux-3.0.7/kernel/smp.c { raw_spin_unlock_irq(&call_function.lock); } -diff -urNp linux-3.0.7/kernel/softirq.c linux-3.0.7/kernel/softirq.c ---- linux-3.0.7/kernel/softirq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/softirq.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/softirq.c linux-3.0.8/kernel/softirq.c +--- linux-3.0.8/kernel/softirq.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/softirq.c 2011-08-23 21:47:56.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -65601,9 +65958,9 @@ diff -urNp linux-3.0.7/kernel/softirq.c linux-3.0.7/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-3.0.7/kernel/sys.c linux-3.0.7/kernel/sys.c ---- linux-3.0.7/kernel/sys.c 2011-09-02 18:11:26.000000000 -0400 -+++ linux-3.0.7/kernel/sys.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/sys.c linux-3.0.8/kernel/sys.c +--- linux-3.0.8/kernel/sys.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/kernel/sys.c 2011-10-25 09:10:41.000000000 -0400 @@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -65773,9 +66130,75 @@ diff -urNp linux-3.0.7/kernel/sys.c linux-3.0.7/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-3.0.7/kernel/sysctl.c linux-3.0.7/kernel/sysctl.c ---- linux-3.0.7/kernel/sysctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/sysctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/sysctl_binary.c linux-3.0.8/kernel/sysctl_binary.c +--- linux-3.0.8/kernel/sysctl_binary.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/sysctl_binary.c 2011-10-06 04:17:55.000000000 -0400 +@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f + int i; + + set_fs(KERNEL_DS); +- result = vfs_read(file, buffer, BUFSZ - 1, &pos); ++ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos); + set_fs(old_fs); + if (result < 0) + goto out_kfree; +@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *f + } + + set_fs(KERNEL_DS); +- result = vfs_write(file, buffer, str - buffer, &pos); ++ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos); + set_fs(old_fs); + if (result < 0) + goto out_kfree; +@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file + int i; + + set_fs(KERNEL_DS); +- result = vfs_read(file, buffer, BUFSZ - 1, &pos); ++ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos); + set_fs(old_fs); + if (result < 0) + goto out_kfree; +@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file + } + + set_fs(KERNEL_DS); +- result = vfs_write(file, buffer, str - buffer, &pos); ++ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos); + set_fs(old_fs); + if (result < 0) + goto out_kfree; +@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *fil + int i; + + set_fs(KERNEL_DS); +- result = vfs_read(file, buf, sizeof(buf) - 1, &pos); ++ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos); + set_fs(old_fs); + if (result < 0) + goto out; +@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struc + __le16 dnaddr; + + set_fs(KERNEL_DS); +- result = vfs_read(file, buf, sizeof(buf) - 1, &pos); ++ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos); + set_fs(old_fs); + if (result < 0) + goto out; +@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struc + le16_to_cpu(dnaddr) & 0x3ff); + + set_fs(KERNEL_DS); +- result = vfs_write(file, buf, len, &pos); ++ result = vfs_write(file, (const char __force_user *)buf, len, &pos); + set_fs(old_fs); + if (result < 0) + goto out; +diff -urNp linux-3.0.8/kernel/sysctl.c linux-3.0.8/kernel/sysctl.c +--- linux-3.0.8/kernel/sysctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/sysctl.c 2011-08-23 21:48:14.000000000 -0400 @@ -85,6 +85,13 @@ @@ -65965,75 +66388,9 @@ diff -urNp linux-3.0.7/kernel/sysctl.c linux-3.0.7/kernel/sysctl.c EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); -diff -urNp linux-3.0.7/kernel/sysctl_binary.c linux-3.0.7/kernel/sysctl_binary.c ---- linux-3.0.7/kernel/sysctl_binary.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/sysctl_binary.c 2011-10-06 04:17:55.000000000 -0400 -@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f - int i; - - set_fs(KERNEL_DS); -- result = vfs_read(file, buffer, BUFSZ - 1, &pos); -+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos); - set_fs(old_fs); - if (result < 0) - goto out_kfree; -@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *f - } - - set_fs(KERNEL_DS); -- result = vfs_write(file, buffer, str - buffer, &pos); -+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos); - set_fs(old_fs); - if (result < 0) - goto out_kfree; -@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file - int i; - - set_fs(KERNEL_DS); -- result = vfs_read(file, buffer, BUFSZ - 1, &pos); -+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos); - set_fs(old_fs); - if (result < 0) - goto out_kfree; -@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file - } - - set_fs(KERNEL_DS); -- result = vfs_write(file, buffer, str - buffer, &pos); -+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos); - set_fs(old_fs); - if (result < 0) - goto out_kfree; -@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *fil - int i; - - set_fs(KERNEL_DS); -- result = vfs_read(file, buf, sizeof(buf) - 1, &pos); -+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos); - set_fs(old_fs); - if (result < 0) - goto out; -@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struc - __le16 dnaddr; - - set_fs(KERNEL_DS); -- result = vfs_read(file, buf, sizeof(buf) - 1, &pos); -+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos); - set_fs(old_fs); - if (result < 0) - goto out; -@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struc - le16_to_cpu(dnaddr) & 0x3ff); - - set_fs(KERNEL_DS); -- result = vfs_write(file, buf, len, &pos); -+ result = vfs_write(file, (const char __force_user *)buf, len, &pos); - set_fs(old_fs); - if (result < 0) - goto out; -diff -urNp linux-3.0.7/kernel/sysctl_check.c linux-3.0.7/kernel/sysctl_check.c ---- linux-3.0.7/kernel/sysctl_check.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/sysctl_check.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/sysctl_check.c linux-3.0.8/kernel/sysctl_check.c +--- linux-3.0.8/kernel/sysctl_check.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/sysctl_check.c 2011-08-23 21:48:14.000000000 -0400 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n set_fail(&fail, table, "Directory with extra2"); } else { @@ -66042,9 +66399,9 @@ diff -urNp linux-3.0.7/kernel/sysctl_check.c linux-3.0.7/kernel/sysctl_check.c (table->proc_handler == proc_dointvec) || (table->proc_handler == proc_dointvec_minmax) || (table->proc_handler == proc_dointvec_jiffies) || -diff -urNp linux-3.0.7/kernel/taskstats.c linux-3.0.7/kernel/taskstats.c ---- linux-3.0.7/kernel/taskstats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/taskstats.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/taskstats.c linux-3.0.8/kernel/taskstats.c +--- linux-3.0.8/kernel/taskstats.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/taskstats.c 2011-08-23 21:48:14.000000000 -0400 @@ -27,9 +27,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -66068,9 +66425,9 @@ diff -urNp linux-3.0.7/kernel/taskstats.c linux-3.0.7/kernel/taskstats.c if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) -diff -urNp linux-3.0.7/kernel/time/alarmtimer.c linux-3.0.7/kernel/time/alarmtimer.c ---- linux-3.0.7/kernel/time/alarmtimer.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/kernel/time/alarmtimer.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time/alarmtimer.c linux-3.0.8/kernel/time/alarmtimer.c +--- linux-3.0.8/kernel/time/alarmtimer.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/kernel/time/alarmtimer.c 2011-10-16 21:55:28.000000000 -0400 @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void) { int error = 0; @@ -66080,9 +66437,9 @@ diff -urNp linux-3.0.7/kernel/time/alarmtimer.c linux-3.0.7/kernel/time/alarmtim .clock_getres = alarm_clock_getres, .clock_get = alarm_clock_get, .timer_create = alarm_timer_create, -diff -urNp linux-3.0.7/kernel/time/tick-broadcast.c linux-3.0.7/kernel/time/tick-broadcast.c ---- linux-3.0.7/kernel/time/tick-broadcast.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/time/tick-broadcast.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time/tick-broadcast.c linux-3.0.8/kernel/time/tick-broadcast.c +--- linux-3.0.8/kernel/time/tick-broadcast.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/time/tick-broadcast.c 2011-08-23 21:47:56.000000000 -0400 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -66092,9 +66449,9 @@ diff -urNp linux-3.0.7/kernel/time/tick-broadcast.c linux-3.0.7/kernel/time/tick cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-3.0.7/kernel/time/timekeeping.c linux-3.0.7/kernel/time/timekeeping.c ---- linux-3.0.7/kernel/time/timekeeping.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/time/timekeeping.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time/timekeeping.c linux-3.0.8/kernel/time/timekeeping.c +--- linux-3.0.8/kernel/time/timekeeping.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/time/timekeeping.c 2011-08-23 21:48:14.000000000 -0400 @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/mm.h> @@ -66112,9 +66469,9 @@ diff -urNp linux-3.0.7/kernel/time/timekeeping.c linux-3.0.7/kernel/time/timekee write_seqlock_irqsave(&xtime_lock, flags); timekeeping_forward_now(); -diff -urNp linux-3.0.7/kernel/time/timer_list.c linux-3.0.7/kernel/time/timer_list.c ---- linux-3.0.7/kernel/time/timer_list.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/time/timer_list.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time/timer_list.c linux-3.0.8/kernel/time/timer_list.c +--- linux-3.0.8/kernel/time/timer_list.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/time/timer_list.c 2011-08-23 21:48:14.000000000 -0400 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, static void print_name_offset(struct seq_file *m, void *sym) @@ -66156,9 +66513,9 @@ diff -urNp linux-3.0.7/kernel/time/timer_list.c linux-3.0.7/kernel/time/timer_li if (!pe) return -ENOMEM; return 0; -diff -urNp linux-3.0.7/kernel/time/timer_stats.c linux-3.0.7/kernel/time/timer_stats.c ---- linux-3.0.7/kernel/time/timer_stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/time/timer_stats.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time/timer_stats.c linux-3.0.8/kernel/time/timer_stats.c +--- linux-3.0.8/kernel/time/timer_stats.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/time/timer_stats.c 2011-08-23 21:48:14.000000000 -0400 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop; static unsigned long nr_entries; static struct entry entries[MAX_ENTRIES]; @@ -66227,9 +66584,9 @@ diff -urNp linux-3.0.7/kernel/time/timer_stats.c linux-3.0.7/kernel/time/timer_s if (!pe) return -ENOMEM; return 0; -diff -urNp linux-3.0.7/kernel/time.c linux-3.0.7/kernel/time.c ---- linux-3.0.7/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/time.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/time.c linux-3.0.8/kernel/time.c +--- linux-3.0.8/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/time.c 2011-08-23 21:48:14.000000000 -0400 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim return error; @@ -66242,9 +66599,9 @@ diff -urNp linux-3.0.7/kernel/time.c linux-3.0.7/kernel/time.c /* SMP safe, global irq locking makes it work. */ sys_tz = *tz; update_vsyscall_tz(); -diff -urNp linux-3.0.7/kernel/timer.c linux-3.0.7/kernel/timer.c ---- linux-3.0.7/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/timer.c linux-3.0.8/kernel/timer.c +--- linux-3.0.8/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -66254,9 +66611,9 @@ diff -urNp linux-3.0.7/kernel/timer.c linux-3.0.7/kernel/timer.c { struct tvec_base *base = __this_cpu_read(tvec_bases); -diff -urNp linux-3.0.7/kernel/trace/blktrace.c linux-3.0.7/kernel/trace/blktrace.c ---- linux-3.0.7/kernel/trace/blktrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/blktrace.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/blktrace.c linux-3.0.8/kernel/trace/blktrace.c +--- linux-3.0.8/kernel/trace/blktrace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/blktrace.c 2011-08-23 21:47:56.000000000 -0400 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f struct blk_trace *bt = filp->private_data; char buf[16]; @@ -66284,9 +66641,9 @@ diff -urNp linux-3.0.7/kernel/trace/blktrace.c linux-3.0.7/kernel/trace/blktrace ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, -diff -urNp linux-3.0.7/kernel/trace/ftrace.c linux-3.0.7/kernel/trace/ftrace.c ---- linux-3.0.7/kernel/trace/ftrace.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/kernel/trace/ftrace.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/ftrace.c linux-3.0.8/kernel/trace/ftrace.c +--- linux-3.0.8/kernel/trace/ftrace.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/kernel/trace/ftrace.c 2011-10-17 23:17:19.000000000 -0400 @@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, if (unlikely(ftrace_disabled)) return 0; @@ -66316,9 +66673,9 @@ diff -urNp linux-3.0.7/kernel/trace/ftrace.c linux-3.0.7/kernel/trace/ftrace.c { struct ftrace_func_probe *entry; struct ftrace_page *pg; -diff -urNp linux-3.0.7/kernel/trace/trace.c linux-3.0.7/kernel/trace/trace.c ---- linux-3.0.7/kernel/trace/trace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace.c linux-3.0.8/kernel/trace/trace.c +--- linux-3.0.8/kernel/trace/trace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace.c 2011-08-23 21:48:14.000000000 -0400 @@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe( size_t rem; unsigned int i; @@ -66361,9 +66718,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace.c linux-3.0.7/kernel/trace/trace.c static int once; struct dentry *d_tracer; -diff -urNp linux-3.0.7/kernel/trace/trace_events.c linux-3.0.7/kernel/trace/trace_events.c ---- linux-3.0.7/kernel/trace/trace_events.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_events.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_events.c linux-3.0.8/kernel/trace/trace_events.c +--- linux-3.0.8/kernel/trace/trace_events.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_events.c 2011-08-23 21:47:56.000000000 -0400 @@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list struct ftrace_module_file_ops { struct list_head list; @@ -66410,9 +66767,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_events.c linux-3.0.7/kernel/trace/trac } } -diff -urNp linux-3.0.7/kernel/trace/trace_kprobe.c linux-3.0.7/kernel/trace/trace_kprobe.c ---- linux-3.0.7/kernel/trace/trace_kprobe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_kprobe.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_kprobe.c linux-3.0.8/kernel/trace/trace_kprobe.c +--- linux-3.0.8/kernel/trace/trace_kprobe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_kprobe.c 2011-10-06 04:17:55.000000000 -0400 @@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me long ret; int maxlen = get_rloc_len(*(u32 *)dest); @@ -66449,9 +66806,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_kprobe.c linux-3.0.7/kernel/trace/trac len++; } while (c && ret == 0 && len < MAX_STRING_SIZE); pagefault_enable(); -diff -urNp linux-3.0.7/kernel/trace/trace_mmiotrace.c linux-3.0.7/kernel/trace/trace_mmiotrace.c ---- linux-3.0.7/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_mmiotrace.c linux-3.0.8/kernel/trace/trace_mmiotrace.c +--- linux-3.0.8/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400 @@ -24,7 +24,7 @@ struct header_iter { static struct trace_array *mmio_trace_array; static bool overrun_detected; @@ -66488,9 +66845,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_mmiotrace.c linux-3.0.7/kernel/trace/t return; } entry = ring_buffer_event_data(event); -diff -urNp linux-3.0.7/kernel/trace/trace_output.c linux-3.0.7/kernel/trace/trace_output.c ---- linux-3.0.7/kernel/trace/trace_output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_output.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_output.c linux-3.0.8/kernel/trace/trace_output.c +--- linux-3.0.8/kernel/trace/trace_output.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_output.c 2011-08-23 21:47:56.000000000 -0400 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -66500,9 +66857,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_output.c linux-3.0.7/kernel/trace/trac if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-3.0.7/kernel/trace/trace_stack.c linux-3.0.7/kernel/trace/trace_stack.c ---- linux-3.0.7/kernel/trace/trace_stack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_stack.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_stack.c linux-3.0.8/kernel/trace/trace_stack.c +--- linux-3.0.8/kernel/trace/trace_stack.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_stack.c 2011-08-23 21:47:56.000000000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -66512,9 +66869,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_stack.c linux-3.0.7/kernel/trace/trace return; local_irq_save(flags); -diff -urNp linux-3.0.7/kernel/trace/trace_workqueue.c linux-3.0.7/kernel/trace/trace_workqueue.c ---- linux-3.0.7/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/kernel/trace/trace_workqueue.c linux-3.0.8/kernel/trace/trace_workqueue.c +--- linux-3.0.8/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -66542,20 +66899,9 @@ diff -urNp linux-3.0.7/kernel/trace/trace_workqueue.c linux-3.0.7/kernel/trace/t tsk->comm); put_task_struct(tsk); } -diff -urNp linux-3.0.7/lib/Kconfig.debug linux-3.0.7/lib/Kconfig.debug ---- linux-3.0.7/lib/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/Kconfig.debug 2011-08-23 21:48:14.000000000 -0400 -@@ -1088,6 +1088,7 @@ config LATENCYTOP - depends on DEBUG_KERNEL - depends on STACKTRACE_SUPPORT - depends on PROC_FS -+ depends on !GRKERNSEC_HIDESYM - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE - select KALLSYMS - select KALLSYMS_ALL -diff -urNp linux-3.0.7/lib/bitmap.c linux-3.0.7/lib/bitmap.c ---- linux-3.0.7/lib/bitmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/bitmap.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/lib/bitmap.c linux-3.0.8/lib/bitmap.c +--- linux-3.0.8/lib/bitmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/bitmap.c 2011-10-06 04:17:55.000000000 -0400 @@ -421,7 +421,7 @@ int __bitmap_parse(const char *buf, unsi { int c, old_c, totaldigits, ndigits, nchunks, nbits; @@ -66592,9 +66938,9 @@ diff -urNp linux-3.0.7/lib/bitmap.c linux-3.0.7/lib/bitmap.c ulen, 1, maskp, nmaskbits); } EXPORT_SYMBOL(bitmap_parselist_user); -diff -urNp linux-3.0.7/lib/bug.c linux-3.0.7/lib/bug.c ---- linux-3.0.7/lib/bug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/bug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/bug.c linux-3.0.8/lib/bug.c +--- linux-3.0.8/lib/bug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/bug.c 2011-08-23 21:47:56.000000000 -0400 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -66604,9 +66950,9 @@ diff -urNp linux-3.0.7/lib/bug.c linux-3.0.7/lib/bug.c file = NULL; line = 0; -diff -urNp linux-3.0.7/lib/debugobjects.c linux-3.0.7/lib/debugobjects.c ---- linux-3.0.7/lib/debugobjects.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/debugobjects.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/debugobjects.c linux-3.0.8/lib/debugobjects.c +--- linux-3.0.8/lib/debugobjects.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/debugobjects.c 2011-08-23 21:47:56.000000000 -0400 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -66616,9 +66962,9 @@ diff -urNp linux-3.0.7/lib/debugobjects.c linux-3.0.7/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-3.0.7/lib/devres.c linux-3.0.7/lib/devres.c ---- linux-3.0.7/lib/devres.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/devres.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/lib/devres.c linux-3.0.8/lib/devres.c +--- linux-3.0.8/lib/devres.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/devres.c 2011-10-06 04:17:55.000000000 -0400 @@ -81,7 +81,7 @@ void devm_iounmap(struct device *dev, vo { iounmap(addr); @@ -66637,9 +66983,9 @@ diff -urNp linux-3.0.7/lib/devres.c linux-3.0.7/lib/devres.c } EXPORT_SYMBOL(devm_ioport_unmap); -diff -urNp linux-3.0.7/lib/dma-debug.c linux-3.0.7/lib/dma-debug.c ---- linux-3.0.7/lib/dma-debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/dma-debug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/dma-debug.c linux-3.0.8/lib/dma-debug.c +--- linux-3.0.8/lib/dma-debug.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/dma-debug.c 2011-08-23 21:47:56.000000000 -0400 @@ -870,7 +870,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -66649,9 +66995,9 @@ diff -urNp linux-3.0.7/lib/dma-debug.c linux-3.0.7/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-3.0.7/lib/extable.c linux-3.0.7/lib/extable.c ---- linux-3.0.7/lib/extable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/extable.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/extable.c linux-3.0.8/lib/extable.c +--- linux-3.0.8/lib/extable.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/extable.c 2011-08-23 21:47:56.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/sort.h> @@ -66671,9 +67017,9 @@ diff -urNp linux-3.0.7/lib/extable.c linux-3.0.7/lib/extable.c } #ifdef CONFIG_MODULES -diff -urNp linux-3.0.7/lib/inflate.c linux-3.0.7/lib/inflate.c ---- linux-3.0.7/lib/inflate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/inflate.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/inflate.c linux-3.0.8/lib/inflate.c +--- linux-3.0.8/lib/inflate.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/inflate.c 2011-08-23 21:47:56.000000000 -0400 @@ -269,7 +269,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -66683,9 +67029,20 @@ diff -urNp linux-3.0.7/lib/inflate.c linux-3.0.7/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-3.0.7/lib/kref.c linux-3.0.7/lib/kref.c ---- linux-3.0.7/lib/kref.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/kref.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/Kconfig.debug linux-3.0.8/lib/Kconfig.debug +--- linux-3.0.8/lib/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/Kconfig.debug 2011-08-23 21:48:14.000000000 -0400 +@@ -1088,6 +1088,7 @@ config LATENCYTOP + depends on DEBUG_KERNEL + depends on STACKTRACE_SUPPORT + depends on PROC_FS ++ depends on !GRKERNSEC_HIDESYM + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE + select KALLSYMS + select KALLSYMS_ALL +diff -urNp linux-3.0.8/lib/kref.c linux-3.0.8/lib/kref.c +--- linux-3.0.8/lib/kref.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/kref.c 2011-08-23 21:47:56.000000000 -0400 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -66695,9 +67052,9 @@ diff -urNp linux-3.0.7/lib/kref.c linux-3.0.7/lib/kref.c WARN_ON(release == (void (*)(struct kref *))kfree); if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-3.0.7/lib/radix-tree.c linux-3.0.7/lib/radix-tree.c ---- linux-3.0.7/lib/radix-tree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/radix-tree.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/lib/radix-tree.c linux-3.0.8/lib/radix-tree.c +--- linux-3.0.8/lib/radix-tree.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/radix-tree.c 2011-08-23 21:47:56.000000000 -0400 @@ -80,7 +80,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -66707,9 +67064,9 @@ diff -urNp linux-3.0.7/lib/radix-tree.c linux-3.0.7/lib/radix-tree.c static inline void *ptr_to_indirect(void *ptr) { -diff -urNp linux-3.0.7/lib/vsprintf.c linux-3.0.7/lib/vsprintf.c ---- linux-3.0.7/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/lib/vsprintf.c linux-3.0.8/lib/vsprintf.c +--- linux-3.0.8/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -66803,26 +67160,198 @@ diff -urNp linux-3.0.7/lib/vsprintf.c linux-3.0.7/lib/vsprintf.c break; } -diff -urNp linux-3.0.7/localversion-grsec linux-3.0.7/localversion-grsec ---- linux-3.0.7/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/localversion-grsec 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/localversion-grsec linux-3.0.8/localversion-grsec +--- linux-3.0.8/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/localversion-grsec 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-3.0.7/mm/Kconfig linux-3.0.7/mm/Kconfig ---- linux-3.0.7/mm/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/Kconfig 2011-08-23 21:48:14.000000000 -0400 -@@ -240,7 +240,7 @@ config KSM - config DEFAULT_MMAP_MIN_ADDR - int "Low address space to protect from user allocation" - depends on MMU -- default 4096 -+ default 65536 - 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-3.0.7/mm/filemap.c linux-3.0.7/mm/filemap.c ---- linux-3.0.7/mm/filemap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/filemap.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/Makefile linux-3.0.8/Makefile +--- linux-3.0.8/Makefile 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/Makefile 2011-10-25 09:10:41.000000000 -0400 +@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" + + HOSTCC = gcc + HOSTCXX = g++ +-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer +-HOSTCXXFLAGS = -O2 ++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCFLAGS += $(call cc-option, -Wno-empty-body) ++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks + + # Decide whether to build built-in, modular, or both. + # Normally, just do built-in. +@@ -365,10 +366,12 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h + KBUILD_CPPFLAGS := -D__KERNEL__ + + KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ ++ -W -Wno-unused-parameter -Wno-missing-field-initializers \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ + -fno-delete-null-pointer-checks ++KBUILD_CFLAGS += $(call cc-option, -Wno-empty-body) + KBUILD_AFLAGS_KERNEL := + KBUILD_CFLAGS_KERNEL := + KBUILD_AFLAGS := -D__ASSEMBLY__ +@@ -407,8 +410,8 @@ export RCS_TAR_IGNORE := --exclude SCCS + # Rules shared between *config targets and build targets + + # Basic helpers built in scripts/ +-PHONY += scripts_basic +-scripts_basic: ++PHONY += scripts_basic gcc-plugins ++scripts_basic: gcc-plugins + $(Q)$(MAKE) $(build)=scripts/basic + $(Q)rm -f .tmp_quiet_recordmcount + +@@ -564,6 +567,36 @@ else + KBUILD_CFLAGS += -O2 + endif + ++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y) ++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN ++ifdef CONFIG_PAX_MEMORY_STACKLEAK ++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100 ++endif ++ifdef CONFIG_KALLOCSTAT_PLUGIN ++KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so ++endif ++ifdef CONFIG_PAX_KERNEXEC_PLUGIN ++KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so ++endif ++ifdef CONFIG_CHECKER_PLUGIN ++ifeq ($(call cc-ifversion, -ge, 0406, y), y) ++CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN ++endif ++endif ++GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN) ++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN ++gcc-plugins: ++ $(Q)$(MAKE) $(build)=tools/gcc ++else ++gcc-plugins: ++ifeq ($(call cc-ifversion, -ge, 0405, y), y) ++ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev.)) ++else ++ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least" ++endif ++ $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure" ++endif ++ + include $(srctree)/arch/$(SRCARCH)/Makefile + + ifneq ($(CONFIG_FRAME_WARN),0) +@@ -708,7 +741,7 @@ export mod_strip_cmd + + + ifeq ($(KBUILD_EXTMOD),) +-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ ++core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/ + + vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ + $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ +@@ -932,6 +965,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai + + # The actual objects are generated when descending, + # make sure no implicit rule kicks in ++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS) + $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ; + + # Handle descending into subdirectories listed in $(vmlinux-dirs) +@@ -941,7 +975,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) + # Error messages still appears in the original language + + PHONY += $(vmlinux-dirs) +-$(vmlinux-dirs): prepare scripts ++$(vmlinux-dirs): gcc-plugins prepare scripts + $(Q)$(MAKE) $(build)=$@ + + # Store (new) KERNELRELASE string in include/config/kernel.release +@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE + $(Q)$(MAKE) $(build)=. missing-syscalls + + # All the preparing.. ++prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS)) + prepare: prepare0 + + # Generate some files +@@ -1087,6 +1122,7 @@ all: modules + # using awk while concatenating to the final file. + + PHONY += modules ++modules: KBUILD_CFLAGS += $(GCC_PLUGINS) + modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin + $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + @$(kecho) ' Building modules, stage 2.'; +@@ -1102,7 +1138,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu + + # Target to prepare building external modules + PHONY += modules_prepare +-modules_prepare: prepare scripts ++modules_prepare: gcc-plugins prepare scripts + + # Target to install modules + PHONY += modules_install +@@ -1198,7 +1234,7 @@ distclean: mrproper + @find $(srctree) $(RCS_FIND_IGNORE) \ + \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ + -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ +- -o -name '.*.rej' -o -size 0 \ ++ -o -name '.*.rej' -o -name '*.so' -o -size 0 \ + -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ + -type f -print | xargs rm -f + +@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules + $(module-dirs): crmodverdir $(objtree)/Module.symvers + $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) + ++modules: KBUILD_CFLAGS += $(GCC_PLUGINS) + modules: $(module-dirs) + @$(kecho) ' Building modules, stage 2.'; + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost +@@ -1485,17 +1522,19 @@ else + target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) + endif + +-%.s: %.c prepare scripts FORCE ++%.s: KBUILD_CFLAGS += $(GCC_PLUGINS) ++%.s: %.c gcc-plugins prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + %.i: %.c prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) +-%.o: %.c prepare scripts FORCE ++%.o: KBUILD_CFLAGS += $(GCC_PLUGINS) ++%.o: %.c gcc-plugins prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + %.lst: %.c prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) +-%.s: %.S prepare scripts FORCE ++%.s: %.S gcc-plugins prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) +-%.o: %.S prepare scripts FORCE ++%.o: %.S gcc-plugins prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + %.symtypes: %.c prepare scripts FORCE + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) +@@ -1505,11 +1544,13 @@ endif + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) +-%/: prepare scripts FORCE ++%/: KBUILD_CFLAGS += $(GCC_PLUGINS) ++%/: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) +-%.ko: prepare scripts FORCE ++%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS) ++%.ko: gcc-plugins prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) $(@:.ko=.o) +diff -urNp linux-3.0.8/mm/filemap.c linux-3.0.8/mm/filemap.c +--- linux-3.0.8/mm/filemap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/filemap.c 2011-08-23 21:48:14.000000000 -0400 @@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -66840,9 +67369,9 @@ diff -urNp linux-3.0.7/mm/filemap.c linux-3.0.7/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-3.0.7/mm/fremap.c linux-3.0.7/mm/fremap.c ---- linux-3.0.7/mm/fremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/fremap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/fremap.c linux-3.0.8/mm/fremap.c +--- linux-3.0.8/mm/fremap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/fremap.c 2011-08-23 21:47:56.000000000 -0400 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -66855,9 +67384,9 @@ diff -urNp linux-3.0.7/mm/fremap.c linux-3.0.7/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-3.0.7/mm/highmem.c linux-3.0.7/mm/highmem.c ---- linux-3.0.7/mm/highmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/highmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/highmem.c linux-3.0.8/mm/highmem.c +--- linux-3.0.8/mm/highmem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/highmem.c 2011-08-23 21:47:56.000000000 -0400 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -66883,9 +67412,9 @@ diff -urNp linux-3.0.7/mm/highmem.c linux-3.0.7/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-3.0.7/mm/huge_memory.c linux-3.0.7/mm/huge_memory.c ---- linux-3.0.7/mm/huge_memory.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/huge_memory.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/huge_memory.c linux-3.0.8/mm/huge_memory.c +--- linux-3.0.8/mm/huge_memory.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/huge_memory.c 2011-08-23 21:47:56.000000000 -0400 @@ -702,7 +702,7 @@ out: * run pte_offset_map on the pmd, if an huge pmd could * materialize from under us from a different thread. @@ -66895,9 +67424,9 @@ diff -urNp linux-3.0.7/mm/huge_memory.c linux-3.0.7/mm/huge_memory.c return VM_FAULT_OOM; /* if an huge pmd materialized from under us just retry later */ if (unlikely(pmd_trans_huge(*pmd))) -diff -urNp linux-3.0.7/mm/hugetlb.c linux-3.0.7/mm/hugetlb.c ---- linux-3.0.7/mm/hugetlb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/hugetlb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/hugetlb.c linux-3.0.8/mm/hugetlb.c +--- linux-3.0.8/mm/hugetlb.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/hugetlb.c 2011-08-23 21:47:56.000000000 -0400 @@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -66987,9 +67516,9 @@ diff -urNp linux-3.0.7/mm/hugetlb.c linux-3.0.7/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-3.0.7/mm/internal.h linux-3.0.7/mm/internal.h ---- linux-3.0.7/mm/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/internal.h linux-3.0.8/mm/internal.h +--- linux-3.0.8/mm/internal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/internal.h 2011-08-23 21:47:56.000000000 -0400 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page * in mm/page_alloc.c */ @@ -66998,9 +67527,21 @@ diff -urNp linux-3.0.7/mm/internal.h linux-3.0.7/mm/internal.h extern void prep_compound_page(struct page *page, unsigned long order); #ifdef CONFIG_MEMORY_FAILURE extern bool is_free_buddy_page(struct page *page); -diff -urNp linux-3.0.7/mm/kmemleak.c linux-3.0.7/mm/kmemleak.c ---- linux-3.0.7/mm/kmemleak.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/kmemleak.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/Kconfig linux-3.0.8/mm/Kconfig +--- linux-3.0.8/mm/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/Kconfig 2011-08-23 21:48:14.000000000 -0400 +@@ -240,7 +240,7 @@ config KSM + config DEFAULT_MMAP_MIN_ADDR + int "Low address space to protect from user allocation" + depends on MMU +- default 4096 ++ default 65536 + 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-3.0.8/mm/kmemleak.c linux-3.0.8/mm/kmemleak.c +--- linux-3.0.8/mm/kmemleak.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/kmemleak.c 2011-08-23 21:48:14.000000000 -0400 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se for (i = 0; i < object->trace_len; i++) { @@ -67010,9 +67551,9 @@ diff -urNp linux-3.0.7/mm/kmemleak.c linux-3.0.7/mm/kmemleak.c } } -diff -urNp linux-3.0.7/mm/maccess.c linux-3.0.7/mm/maccess.c ---- linux-3.0.7/mm/maccess.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/maccess.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/mm/maccess.c linux-3.0.8/mm/maccess.c +--- linux-3.0.8/mm/maccess.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/maccess.c 2011-10-06 04:17:55.000000000 -0400 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons set_fs(KERNEL_DS); pagefault_disable(); @@ -67031,9 +67572,9 @@ diff -urNp linux-3.0.7/mm/maccess.c linux-3.0.7/mm/maccess.c pagefault_enable(); set_fs(old_fs); -diff -urNp linux-3.0.7/mm/madvise.c linux-3.0.7/mm/madvise.c ---- linux-3.0.7/mm/madvise.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/madvise.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/madvise.c linux-3.0.8/mm/madvise.c +--- linux-3.0.8/mm/madvise.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/madvise.c 2011-08-23 21:47:56.000000000 -0400 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -67110,93 +67651,9 @@ diff -urNp linux-3.0.7/mm/madvise.c linux-3.0.7/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-3.0.7/mm/memory-failure.c linux-3.0.7/mm/memory-failure.c ---- linux-3.0.7/mm/memory-failure.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/memory-failure.c 2011-10-06 04:17:55.000000000 -0400 -@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r - - int sysctl_memory_failure_recovery __read_mostly = 1; - --atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0); -+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0); - - #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE) - -@@ -200,7 +200,7 @@ static int kill_proc_ao(struct task_stru - si.si_signo = SIGBUS; - si.si_errno = 0; - si.si_code = BUS_MCEERR_AO; -- si.si_addr = (void *)addr; -+ si.si_addr = (void __user *)addr; - #ifdef __ARCH_SI_TRAPNO - si.si_trapno = trapno; - #endif -@@ -1008,7 +1008,7 @@ int __memory_failure(unsigned long pfn, - } - - nr_pages = 1 << compound_trans_order(hpage); -- atomic_long_add(nr_pages, &mce_bad_pages); -+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages); - - /* - * We need/can do nothing about count=0 pages. -@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, - if (!PageHWPoison(hpage) - || (hwpoison_filter(p) && TestClearPageHWPoison(p)) - || (p != hpage && TestSetPageHWPoison(hpage))) { -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - return 0; - } - set_page_hwpoison_huge_page(hpage); -@@ -1096,7 +1096,7 @@ int __memory_failure(unsigned long pfn, - } - if (hwpoison_filter(p)) { - if (TestClearPageHWPoison(p)) -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - unlock_page(hpage); - put_page(hpage); - return 0; -@@ -1222,7 +1222,7 @@ int unpoison_memory(unsigned long pfn) - return 0; - } - if (TestClearPageHWPoison(p)) -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); - return 0; - } -@@ -1236,7 +1236,7 @@ int unpoison_memory(unsigned long pfn) - */ - if (TestClearPageHWPoison(page)) { - pr_info("MCE: Software-unpoisoned page %#lx\n", pfn); -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - freeit = 1; - if (PageHuge(page)) - clear_page_hwpoison_huge_page(page); -@@ -1349,7 +1349,7 @@ static int soft_offline_huge_page(struct - } - done: - if (!PageHWPoison(hpage)) -- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages); -+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages); - set_page_hwpoison_huge_page(hpage); - dequeue_hwpoisoned_huge_page(hpage); - /* keep elevated page count for bad page */ -@@ -1480,7 +1480,7 @@ int soft_offline_page(struct page *page, - return ret; - - done: -- atomic_long_add(1, &mce_bad_pages); -+ atomic_long_add_unchecked(1, &mce_bad_pages); - SetPageHWPoison(page); - /* keep elevated page count for bad page */ - return ret; -diff -urNp linux-3.0.7/mm/memory.c linux-3.0.7/mm/memory.c ---- linux-3.0.7/mm/memory.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/mm/memory.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/memory.c linux-3.0.8/mm/memory.c +--- linux-3.0.8/mm/memory.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/mm/memory.c 2011-08-23 21:47:56.000000000 -0400 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct return; @@ -67760,9 +68217,93 @@ diff -urNp linux-3.0.7/mm/memory.c linux-3.0.7/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-3.0.7/mm/mempolicy.c linux-3.0.7/mm/mempolicy.c ---- linux-3.0.7/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/memory-failure.c linux-3.0.8/mm/memory-failure.c +--- linux-3.0.8/mm/memory-failure.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/memory-failure.c 2011-10-06 04:17:55.000000000 -0400 +@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r + + int sysctl_memory_failure_recovery __read_mostly = 1; + +-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0); ++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0); + + #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE) + +@@ -200,7 +200,7 @@ static int kill_proc_ao(struct task_stru + si.si_signo = SIGBUS; + si.si_errno = 0; + si.si_code = BUS_MCEERR_AO; +- si.si_addr = (void *)addr; ++ si.si_addr = (void __user *)addr; + #ifdef __ARCH_SI_TRAPNO + si.si_trapno = trapno; + #endif +@@ -1008,7 +1008,7 @@ int __memory_failure(unsigned long pfn, + } + + nr_pages = 1 << compound_trans_order(hpage); +- atomic_long_add(nr_pages, &mce_bad_pages); ++ atomic_long_add_unchecked(nr_pages, &mce_bad_pages); + + /* + * We need/can do nothing about count=0 pages. +@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, + if (!PageHWPoison(hpage) + || (hwpoison_filter(p) && TestClearPageHWPoison(p)) + || (p != hpage && TestSetPageHWPoison(hpage))) { +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + return 0; + } + set_page_hwpoison_huge_page(hpage); +@@ -1096,7 +1096,7 @@ int __memory_failure(unsigned long pfn, + } + if (hwpoison_filter(p)) { + if (TestClearPageHWPoison(p)) +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + unlock_page(hpage); + put_page(hpage); + return 0; +@@ -1222,7 +1222,7 @@ int unpoison_memory(unsigned long pfn) + return 0; + } + if (TestClearPageHWPoison(p)) +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); + return 0; + } +@@ -1236,7 +1236,7 @@ int unpoison_memory(unsigned long pfn) + */ + if (TestClearPageHWPoison(page)) { + pr_info("MCE: Software-unpoisoned page %#lx\n", pfn); +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + freeit = 1; + if (PageHuge(page)) + clear_page_hwpoison_huge_page(page); +@@ -1349,7 +1349,7 @@ static int soft_offline_huge_page(struct + } + done: + if (!PageHWPoison(hpage)) +- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages); ++ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages); + set_page_hwpoison_huge_page(hpage); + dequeue_hwpoisoned_huge_page(hpage); + /* keep elevated page count for bad page */ +@@ -1480,7 +1480,7 @@ int soft_offline_page(struct page *page, + return ret; + + done: +- atomic_long_add(1, &mce_bad_pages); ++ atomic_long_add_unchecked(1, &mce_bad_pages); + SetPageHWPoison(page); + /* keep elevated page count for bad page */ + return ret; +diff -urNp linux-3.0.8/mm/mempolicy.c linux-3.0.8/mm/mempolicy.c +--- linux-3.0.8/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct unsigned long vmstart; unsigned long vmend; @@ -67834,9 +68375,9 @@ diff -urNp linux-3.0.7/mm/mempolicy.c linux-3.0.7/mm/mempolicy.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-3.0.7/mm/migrate.c linux-3.0.7/mm/migrate.c ---- linux-3.0.7/mm/migrate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/migrate.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/migrate.c linux-3.0.8/mm/migrate.c +--- linux-3.0.8/mm/migrate.c 2011-10-25 09:10:33.000000000 -0400 ++++ linux-3.0.8/mm/migrate.c 2011-10-25 09:10:41.000000000 -0400 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc unsigned long chunk_start; int err; @@ -67871,9 +68412,9 @@ diff -urNp linux-3.0.7/mm/migrate.c linux-3.0.7/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-3.0.7/mm/mlock.c linux-3.0.7/mm/mlock.c ---- linux-3.0.7/mm/mlock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/mlock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/mlock.c linux-3.0.8/mm/mlock.c +--- linux-3.0.8/mm/mlock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/mlock.c 2011-08-23 21:48:14.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -67947,9 +68488,9 @@ diff -urNp linux-3.0.7/mm/mlock.c linux-3.0.7/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-3.0.7/mm/mmap.c linux-3.0.7/mm/mmap.c ---- linux-3.0.7/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/mmap.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/mmap.c linux-3.0.8/mm/mmap.c +--- linux-3.0.8/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/mmap.c 2011-08-23 21:48:14.000000000 -0400 @@ -46,6 +46,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -69208,9 +69749,9 @@ diff -urNp linux-3.0.7/mm/mmap.c linux-3.0.7/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-3.0.7/mm/mprotect.c linux-3.0.7/mm/mprotect.c ---- linux-3.0.7/mm/mprotect.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/mprotect.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/mprotect.c linux-3.0.8/mm/mprotect.c +--- linux-3.0.8/mm/mprotect.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/mprotect.c 2011-08-23 21:48:14.000000000 -0400 @@ -23,10 +23,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -69437,9 +69978,9 @@ diff -urNp linux-3.0.7/mm/mprotect.c linux-3.0.7/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-3.0.7/mm/mremap.c linux-3.0.7/mm/mremap.c ---- linux-3.0.7/mm/mremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/mremap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/mremap.c linux-3.0.8/mm/mremap.c +--- linux-3.0.8/mm/mremap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/mremap.c 2011-08-23 21:47:56.000000000 -0400 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -69544,9 +70085,9 @@ diff -urNp linux-3.0.7/mm/mremap.c linux-3.0.7/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-3.0.7/mm/nobootmem.c linux-3.0.7/mm/nobootmem.c ---- linux-3.0.7/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/nobootmem.c linux-3.0.8/mm/nobootmem.c +--- linux-3.0.8/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u unsigned long __init free_all_memory_core_early(int nodeid) { @@ -69580,9 +70121,9 @@ diff -urNp linux-3.0.7/mm/nobootmem.c linux-3.0.7/mm/nobootmem.c return count; } -diff -urNp linux-3.0.7/mm/nommu.c linux-3.0.7/mm/nommu.c ---- linux-3.0.7/mm/nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/nommu.c linux-3.0.8/mm/nommu.c +--- linux-3.0.8/mm/nommu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/nommu.c 2011-08-23 21:47:56.000000000 -0400 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; @@ -69615,9 +70156,9 @@ diff -urNp linux-3.0.7/mm/nommu.c linux-3.0.7/mm/nommu.c *region = *vma->vm_region; new->vm_region = region; -diff -urNp linux-3.0.7/mm/page_alloc.c linux-3.0.7/mm/page_alloc.c ---- linux-3.0.7/mm/page_alloc.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/mm/page_alloc.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/mm/page_alloc.c linux-3.0.8/mm/page_alloc.c +--- linux-3.0.8/mm/page_alloc.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/mm/page_alloc.c 2011-10-25 09:15:11.000000000 -0400 @@ -340,7 +340,7 @@ out: * This usage means that zero-order pages may not be compound. */ @@ -69671,9 +70212,23 @@ diff -urNp linux-3.0.7/mm/page_alloc.c linux-3.0.7/mm/page_alloc.c for_each_populated_zone(zone) { if (skip_free_areas_node(filter, zone_to_nid(zone))) continue; -diff -urNp linux-3.0.7/mm/percpu.c linux-3.0.7/mm/percpu.c ---- linux-3.0.7/mm/percpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/percpu.c 2011-08-23 21:47:56.000000000 -0400 +@@ -3368,7 +3382,13 @@ static int pageblock_is_reserved(unsigne + unsigned long pfn; + + for (pfn = start_pfn; pfn < end_pfn; pfn++) { ++#ifdef CONFIG_X86_32 ++ /* boot failures in VMware 8 on 32bit vanilla since ++ this change */ ++ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn))) ++#else + if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn))) ++#endif + return 1; + } + return 0; +diff -urNp linux-3.0.8/mm/percpu.c linux-3.0.8/mm/percpu.c +--- linux-3.0.8/mm/percpu.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/percpu.c 2011-08-23 21:47:56.000000000 -0400 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -69683,9 +70238,9 @@ diff -urNp linux-3.0.7/mm/percpu.c linux-3.0.7/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-3.0.7/mm/rmap.c linux-3.0.7/mm/rmap.c ---- linux-3.0.7/mm/rmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/rmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/rmap.c linux-3.0.8/mm/rmap.c +--- linux-3.0.8/mm/rmap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/rmap.c 2011-08-23 21:47:56.000000000 -0400 @@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru struct anon_vma *anon_vma = vma->anon_vma; struct anon_vma_chain *avc; @@ -69775,9 +70330,9 @@ diff -urNp linux-3.0.7/mm/rmap.c linux-3.0.7/mm/rmap.c { struct anon_vma_chain *avc; struct anon_vma *anon_vma; -diff -urNp linux-3.0.7/mm/shmem.c linux-3.0.7/mm/shmem.c ---- linux-3.0.7/mm/shmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/shmem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/shmem.c linux-3.0.8/mm/shmem.c +--- linux-3.0.8/mm/shmem.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/shmem.c 2011-08-23 21:48:14.000000000 -0400 @@ -31,7 +31,7 @@ #include <linux/percpu_counter.h> #include <linux/swap.h> @@ -69815,9 +70370,9 @@ diff -urNp linux-3.0.7/mm/shmem.c linux-3.0.7/mm/shmem.c if (!sbinfo) return -ENOMEM; -diff -urNp linux-3.0.7/mm/slab.c linux-3.0.7/mm/slab.c ---- linux-3.0.7/mm/slab.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/slab.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/slab.c linux-3.0.8/mm/slab.c +--- linux-3.0.8/mm/slab.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/slab.c 2011-08-23 21:48:14.000000000 -0400 @@ -151,7 +151,7 @@ /* Legal flag mask for kmem_cache_create(). */ @@ -69989,9 +70544,9 @@ diff -urNp linux-3.0.7/mm/slab.c linux-3.0.7/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-3.0.7/mm/slob.c linux-3.0.7/mm/slob.c ---- linux-3.0.7/mm/slob.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/slob.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/slob.c linux-3.0.8/mm/slob.c +--- linux-3.0.8/mm/slob.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/slob.c 2011-08-23 21:47:56.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 @@ -70340,9 +70895,9 @@ diff -urNp linux-3.0.7/mm/slob.c linux-3.0.7/mm/slob.c } EXPORT_SYMBOL(kmem_cache_free); -diff -urNp linux-3.0.7/mm/slub.c linux-3.0.7/mm/slub.c ---- linux-3.0.7/mm/slub.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/slub.c 2011-09-25 22:15:40.000000000 -0400 +diff -urNp linux-3.0.8/mm/slub.c linux-3.0.8/mm/slub.c +--- linux-3.0.8/mm/slub.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/slub.c 2011-09-25 22:15:40.000000000 -0400 @@ -200,7 +200,7 @@ struct track { enum track_item { TRACK_ALLOC, TRACK_FREE }; @@ -70582,9 +71137,9 @@ diff -urNp linux-3.0.7/mm/slub.c linux-3.0.7/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-3.0.7/mm/swap.c linux-3.0.7/mm/swap.c ---- linux-3.0.7/mm/swap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/swap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/swap.c linux-3.0.8/mm/swap.c +--- linux-3.0.8/mm/swap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/swap.c 2011-08-23 21:47:56.000000000 -0400 @@ -31,6 +31,7 @@ #include <linux/backing-dev.h> #include <linux/memcontrol.h> @@ -70602,9 +71157,9 @@ diff -urNp linux-3.0.7/mm/swap.c linux-3.0.7/mm/swap.c (*dtor)(page); } -diff -urNp linux-3.0.7/mm/swapfile.c linux-3.0.7/mm/swapfile.c ---- linux-3.0.7/mm/swapfile.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/swapfile.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/swapfile.c linux-3.0.8/mm/swapfile.c +--- linux-3.0.8/mm/swapfile.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/swapfile.c 2011-08-23 21:47:56.000000000 -0400 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex); static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait); @@ -70652,9 +71207,9 @@ diff -urNp linux-3.0.7/mm/swapfile.c linux-3.0.7/mm/swapfile.c wake_up_interruptible(&proc_poll_wait); if (S_ISREG(inode->i_mode)) -diff -urNp linux-3.0.7/mm/util.c linux-3.0.7/mm/util.c ---- linux-3.0.7/mm/util.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/util.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/mm/util.c linux-3.0.8/mm/util.c +--- linux-3.0.8/mm/util.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/util.c 2011-08-23 21:47:56.000000000 -0400 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user); * allocated buffer. Use this if you don't want to free the buffer immediately * like, for example, with RCU. @@ -70684,9 +71239,9 @@ diff -urNp linux-3.0.7/mm/util.c linux-3.0.7/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-3.0.7/mm/vmalloc.c linux-3.0.7/mm/vmalloc.c ---- linux-3.0.7/mm/vmalloc.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/mm/vmalloc.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c +--- linux-3.0.8/mm/vmalloc.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/mm/vmalloc.c 2011-10-16 21:55:28.000000000 -0400 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -70919,9 +71474,9 @@ diff -urNp linux-3.0.7/mm/vmalloc.c linux-3.0.7/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; -diff -urNp linux-3.0.7/mm/vmstat.c linux-3.0.7/mm/vmstat.c ---- linux-3.0.7/mm/vmstat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/mm/vmstat.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/mm/vmstat.c linux-3.0.8/mm/vmstat.c +--- linux-3.0.8/mm/vmstat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/mm/vmstat.c 2011-08-23 21:48:14.000000000 -0400 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -70974,9 +71529,9 @@ diff -urNp linux-3.0.7/mm/vmstat.c linux-3.0.7/mm/vmstat.c #endif return 0; } -diff -urNp linux-3.0.7/net/8021q/vlan.c linux-3.0.7/net/8021q/vlan.c ---- linux-3.0.7/net/8021q/vlan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/8021q/vlan.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/8021q/vlan.c linux-3.0.8/net/8021q/vlan.c +--- linux-3.0.8/net/8021q/vlan.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/8021q/vlan.c 2011-08-23 21:47:56.000000000 -0400 @@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -70987,9 +71542,9 @@ diff -urNp linux-3.0.7/net/8021q/vlan.c linux-3.0.7/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-3.0.7/net/9p/trans_fd.c linux-3.0.7/net/9p/trans_fd.c ---- linux-3.0.7/net/9p/trans_fd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/9p/trans_fd.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/9p/trans_fd.c linux-3.0.8/net/9p/trans_fd.c +--- linux-3.0.8/net/9p/trans_fd.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/9p/trans_fd.c 2011-10-06 04:17:55.000000000 -0400 @@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client oldfs = get_fs(); set_fs(get_ds()); @@ -70999,9 +71554,9 @@ diff -urNp linux-3.0.7/net/9p/trans_fd.c linux-3.0.7/net/9p/trans_fd.c set_fs(oldfs); if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) -diff -urNp linux-3.0.7/net/9p/trans_virtio.c linux-3.0.7/net/9p/trans_virtio.c ---- linux-3.0.7/net/9p/trans_virtio.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/9p/trans_virtio.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/9p/trans_virtio.c linux-3.0.8/net/9p/trans_virtio.c +--- linux-3.0.8/net/9p/trans_virtio.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/9p/trans_virtio.c 2011-10-16 21:55:28.000000000 -0400 @@ -327,7 +327,7 @@ req_retry_pinned: } else { char *pbuf; @@ -71020,9 +71575,9 @@ diff -urNp linux-3.0.7/net/9p/trans_virtio.c linux-3.0.7/net/9p/trans_virtio.c else pbuf = req->tc->pkbuf; -diff -urNp linux-3.0.7/net/atm/atm_misc.c linux-3.0.7/net/atm/atm_misc.c ---- linux-3.0.7/net/atm/atm_misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/atm_misc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/atm_misc.c linux-3.0.8/net/atm/atm_misc.c +--- linux-3.0.8/net/atm/atm_misc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/atm_misc.c 2011-08-23 21:47:56.000000000 -0400 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -71059,9 +71614,9 @@ diff -urNp linux-3.0.7/net/atm/atm_misc.c linux-3.0.7/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-3.0.7/net/atm/lec.h linux-3.0.7/net/atm/lec.h ---- linux-3.0.7/net/atm/lec.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/lec.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/lec.h linux-3.0.8/net/atm/lec.h +--- linux-3.0.8/net/atm/lec.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/lec.h 2011-08-23 21:47:56.000000000 -0400 @@ -48,7 +48,7 @@ struct lane2_ops { const u8 *tlvs, u32 sizeoftlvs); void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr, @@ -71071,9 +71626,9 @@ diff -urNp linux-3.0.7/net/atm/lec.h linux-3.0.7/net/atm/lec.h /* * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType -diff -urNp linux-3.0.7/net/atm/mpc.h linux-3.0.7/net/atm/mpc.h ---- linux-3.0.7/net/atm/mpc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/mpc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/mpc.h linux-3.0.8/net/atm/mpc.h +--- linux-3.0.8/net/atm/mpc.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/mpc.h 2011-08-23 21:47:56.000000000 -0400 @@ -33,7 +33,7 @@ struct mpoa_client { struct mpc_parameters parameters; /* parameters for this client */ @@ -71083,9 +71638,9 @@ diff -urNp linux-3.0.7/net/atm/mpc.h linux-3.0.7/net/atm/mpc.h }; -diff -urNp linux-3.0.7/net/atm/mpoa_caches.c linux-3.0.7/net/atm/mpoa_caches.c ---- linux-3.0.7/net/atm/mpoa_caches.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/mpoa_caches.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/mpoa_caches.c linux-3.0.8/net/atm/mpoa_caches.c +--- linux-3.0.8/net/atm/mpoa_caches.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/mpoa_caches.c 2011-08-23 21:48:14.000000000 -0400 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru struct timeval now; struct k_message msg; @@ -71095,9 +71650,9 @@ diff -urNp linux-3.0.7/net/atm/mpoa_caches.c linux-3.0.7/net/atm/mpoa_caches.c do_gettimeofday(&now); read_lock_bh(&client->ingress_lock); -diff -urNp linux-3.0.7/net/atm/proc.c linux-3.0.7/net/atm/proc.c ---- linux-3.0.7/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/proc.c linux-3.0.8/net/atm/proc.c +--- linux-3.0.8/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -71111,9 +71666,9 @@ diff -urNp linux-3.0.7/net/atm/proc.c linux-3.0.7/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-3.0.7/net/atm/resources.c linux-3.0.7/net/atm/resources.c ---- linux-3.0.7/net/atm/resources.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/atm/resources.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/atm/resources.c linux-3.0.8/net/atm/resources.c +--- linux-3.0.8/net/atm/resources.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/atm/resources.c 2011-08-23 21:47:56.000000000 -0400 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -71132,9 +71687,9 @@ diff -urNp linux-3.0.7/net/atm/resources.c linux-3.0.7/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-3.0.7/net/batman-adv/hard-interface.c linux-3.0.7/net/batman-adv/hard-interface.c ---- linux-3.0.7/net/batman-adv/hard-interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/hard-interface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/hard-interface.c linux-3.0.8/net/batman-adv/hard-interface.c +--- linux-3.0.8/net/batman-adv/hard-interface.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/hard-interface.c 2011-08-23 21:47:56.000000000 -0400 @@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_ hard_iface->batman_adv_ptype.dev = hard_iface->net_dev; dev_add_pack(&hard_iface->batman_adv_ptype); @@ -71146,9 +71701,9 @@ diff -urNp linux-3.0.7/net/batman-adv/hard-interface.c linux-3.0.7/net/batman-ad bat_info(hard_iface->soft_iface, "Adding interface: %s\n", hard_iface->net_dev->name); -diff -urNp linux-3.0.7/net/batman-adv/routing.c linux-3.0.7/net/batman-adv/routing.c ---- linux-3.0.7/net/batman-adv/routing.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/routing.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/routing.c linux-3.0.8/net/batman-adv/routing.c +--- linux-3.0.8/net/batman-adv/routing.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/routing.c 2011-08-23 21:47:56.000000000 -0400 @@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e return; @@ -71158,9 +71713,9 @@ diff -urNp linux-3.0.7/net/batman-adv/routing.c linux-3.0.7/net/batman-adv/routi has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0); -diff -urNp linux-3.0.7/net/batman-adv/send.c linux-3.0.7/net/batman-adv/send.c ---- linux-3.0.7/net/batman-adv/send.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/send.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/send.c linux-3.0.8/net/batman-adv/send.c +--- linux-3.0.8/net/batman-adv/send.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/send.c 2011-08-23 21:47:56.000000000 -0400 @@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa /* change sequence number to network order */ @@ -71179,9 +71734,9 @@ diff -urNp linux-3.0.7/net/batman-adv/send.c linux-3.0.7/net/batman-adv/send.c slide_own_bcast_window(hard_iface); send_time = own_send_time(bat_priv); -diff -urNp linux-3.0.7/net/batman-adv/soft-interface.c linux-3.0.7/net/batman-adv/soft-interface.c ---- linux-3.0.7/net/batman-adv/soft-interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/soft-interface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/soft-interface.c linux-3.0.8/net/batman-adv/soft-interface.c +--- linux-3.0.8/net/batman-adv/soft-interface.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/soft-interface.c 2011-08-23 21:47:56.000000000 -0400 @@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st /* set broadcast sequence number */ @@ -71200,9 +71755,9 @@ diff -urNp linux-3.0.7/net/batman-adv/soft-interface.c linux-3.0.7/net/batman-ad atomic_set(&bat_priv->tt_local_changed, 0); bat_priv->primary_if = NULL; -diff -urNp linux-3.0.7/net/batman-adv/types.h linux-3.0.7/net/batman-adv/types.h ---- linux-3.0.7/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/types.h linux-3.0.8/net/batman-adv/types.h +--- linux-3.0.8/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400 @@ -38,8 +38,8 @@ struct hard_iface { int16_t if_num; char if_status; @@ -71223,9 +71778,9 @@ diff -urNp linux-3.0.7/net/batman-adv/types.h linux-3.0.7/net/batman-adv/types.h atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; -diff -urNp linux-3.0.7/net/batman-adv/unicast.c linux-3.0.7/net/batman-adv/unicast.c ---- linux-3.0.7/net/batman-adv/unicast.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/batman-adv/unicast.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/batman-adv/unicast.c linux-3.0.8/net/batman-adv/unicast.c +--- linux-3.0.8/net/batman-adv/unicast.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/batman-adv/unicast.c 2011-08-23 21:47:56.000000000 -0400 @@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s frag1->flags = UNI_FRAG_HEAD | large_tail; frag2->flags = large_tail; @@ -71235,9 +71790,9 @@ diff -urNp linux-3.0.7/net/batman-adv/unicast.c linux-3.0.7/net/batman-adv/unica frag1->seqno = htons(seqno - 1); frag2->seqno = htons(seqno); -diff -urNp linux-3.0.7/net/bridge/br_multicast.c linux-3.0.7/net/bridge/br_multicast.c ---- linux-3.0.7/net/bridge/br_multicast.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/bridge/br_multicast.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/bridge/br_multicast.c linux-3.0.8/net/bridge/br_multicast.c +--- linux-3.0.8/net/bridge/br_multicast.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/bridge/br_multicast.c 2011-10-16 21:55:28.000000000 -0400 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct nexthdr = ip6h->nexthdr; offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); @@ -71247,9 +71802,9 @@ diff -urNp linux-3.0.7/net/bridge/br_multicast.c linux-3.0.7/net/bridge/br_multi return 0; /* Okay, we found ICMPv6 header */ -diff -urNp linux-3.0.7/net/bridge/netfilter/ebtables.c linux-3.0.7/net/bridge/netfilter/ebtables.c ---- linux-3.0.7/net/bridge/netfilter/ebtables.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/bridge/netfilter/ebtables.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/bridge/netfilter/ebtables.c linux-3.0.8/net/bridge/netfilter/ebtables.c +--- linux-3.0.8/net/bridge/netfilter/ebtables.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/bridge/netfilter/ebtables.c 2011-08-23 21:48:14.000000000 -0400 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s tmp.valid_hooks = t->table->valid_hooks; } @@ -71268,9 +71823,9 @@ diff -urNp linux-3.0.7/net/bridge/netfilter/ebtables.c linux-3.0.7/net/bridge/ne memset(&tinfo, 0, sizeof(tinfo)); if (cmd == EBT_SO_GET_ENTRIES) { -diff -urNp linux-3.0.7/net/caif/caif_socket.c linux-3.0.7/net/caif/caif_socket.c ---- linux-3.0.7/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/caif/caif_socket.c linux-3.0.8/net/caif/caif_socket.c +--- linux-3.0.8/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir; #ifdef CONFIG_DEBUG_FS struct debug_fs_counter { @@ -71400,9 +71955,9 @@ diff -urNp linux-3.0.7/net/caif/caif_socket.c linux-3.0.7/net/caif/caif_socket.c #ifdef CONFIG_DEBUG_FS if (!IS_ERR(debugfsdir)) { -diff -urNp linux-3.0.7/net/caif/cfctrl.c linux-3.0.7/net/caif/cfctrl.c ---- linux-3.0.7/net/caif/cfctrl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/caif/cfctrl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/caif/cfctrl.c linux-3.0.8/net/caif/cfctrl.c +--- linux-3.0.8/net/caif/cfctrl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/caif/cfctrl.c 2011-08-23 21:48:14.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/stddef.h> #include <linux/spinlock.h> @@ -71450,9 +72005,9 @@ diff -urNp linux-3.0.7/net/caif/cfctrl.c linux-3.0.7/net/caif/cfctrl.c cfpkt_extr_head(pkt, &cmdrsp, 1); cmd = cmdrsp & CFCTRL_CMD_MASK; -diff -urNp linux-3.0.7/net/compat.c linux-3.0.7/net/compat.c ---- linux-3.0.7/net/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/compat.c linux-3.0.8/net/compat.c +--- linux-3.0.8/net/compat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/compat.c 2011-10-06 04:17:55.000000000 -0400 @@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) @@ -71580,9 +72135,9 @@ diff -urNp linux-3.0.7/net/compat.c linux-3.0.7/net/compat.c struct group_filter __user *kgf; int __user *koptlen; u32 interface, fmode, numsrc; -diff -urNp linux-3.0.7/net/core/datagram.c linux-3.0.7/net/core/datagram.c ---- linux-3.0.7/net/core/datagram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/datagram.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/core/datagram.c linux-3.0.8/net/core/datagram.c +--- linux-3.0.8/net/core/datagram.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/datagram.c 2011-08-23 21:47:56.000000000 -0400 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s } @@ -71592,9 +72147,9 @@ diff -urNp linux-3.0.7/net/core/datagram.c linux-3.0.7/net/core/datagram.c sk_mem_reclaim_partial(sk); return err; -diff -urNp linux-3.0.7/net/core/dev.c linux-3.0.7/net/core/dev.c ---- linux-3.0.7/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/core/dev.c linux-3.0.8/net/core/dev.c +--- linux-3.0.8/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module = request_module("netdev-%s", name); @@ -71637,9 +72192,9 @@ diff -urNp linux-3.0.7/net/core/dev.c linux-3.0.7/net/core/dev.c { struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; -diff -urNp linux-3.0.7/net/core/flow.c linux-3.0.7/net/core/flow.c ---- linux-3.0.7/net/core/flow.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/flow.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/core/flow.c linux-3.0.8/net/core/flow.c +--- linux-3.0.8/net/core/flow.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/flow.c 2011-08-23 21:47:56.000000000 -0400 @@ -60,7 +60,7 @@ struct flow_cache { struct timer_list rnd_timer; }; @@ -71676,9 +72231,9 @@ diff -urNp linux-3.0.7/net/core/flow.c linux-3.0.7/net/core/flow.c if (!IS_ERR(flo)) fle->object = flo; else -diff -urNp linux-3.0.7/net/core/iovec.c linux-3.0.7/net/core/iovec.c ---- linux-3.0.7/net/core/iovec.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/iovec.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/core/iovec.c linux-3.0.8/net/core/iovec.c +--- linux-3.0.8/net/core/iovec.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/iovec.c 2011-10-06 04:17:55.000000000 -0400 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc if (m->msg_namelen) { if (mode == VERIFY_READ) { @@ -71697,9 +72252,9 @@ diff -urNp linux-3.0.7/net/core/iovec.c linux-3.0.7/net/core/iovec.c return -EFAULT; m->msg_iov = iov; -diff -urNp linux-3.0.7/net/core/rtnetlink.c linux-3.0.7/net/core/rtnetlink.c ---- linux-3.0.7/net/core/rtnetlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/rtnetlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/core/rtnetlink.c linux-3.0.8/net/core/rtnetlink.c +--- linux-3.0.8/net/core/rtnetlink.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/rtnetlink.c 2011-08-23 21:47:56.000000000 -0400 @@ -56,7 +56,7 @@ struct rtnl_link { rtnl_doit_func doit; @@ -71709,9 +72264,9 @@ diff -urNp linux-3.0.7/net/core/rtnetlink.c linux-3.0.7/net/core/rtnetlink.c static DEFINE_MUTEX(rtnl_mutex); -diff -urNp linux-3.0.7/net/core/scm.c linux-3.0.7/net/core/scm.c ---- linux-3.0.7/net/core/scm.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/core/scm.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/core/scm.c linux-3.0.8/net/core/scm.c +--- linux-3.0.8/net/core/scm.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/core/scm.c 2011-10-16 21:55:28.000000000 -0400 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send); int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) { @@ -71748,9 +72303,9 @@ diff -urNp linux-3.0.7/net/core/scm.c linux-3.0.7/net/core/scm.c i++, cmfptr++) { int new_fd; -diff -urNp linux-3.0.7/net/core/skbuff.c linux-3.0.7/net/core/skbuff.c ---- linux-3.0.7/net/core/skbuff.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/skbuff.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/core/skbuff.c linux-3.0.8/net/core/skbuff.c +--- linux-3.0.8/net/core/skbuff.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/skbuff.c 2011-08-23 21:48:14.000000000 -0400 @@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk = skb->sk; int ret = 0; @@ -71760,9 +72315,9 @@ diff -urNp linux-3.0.7/net/core/skbuff.c linux-3.0.7/net/core/skbuff.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -diff -urNp linux-3.0.7/net/core/sock.c linux-3.0.7/net/core/sock.c ---- linux-3.0.7/net/core/sock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/core/sock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/core/sock.c linux-3.0.8/net/core/sock.c +--- linux-3.0.8/net/core/sock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/core/sock.c 2011-08-23 21:48:14.000000000 -0400 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, */ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= @@ -71844,9 +72399,9 @@ diff -urNp linux-3.0.7/net/core/sock.c linux-3.0.7/net/core/sock.c } EXPORT_SYMBOL(sock_init_data); -diff -urNp linux-3.0.7/net/decnet/sysctl_net_decnet.c linux-3.0.7/net/decnet/sysctl_net_decnet.c ---- linux-3.0.7/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/decnet/sysctl_net_decnet.c linux-3.0.8/net/decnet/sysctl_net_decnet.c +--- linux-3.0.8/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -71865,9 +72420,9 @@ diff -urNp linux-3.0.7/net/decnet/sysctl_net_decnet.c linux-3.0.7/net/decnet/sys return -EFAULT; *lenp = len; -diff -urNp linux-3.0.7/net/econet/Kconfig linux-3.0.7/net/econet/Kconfig ---- linux-3.0.7/net/econet/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/econet/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/econet/Kconfig linux-3.0.8/net/econet/Kconfig +--- linux-3.0.8/net/econet/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/econet/Kconfig 2011-08-23 21:48:14.000000000 -0400 @@ -4,7 +4,7 @@ config ECONET @@ -71877,9 +72432,9 @@ diff -urNp linux-3.0.7/net/econet/Kconfig linux-3.0.7/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-3.0.7/net/ipv4/fib_frontend.c linux-3.0.7/net/ipv4/fib_frontend.c ---- linux-3.0.7/net/ipv4/fib_frontend.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/fib_frontend.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/fib_frontend.c linux-3.0.8/net/ipv4/fib_frontend.c +--- linux-3.0.8/net/ipv4/fib_frontend.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/fib_frontend.c 2011-08-23 21:47:56.000000000 -0400 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not #ifdef CONFIG_IP_ROUTE_MULTIPATH fib_sync_up(dev); @@ -71904,9 +72459,9 @@ diff -urNp linux-3.0.7/net/ipv4/fib_frontend.c linux-3.0.7/net/ipv4/fib_frontend rt_cache_flush(dev_net(dev), -1); break; case NETDEV_DOWN: -diff -urNp linux-3.0.7/net/ipv4/fib_semantics.c linux-3.0.7/net/ipv4/fib_semantics.c ---- linux-3.0.7/net/ipv4/fib_semantics.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/fib_semantics.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/fib_semantics.c linux-3.0.8/net/ipv4/fib_semantics.c +--- linux-3.0.8/net/ipv4/fib_semantics.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/fib_semantics.c 2011-08-23 21:47:56.000000000 -0400 @@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n nh->nh_saddr = inet_select_addr(nh->nh_dev, nh->nh_gw, @@ -71916,9 +72471,9 @@ diff -urNp linux-3.0.7/net/ipv4/fib_semantics.c linux-3.0.7/net/ipv4/fib_semanti return nh->nh_saddr; } -diff -urNp linux-3.0.7/net/ipv4/inet_diag.c linux-3.0.7/net/ipv4/inet_diag.c ---- linux-3.0.7/net/ipv4/inet_diag.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/inet_diag.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/inet_diag.c linux-3.0.8/net/ipv4/inet_diag.c +--- linux-3.0.8/net/ipv4/inet_diag.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/inet_diag.c 2011-08-23 21:48:14.000000000 -0400 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans = 0; @@ -71980,9 +72535,9 @@ diff -urNp linux-3.0.7/net/ipv4/inet_diag.c linux-3.0.7/net/ipv4/inet_diag.c tmo = req->expires - jiffies; if (tmo < 0) -diff -urNp linux-3.0.7/net/ipv4/inet_hashtables.c linux-3.0.7/net/ipv4/inet_hashtables.c ---- linux-3.0.7/net/ipv4/inet_hashtables.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/ipv4/inet_hashtables.c 2011-08-23 21:55:24.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/inet_hashtables.c linux-3.0.8/net/ipv4/inet_hashtables.c +--- linux-3.0.8/net/ipv4/inet_hashtables.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/ipv4/inet_hashtables.c 2011-08-23 21:55:24.000000000 -0400 @@ -18,12 +18,15 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -72008,9 +72563,9 @@ diff -urNp linux-3.0.7/net/ipv4/inet_hashtables.c linux-3.0.7/net/ipv4/inet_hash if (tw) { inet_twsk_deschedule(tw, death_row); while (twrefcnt) { -diff -urNp linux-3.0.7/net/ipv4/inetpeer.c linux-3.0.7/net/ipv4/inetpeer.c ---- linux-3.0.7/net/ipv4/inetpeer.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/ipv4/inetpeer.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/inetpeer.c linux-3.0.8/net/ipv4/inetpeer.c +--- linux-3.0.8/net/ipv4/inetpeer.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/ipv4/inetpeer.c 2011-08-23 21:48:14.000000000 -0400 @@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in unsigned int sequence; int invalidated, newrefcnt = 0; @@ -72031,9 +72586,39 @@ diff -urNp linux-3.0.7/net/ipv4/inetpeer.c linux-3.0.7/net/ipv4/inetpeer.c p->tcp_ts_stamp = 0; p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW; p->rate_tokens = 0; -diff -urNp linux-3.0.7/net/ipv4/ip_fragment.c linux-3.0.7/net/ipv4/ip_fragment.c ---- linux-3.0.7/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/ipconfig.c linux-3.0.8/net/ipv4/ipconfig.c +--- linux-3.0.8/net/ipv4/ipconfig.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/ipconfig.c 2011-10-06 04:17:55.000000000 -0400 +@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig + + mm_segment_t oldfs = get_fs(); + set_fs(get_ds()); +- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg); ++ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg); + set_fs(oldfs); + return res; + } +@@ -324,7 +324,7 @@ static int __init ic_dev_ioctl(unsigned + + mm_segment_t oldfs = get_fs(); + set_fs(get_ds()); +- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg); ++ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg); + set_fs(oldfs); + return res; + } +@@ -335,7 +335,7 @@ static int __init ic_route_ioctl(unsigne + + mm_segment_t oldfs = get_fs(); + set_fs(get_ds()); +- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg); ++ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg); + set_fs(oldfs); + return res; + } +diff -urNp linux-3.0.8/net/ipv4/ip_fragment.c linux-3.0.8/net/ipv4/ip_fragment.c +--- linux-3.0.8/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400 @@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct return 0; @@ -72043,9 +72628,9 @@ diff -urNp linux-3.0.7/net/ipv4/ip_fragment.c linux-3.0.7/net/ipv4/ip_fragment.c qp->rid = end; rc = qp->q.fragments && (end - start) > max; -diff -urNp linux-3.0.7/net/ipv4/ip_sockglue.c linux-3.0.7/net/ipv4/ip_sockglue.c ---- linux-3.0.7/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/ip_sockglue.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/ip_sockglue.c linux-3.0.8/net/ipv4/ip_sockglue.c +--- linux-3.0.8/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/ip_sockglue.c 2011-10-06 04:17:55.000000000 -0400 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock int val; int len; @@ -72074,39 +72659,9 @@ diff -urNp linux-3.0.7/net/ipv4/ip_sockglue.c linux-3.0.7/net/ipv4/ip_sockglue.c msg.msg_controllen = len; msg.msg_flags = 0; -diff -urNp linux-3.0.7/net/ipv4/ipconfig.c linux-3.0.7/net/ipv4/ipconfig.c ---- linux-3.0.7/net/ipv4/ipconfig.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/ipconfig.c 2011-10-06 04:17:55.000000000 -0400 -@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig - - mm_segment_t oldfs = get_fs(); - set_fs(get_ds()); -- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg); -+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg); - set_fs(oldfs); - return res; - } -@@ -324,7 +324,7 @@ static int __init ic_dev_ioctl(unsigned - - mm_segment_t oldfs = get_fs(); - set_fs(get_ds()); -- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg); -+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg); - set_fs(oldfs); - return res; - } -@@ -335,7 +335,7 @@ static int __init ic_route_ioctl(unsigne - - mm_segment_t oldfs = get_fs(); - set_fs(get_ds()); -- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg); -+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg); - set_fs(oldfs); - return res; - } -diff -urNp linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -72116,9 +72671,9 @@ diff -urNp linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.7/net/ip if (*octets == NULL) { if (net_ratelimit()) pr_notice("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-3.0.7/net/ipv4/ping.c linux-3.0.7/net/ipv4/ping.c ---- linux-3.0.7/net/ipv4/ping.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/ping.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/ping.c linux-3.0.8/net/ipv4/ping.c +--- linux-3.0.8/net/ipv4/ping.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/ping.c 2011-08-23 21:47:56.000000000 -0400 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -72128,9 +72683,9 @@ diff -urNp linux-3.0.7/net/ipv4/ping.c linux-3.0.7/net/ipv4/ping.c } static int ping_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/ipv4/raw.c linux-3.0.7/net/ipv4/raw.c ---- linux-3.0.7/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/raw.c linux-3.0.8/net/ipv4/raw.c +--- linux-3.0.8/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, int raw_rcv(struct sock *sk, struct sk_buff *skb) { @@ -72189,9 +72744,9 @@ diff -urNp linux-3.0.7/net/ipv4/raw.c linux-3.0.7/net/ipv4/raw.c } static int raw_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/ipv4/route.c linux-3.0.7/net/ipv4/route.c ---- linux-3.0.7/net/ipv4/route.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/ipv4/route.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/route.c linux-3.0.8/net/ipv4/route.c +--- linux-3.0.8/net/ipv4/route.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/ipv4/route.c 2011-10-16 21:55:28.000000000 -0400 @@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3 static inline int rt_genid(struct net *net) @@ -72219,9 +72774,9 @@ diff -urNp linux-3.0.7/net/ipv4/route.c linux-3.0.7/net/ipv4/route.c if (peer->tcp_ts_stamp) { ts = peer->tcp_ts; tsage = get_seconds() - peer->tcp_ts_stamp; -diff -urNp linux-3.0.7/net/ipv4/tcp.c linux-3.0.7/net/ipv4/tcp.c ---- linux-3.0.7/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp.c linux-3.0.8/net/ipv4/tcp.c +--- linux-3.0.8/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock int val; int err = 0; @@ -72240,9 +72795,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp.c linux-3.0.7/net/ipv4/tcp.c if (get_user(len, optlen)) return -EFAULT; -diff -urNp linux-3.0.7/net/ipv4/tcp_ipv4.c linux-3.0.7/net/ipv4/tcp_ipv4.c ---- linux-3.0.7/net/ipv4/tcp_ipv4.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp_ipv4.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c +--- linux-3.0.8/net/ipv4/tcp_ipv4.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp_ipv4.c 2011-08-23 21:48:14.000000000 -0400 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -72338,9 +72893,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp_ipv4.c linux-3.0.7/net/ipv4/tcp_ipv4.c } #define TMPSZ 150 -diff -urNp linux-3.0.7/net/ipv4/tcp_minisocks.c linux-3.0.7/net/ipv4/tcp_minisocks.c ---- linux-3.0.7/net/ipv4/tcp_minisocks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp_minisocks.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp_minisocks.c linux-3.0.8/net/ipv4/tcp_minisocks.c +--- linux-3.0.8/net/ipv4/tcp_minisocks.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp_minisocks.c 2011-08-23 21:48:14.000000000 -0400 @@ -27,6 +27,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -72363,9 +72918,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp_minisocks.c linux-3.0.7/net/ipv4/tcp_minisoc if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-3.0.7/net/ipv4/tcp_output.c linux-3.0.7/net/ipv4/tcp_output.c ---- linux-3.0.7/net/ipv4/tcp_output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp_output.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp_output.c linux-3.0.8/net/ipv4/tcp_output.c +--- linux-3.0.8/net/ipv4/tcp_output.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp_output.c 2011-08-23 21:48:14.000000000 -0400 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s int mss; int s_data_desired = 0; @@ -72375,9 +72930,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp_output.c linux-3.0.7/net/ipv4/tcp_output.c if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired) s_data_desired = cvp->s_data_desired; skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC); -diff -urNp linux-3.0.7/net/ipv4/tcp_probe.c linux-3.0.7/net/ipv4/tcp_probe.c ---- linux-3.0.7/net/ipv4/tcp_probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp_probe.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp_probe.c linux-3.0.8/net/ipv4/tcp_probe.c +--- linux-3.0.8/net/ipv4/tcp_probe.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp_probe.c 2011-08-23 21:47:56.000000000 -0400 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -72387,9 +72942,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp_probe.c linux-3.0.7/net/ipv4/tcp_probe.c return -EFAULT; cnt += width; } -diff -urNp linux-3.0.7/net/ipv4/tcp_timer.c linux-3.0.7/net/ipv4/tcp_timer.c ---- linux-3.0.7/net/ipv4/tcp_timer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/tcp_timer.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/tcp_timer.c linux-3.0.8/net/ipv4/tcp_timer.c +--- linux-3.0.8/net/ipv4/tcp_timer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/tcp_timer.c 2011-08-23 21:48:14.000000000 -0400 @@ -22,6 +22,10 @@ #include <linux/gfp.h> #include <net/tcp.h> @@ -72415,9 +72970,9 @@ diff -urNp linux-3.0.7/net/ipv4/tcp_timer.c linux-3.0.7/net/ipv4/tcp_timer.c if (retransmits_timed_out(sk, retry_until, syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ -diff -urNp linux-3.0.7/net/ipv4/udp.c linux-3.0.7/net/ipv4/udp.c ---- linux-3.0.7/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv4/udp.c linux-3.0.8/net/ipv4/udp.c +--- linux-3.0.8/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -72530,9 +73085,9 @@ diff -urNp linux-3.0.7/net/ipv4/udp.c linux-3.0.7/net/ipv4/udp.c } int udp4_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/ipv6/addrconf.c linux-3.0.7/net/ipv6/addrconf.c ---- linux-3.0.7/net/ipv6/addrconf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv6/addrconf.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/addrconf.c linux-3.0.8/net/ipv6/addrconf.c +--- linux-3.0.8/net/ipv6/addrconf.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv6/addrconf.c 2011-10-06 04:17:55.000000000 -0400 @@ -2072,7 +2072,7 @@ int addrconf_set_dstaddr(struct net *net p.iph.ihl = 5; p.iph.protocol = IPPROTO_IPV6; @@ -72542,9 +73097,9 @@ diff -urNp linux-3.0.7/net/ipv6/addrconf.c linux-3.0.7/net/ipv6/addrconf.c if (ops->ndo_do_ioctl) { mm_segment_t oldfs = get_fs(); -diff -urNp linux-3.0.7/net/ipv6/inet6_connection_sock.c linux-3.0.7/net/ipv6/inet6_connection_sock.c ---- linux-3.0.7/net/ipv6/inet6_connection_sock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv6/inet6_connection_sock.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/inet6_connection_sock.c linux-3.0.8/net/ipv6/inet6_connection_sock.c +--- linux-3.0.8/net/ipv6/inet6_connection_sock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv6/inet6_connection_sock.c 2011-08-23 21:47:56.000000000 -0400 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock * #ifdef CONFIG_XFRM { @@ -72563,9 +73118,9 @@ diff -urNp linux-3.0.7/net/ipv6/inet6_connection_sock.c linux-3.0.7/net/ipv6/ine __sk_dst_reset(sk); dst = NULL; } -diff -urNp linux-3.0.7/net/ipv6/ipv6_sockglue.c linux-3.0.7/net/ipv6/ipv6_sockglue.c ---- linux-3.0.7/net/ipv6/ipv6_sockglue.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/ipv6/ipv6_sockglue.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/ipv6_sockglue.c linux-3.0.8/net/ipv6/ipv6_sockglue.c +--- linux-3.0.8/net/ipv6/ipv6_sockglue.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/ipv6/ipv6_sockglue.c 2011-10-16 21:55:28.000000000 -0400 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc int val, valbool; int retv = -ENOPROTOOPT; @@ -72593,9 +73148,9 @@ diff -urNp linux-3.0.7/net/ipv6/ipv6_sockglue.c linux-3.0.7/net/ipv6/ipv6_sockgl msg.msg_controllen = len; msg.msg_flags = flags; -diff -urNp linux-3.0.7/net/ipv6/raw.c linux-3.0.7/net/ipv6/raw.c ---- linux-3.0.7/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/raw.c linux-3.0.8/net/ipv6/raw.c +--- linux-3.0.8/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s { if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) && @@ -72691,9 +73246,9 @@ diff -urNp linux-3.0.7/net/ipv6/raw.c linux-3.0.7/net/ipv6/raw.c } static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/ipv6/tcp_ipv6.c linux-3.0.7/net/ipv6/tcp_ipv6.c ---- linux-3.0.7/net/ipv6/tcp_ipv6.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/ipv6/tcp_ipv6.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c +--- linux-3.0.8/net/ipv6/tcp_ipv6.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/ipv6/tcp_ipv6.c 2011-08-23 21:48:14.000000000 -0400 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -72793,9 +73348,9 @@ diff -urNp linux-3.0.7/net/ipv6/tcp_ipv6.c linux-3.0.7/net/ipv6/tcp_ipv6.c } static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/ipv6/udp.c linux-3.0.7/net/ipv6/udp.c ---- linux-3.0.7/net/ipv6/udp.c 2011-10-17 23:17:09.000000000 -0400 -+++ linux-3.0.7/net/ipv6/udp.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.8/net/ipv6/udp.c linux-3.0.8/net/ipv6/udp.c +--- linux-3.0.8/net/ipv6/udp.c 2011-10-24 08:05:32.000000000 -0400 ++++ linux-3.0.8/net/ipv6/udp.c 2011-10-17 23:17:19.000000000 -0400 @@ -50,6 +50,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -72860,9 +73415,9 @@ diff -urNp linux-3.0.7/net/ipv6/udp.c linux-3.0.7/net/ipv6/udp.c } int udp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.7/net/irda/ircomm/ircomm_tty.c linux-3.0.7/net/irda/ircomm/ircomm_tty.c ---- linux-3.0.7/net/irda/ircomm/ircomm_tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/irda/ircomm/ircomm_tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/irda/ircomm/ircomm_tty.c linux-3.0.8/net/irda/ircomm/ircomm_tty.c +--- linux-3.0.8/net/irda/ircomm/ircomm_tty.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/irda/ircomm/ircomm_tty.c 2011-08-23 21:47:56.000000000 -0400 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -72985,9 +73540,9 @@ diff -urNp linux-3.0.7/net/irda/ircomm/ircomm_tty.c linux-3.0.7/net/irda/ircomm/ 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-3.0.7/net/iucv/af_iucv.c linux-3.0.7/net/iucv/af_iucv.c ---- linux-3.0.7/net/iucv/af_iucv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/iucv/af_iucv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/iucv/af_iucv.c linux-3.0.8/net/iucv/af_iucv.c +--- linux-3.0.8/net/iucv/af_iucv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/iucv/af_iucv.c 2011-08-23 21:47:56.000000000 -0400 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc write_lock_bh(&iucv_sk_list.lock); @@ -73001,9 +73556,9 @@ diff -urNp linux-3.0.7/net/iucv/af_iucv.c linux-3.0.7/net/iucv/af_iucv.c } write_unlock_bh(&iucv_sk_list.lock); -diff -urNp linux-3.0.7/net/key/af_key.c linux-3.0.7/net/key/af_key.c ---- linux-3.0.7/net/key/af_key.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/key/af_key.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/key/af_key.c linux-3.0.8/net/key/af_key.c +--- linux-3.0.8/net/key/af_key.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/key/af_key.c 2011-08-23 21:48:14.000000000 -0400 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_kmaddress k; @@ -73026,9 +73581,9 @@ diff -urNp linux-3.0.7/net/key/af_key.c linux-3.0.7/net/key/af_key.c } while (!res); return res; } -diff -urNp linux-3.0.7/net/lapb/lapb_iface.c linux-3.0.7/net/lapb/lapb_iface.c ---- linux-3.0.7/net/lapb/lapb_iface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/lapb/lapb_iface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/lapb/lapb_iface.c linux-3.0.8/net/lapb/lapb_iface.c +--- linux-3.0.8/net/lapb/lapb_iface.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/lapb/lapb_iface.c 2011-08-23 21:47:56.000000000 -0400 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev goto out; @@ -73092,9 +73647,9 @@ diff -urNp linux-3.0.7/net/lapb/lapb_iface.c linux-3.0.7/net/lapb/lapb_iface.c used = 1; } -diff -urNp linux-3.0.7/net/mac80211/debugfs_sta.c linux-3.0.7/net/mac80211/debugfs_sta.c ---- linux-3.0.7/net/mac80211/debugfs_sta.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/debugfs_sta.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/debugfs_sta.c linux-3.0.8/net/mac80211/debugfs_sta.c +--- linux-3.0.8/net/mac80211/debugfs_sta.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/debugfs_sta.c 2011-08-23 21:48:14.000000000 -0400 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc struct tid_ampdu_rx *tid_rx; struct tid_ampdu_tx *tid_tx; @@ -73113,9 +73668,9 @@ diff -urNp linux-3.0.7/net/mac80211/debugfs_sta.c linux-3.0.7/net/mac80211/debug p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n", htc->ht_supported ? "" : "not "); if (htc->ht_supported) { -diff -urNp linux-3.0.7/net/mac80211/ieee80211_i.h linux-3.0.7/net/mac80211/ieee80211_i.h ---- linux-3.0.7/net/mac80211/ieee80211_i.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/ieee80211_i.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/ieee80211_i.h linux-3.0.8/net/mac80211/ieee80211_i.h +--- linux-3.0.8/net/mac80211/ieee80211_i.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/ieee80211_i.h 2011-08-23 21:47:56.000000000 -0400 @@ -27,6 +27,7 @@ #include <net/ieee80211_radiotap.h> #include <net/cfg80211.h> @@ -73133,9 +73688,9 @@ diff -urNp linux-3.0.7/net/mac80211/ieee80211_i.h linux-3.0.7/net/mac80211/ieee8 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-3.0.7/net/mac80211/iface.c linux-3.0.7/net/mac80211/iface.c ---- linux-3.0.7/net/mac80211/iface.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/mac80211/iface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/iface.c linux-3.0.8/net/mac80211/iface.c +--- linux-3.0.8/net/mac80211/iface.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/mac80211/iface.c 2011-08-23 21:47:56.000000000 -0400 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ break; } @@ -73190,9 +73745,9 @@ diff -urNp linux-3.0.7/net/mac80211/iface.c linux-3.0.7/net/mac80211/iface.c if (local->ops->napi_poll) napi_disable(&local->napi); ieee80211_clear_tx_pending(local); -diff -urNp linux-3.0.7/net/mac80211/main.c linux-3.0.7/net/mac80211/main.c ---- linux-3.0.7/net/mac80211/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/main.c linux-3.0.8/net/mac80211/main.c +--- linux-3.0.8/net/mac80211/main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/main.c 2011-08-23 21:47:56.000000000 -0400 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -73202,9 +73757,9 @@ diff -urNp linux-3.0.7/net/mac80211/main.c linux-3.0.7/net/mac80211/main.c ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-3.0.7/net/mac80211/mlme.c linux-3.0.7/net/mac80211/mlme.c ---- linux-3.0.7/net/mac80211/mlme.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/mac80211/mlme.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/mlme.c linux-3.0.8/net/mac80211/mlme.c +--- linux-3.0.8/net/mac80211/mlme.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/mac80211/mlme.c 2011-08-23 21:48:14.000000000 -0400 @@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru bool have_higher_than_11mbit = false; u16 ap_ht_cap_flags; @@ -73214,9 +73769,9 @@ diff -urNp linux-3.0.7/net/mac80211/mlme.c linux-3.0.7/net/mac80211/mlme.c /* AssocResp and ReassocResp have identical structure */ aid = le16_to_cpu(mgmt->u.assoc_resp.aid); -diff -urNp linux-3.0.7/net/mac80211/pm.c linux-3.0.7/net/mac80211/pm.c ---- linux-3.0.7/net/mac80211/pm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/pm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/pm.c linux-3.0.8/net/mac80211/pm.c +--- linux-3.0.8/net/mac80211/pm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/pm.c 2011-08-23 21:47:56.000000000 -0400 @@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211 cancel_work_sync(&local->dynamic_ps_enable_work); del_timer_sync(&local->dynamic_ps_timer); @@ -73235,9 +73790,9 @@ diff -urNp linux-3.0.7/net/mac80211/pm.c linux-3.0.7/net/mac80211/pm.c ieee80211_stop_device(local); suspend: -diff -urNp linux-3.0.7/net/mac80211/rate.c linux-3.0.7/net/mac80211/rate.c ---- linux-3.0.7/net/mac80211/rate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/rate.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/rate.c linux-3.0.8/net/mac80211/rate.c +--- linux-3.0.8/net/mac80211/rate.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/rate.c 2011-08-23 21:47:56.000000000 -0400 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct ASSERT_RTNL(); @@ -73247,9 +73802,9 @@ diff -urNp linux-3.0.7/net/mac80211/rate.c linux-3.0.7/net/mac80211/rate.c return -EBUSY; if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { -diff -urNp linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c ---- linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c +--- linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c 2011-08-23 21:47:56.000000000 -0400 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r spin_unlock_irqrestore(&events->lock, status); @@ -73259,9 +73814,9 @@ diff -urNp linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c linux-3.0.7/net/mac802 return -EFAULT; return p; -diff -urNp linux-3.0.7/net/mac80211/util.c linux-3.0.7/net/mac80211/util.c ---- linux-3.0.7/net/mac80211/util.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/mac80211/util.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/mac80211/util.c linux-3.0.8/net/mac80211/util.c +--- linux-3.0.8/net/mac80211/util.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/mac80211/util.c 2011-08-23 21:47:56.000000000 -0400 @@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_ #endif @@ -73271,40 +73826,9 @@ diff -urNp linux-3.0.7/net/mac80211/util.c linux-3.0.7/net/mac80211/util.c /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-3.0.7/net/netfilter/Kconfig linux-3.0.7/net/netfilter/Kconfig ---- linux-3.0.7/net/netfilter/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/Kconfig 2011-08-23 21:48:14.000000000 -0400 -@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP - - To compile it as a module, choose M here. If unsure, say N. - -+config NETFILTER_XT_MATCH_GRADM -+ tristate '"gradm" match support' -+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED -+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC -+ ---help--- -+ The gradm match allows to match on grsecurity RBAC being enabled. -+ It is useful when iptables rules are applied early on bootup to -+ prevent connections to the machine (except from a trusted host) -+ while the RBAC system is disabled. -+ - config NETFILTER_XT_MATCH_HASHLIMIT - tristate '"hashlimit" match support' - depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) -diff -urNp linux-3.0.7/net/netfilter/Makefile linux-3.0.7/net/netfilter/Makefile ---- linux-3.0.7/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400 -@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += - obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o - obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o - obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o -+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o -diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c ---- linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c +--- linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c 2011-08-23 21:47:56.000000000 -0400 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s /* Increase the refcnt counter of the dest */ atomic_inc(&dest->refcnt); @@ -73332,9 +73856,9 @@ diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.7/net/netfilter if (i > 8 || i < 0) return 0; if (!todrop_rate[i]) return 0; -diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c ---- linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c +--- linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c 2011-08-23 21:47:56.000000000 -0400 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv ret = cp->packet_xmit(skb, cp, pd->pp); /* do not touch skb anymore */ @@ -73353,9 +73877,9 @@ diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c linux-3.0.7/net/netfilter if ((ipvs->sync_state & IP_VS_STATE_MASTER) && cp->protocol == IPPROTO_SCTP) { -diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c ---- linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c +--- linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service ip_vs_rs_hash(ipvs, dest); write_unlock_bh(&ipvs->rs_lock); @@ -73410,9 +73934,9 @@ diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.7/net/netfilter/ NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)); NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold); NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold); -diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c ---- linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c +--- linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c 2011-08-23 21:47:56.000000000 -0400 @@ -648,7 +648,7 @@ control: * i.e only increment in_pkts for Templates. */ @@ -73431,9 +73955,9 @@ diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.7/net/netfilter cp->state = state; cp->old_state = cp->state; /* -diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c 2011-08-23 21:47:56.000000000 -0400 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str else rc = NF_ACCEPT; @@ -73452,9 +73976,40 @@ diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.7/net/netfilter goto out; } -diff -urNp linux-3.0.7/net/netfilter/nfnetlink_log.c linux-3.0.7/net/netfilter/nfnetlink_log.c ---- linux-3.0.7/net/netfilter/nfnetlink_log.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/nfnetlink_log.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/Kconfig linux-3.0.8/net/netfilter/Kconfig +--- linux-3.0.8/net/netfilter/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/Kconfig 2011-08-23 21:48:14.000000000 -0400 +@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP + + To compile it as a module, choose M here. If unsure, say N. + ++config NETFILTER_XT_MATCH_GRADM ++ tristate '"gradm" match support' ++ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED ++ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC ++ ---help--- ++ The gradm match allows to match on grsecurity RBAC being enabled. ++ It is useful when iptables rules are applied early on bootup to ++ prevent connections to the machine (except from a trusted host) ++ while the RBAC system is disabled. ++ + config NETFILTER_XT_MATCH_HASHLIMIT + tristate '"hashlimit" match support' + depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) +diff -urNp linux-3.0.8/net/netfilter/Makefile linux-3.0.8/net/netfilter/Makefile +--- linux-3.0.8/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400 +@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += + obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o + obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o + obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o ++obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o +diff -urNp linux-3.0.8/net/netfilter/nfnetlink_log.c linux-3.0.8/net/netfilter/nfnetlink_log.c +--- linux-3.0.8/net/netfilter/nfnetlink_log.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/nfnetlink_log.c 2011-08-23 21:47:56.000000000 -0400 @@ -70,7 +70,7 @@ struct nfulnl_instance { }; @@ -73473,9 +74028,9 @@ diff -urNp linux-3.0.7/net/netfilter/nfnetlink_log.c linux-3.0.7/net/netfilter/n if (data_len) { struct nlattr *nla; -diff -urNp linux-3.0.7/net/netfilter/nfnetlink_queue.c linux-3.0.7/net/netfilter/nfnetlink_queue.c ---- linux-3.0.7/net/netfilter/nfnetlink_queue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/nfnetlink_queue.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/nfnetlink_queue.c linux-3.0.8/net/netfilter/nfnetlink_queue.c +--- linux-3.0.8/net/netfilter/nfnetlink_queue.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/nfnetlink_queue.c 2011-08-23 21:47:56.000000000 -0400 @@ -58,7 +58,7 @@ struct nfqnl_instance { */ spinlock_t lock; @@ -73503,9 +74058,9 @@ diff -urNp linux-3.0.7/net/netfilter/nfnetlink_queue.c linux-3.0.7/net/netfilter } static const struct seq_operations nfqnl_seq_ops = { -diff -urNp linux-3.0.7/net/netfilter/xt_gradm.c linux-3.0.7/net/netfilter/xt_gradm.c ---- linux-3.0.7/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/net/netfilter/xt_gradm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/xt_gradm.c linux-3.0.8/net/netfilter/xt_gradm.c +--- linux-3.0.8/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/net/netfilter/xt_gradm.c 2011-08-23 21:48:14.000000000 -0400 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -73558,9 +74113,9 @@ diff -urNp linux-3.0.7/net/netfilter/xt_gradm.c linux-3.0.7/net/netfilter/xt_gra +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-3.0.7/net/netfilter/xt_statistic.c linux-3.0.7/net/netfilter/xt_statistic.c ---- linux-3.0.7/net/netfilter/xt_statistic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netfilter/xt_statistic.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netfilter/xt_statistic.c linux-3.0.8/net/netfilter/xt_statistic.c +--- linux-3.0.8/net/netfilter/xt_statistic.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netfilter/xt_statistic.c 2011-08-23 21:47:56.000000000 -0400 @@ -18,7 +18,7 @@ #include <linux/netfilter/x_tables.h> @@ -73591,9 +74146,9 @@ diff -urNp linux-3.0.7/net/netfilter/xt_statistic.c linux-3.0.7/net/netfilter/xt return 0; } -diff -urNp linux-3.0.7/net/netlink/af_netlink.c linux-3.0.7/net/netlink/af_netlink.c ---- linux-3.0.7/net/netlink/af_netlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netlink/af_netlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/netlink/af_netlink.c linux-3.0.8/net/netlink/af_netlink.c +--- linux-3.0.8/net/netlink/af_netlink.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netlink/af_netlink.c 2011-08-23 21:47:56.000000000 -0400 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock sk->sk_error_report(sk); } @@ -73612,9 +74167,9 @@ diff -urNp linux-3.0.7/net/netlink/af_netlink.c linux-3.0.7/net/netlink/af_netli sock_i_ino(s) ); -diff -urNp linux-3.0.7/net/netrom/af_netrom.c linux-3.0.7/net/netrom/af_netrom.c ---- linux-3.0.7/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/netrom/af_netrom.c linux-3.0.8/net/netrom/af_netrom.c +--- linux-3.0.8/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc struct sock *sk = sock->sk; struct nr_sock *nr = nr_sk(sk); @@ -73631,9 +74186,9 @@ diff -urNp linux-3.0.7/net/netrom/af_netrom.c linux-3.0.7/net/netrom/af_netrom.c sax->fsa_ax25.sax25_call = nr->source_addr; *uaddr_len = sizeof(struct sockaddr_ax25); } -diff -urNp linux-3.0.7/net/packet/af_packet.c linux-3.0.7/net/packet/af_packet.c ---- linux-3.0.7/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/packet/af_packet.c linux-3.0.8/net/packet/af_packet.c +--- linux-3.0.8/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400 @@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk spin_lock(&sk->sk_receive_queue.lock); @@ -73669,9 +74224,9 @@ diff -urNp linux-3.0.7/net/packet/af_packet.c linux-3.0.7/net/packet/af_packet.c return -EFAULT; return 0; } -diff -urNp linux-3.0.7/net/phonet/af_phonet.c linux-3.0.7/net/phonet/af_phonet.c ---- linux-3.0.7/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/phonet/af_phonet.c linux-3.0.8/net/phonet/af_phonet.c +--- linux-3.0.8/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -73690,9 +74245,9 @@ diff -urNp linux-3.0.7/net/phonet/af_phonet.c linux-3.0.7/net/phonet/af_phonet.c return -EINVAL; err = proto_register(pp->prot, 1); -diff -urNp linux-3.0.7/net/phonet/pep.c linux-3.0.7/net/phonet/pep.c ---- linux-3.0.7/net/phonet/pep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/phonet/pep.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/phonet/pep.c linux-3.0.8/net/phonet/pep.c +--- linux-3.0.8/net/phonet/pep.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/phonet/pep.c 2011-08-23 21:47:56.000000000 -0400 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, case PNS_PEP_CTRL_REQ: @@ -73720,9 +74275,9 @@ diff -urNp linux-3.0.7/net/phonet/pep.c linux-3.0.7/net/phonet/pep.c err = NET_RX_DROP; break; } -diff -urNp linux-3.0.7/net/phonet/socket.c linux-3.0.7/net/phonet/socket.c ---- linux-3.0.7/net/phonet/socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/phonet/socket.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/phonet/socket.c linux-3.0.8/net/phonet/socket.c +--- linux-3.0.8/net/phonet/socket.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/phonet/socket.c 2011-08-23 21:48:14.000000000 -0400 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f pn->resource, sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -73739,9 +74294,9 @@ diff -urNp linux-3.0.7/net/phonet/socket.c linux-3.0.7/net/phonet/socket.c } seq_printf(seq, "%*s\n", 127 - len, ""); return 0; -diff -urNp linux-3.0.7/net/rds/cong.c linux-3.0.7/net/rds/cong.c ---- linux-3.0.7/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/cong.c linux-3.0.8/net/rds/cong.c +--- linux-3.0.8/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400 @@ -77,7 +77,7 @@ * finds that the saved generation number is smaller than the global generation * number, it wakes up the process. @@ -73769,21 +74324,9 @@ diff -urNp linux-3.0.7/net/rds/cong.c linux-3.0.7/net/rds/cong.c if (likely(*recent == gen)) return 0; -diff -urNp linux-3.0.7/net/rds/ib.h linux-3.0.7/net/rds/ib.h ---- linux-3.0.7/net/rds/ib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/ib.h 2011-08-23 21:47:56.000000000 -0400 -@@ -127,7 +127,7 @@ struct rds_ib_connection { - /* sending acks */ - unsigned long i_ack_flags; - #ifdef KERNEL_HAS_ATOMIC64 -- atomic64_t i_ack_next; /* next ACK to send */ -+ atomic64_unchecked_t i_ack_next; /* next ACK to send */ - #else - spinlock_t i_ack_lock; /* protect i_ack_next */ - u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-3.0.7/net/rds/ib_cm.c linux-3.0.7/net/rds/ib_cm.c ---- linux-3.0.7/net/rds/ib_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/ib_cm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/ib_cm.c linux-3.0.8/net/rds/ib_cm.c +--- linux-3.0.8/net/rds/ib_cm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/ib_cm.c 2011-08-23 21:47:56.000000000 -0400 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -73793,9 +74336,21 @@ diff -urNp linux-3.0.7/net/rds/ib_cm.c linux-3.0.7/net/rds/ib_cm.c #else ic->i_ack_next = 0; #endif -diff -urNp linux-3.0.7/net/rds/ib_recv.c linux-3.0.7/net/rds/ib_recv.c ---- linux-3.0.7/net/rds/ib_recv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/ib_recv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/ib.h linux-3.0.8/net/rds/ib.h +--- linux-3.0.8/net/rds/ib.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/ib.h 2011-08-23 21:47:56.000000000 -0400 +@@ -127,7 +127,7 @@ struct rds_ib_connection { + /* sending acks */ + unsigned long i_ack_flags; + #ifdef KERNEL_HAS_ATOMIC64 +- atomic64_t i_ack_next; /* next ACK to send */ ++ atomic64_unchecked_t i_ack_next; /* next ACK to send */ + #else + spinlock_t i_ack_lock; /* protect i_ack_next */ + u64 i_ack_next; /* next ACK to send */ +diff -urNp linux-3.0.8/net/rds/ib_recv.c linux-3.0.8/net/rds/ib_recv.c +--- linux-3.0.8/net/rds/ib_recv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/ib_recv.c 2011-08-23 21:47:56.000000000 -0400 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_ static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq, int ack_required) @@ -73814,21 +74369,9 @@ diff -urNp linux-3.0.7/net/rds/ib_recv.c linux-3.0.7/net/rds/ib_recv.c } #endif -diff -urNp linux-3.0.7/net/rds/iw.h linux-3.0.7/net/rds/iw.h ---- linux-3.0.7/net/rds/iw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/iw.h 2011-08-23 21:47:56.000000000 -0400 -@@ -133,7 +133,7 @@ struct rds_iw_connection { - /* sending acks */ - unsigned long i_ack_flags; - #ifdef KERNEL_HAS_ATOMIC64 -- atomic64_t i_ack_next; /* next ACK to send */ -+ atomic64_unchecked_t i_ack_next; /* next ACK to send */ - #else - spinlock_t i_ack_lock; /* protect i_ack_next */ - u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-3.0.7/net/rds/iw_cm.c linux-3.0.7/net/rds/iw_cm.c ---- linux-3.0.7/net/rds/iw_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/iw_cm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/iw_cm.c linux-3.0.8/net/rds/iw_cm.c +--- linux-3.0.8/net/rds/iw_cm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/iw_cm.c 2011-08-23 21:47:56.000000000 -0400 @@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -73838,9 +74381,21 @@ diff -urNp linux-3.0.7/net/rds/iw_cm.c linux-3.0.7/net/rds/iw_cm.c #else ic->i_ack_next = 0; #endif -diff -urNp linux-3.0.7/net/rds/iw_rdma.c linux-3.0.7/net/rds/iw_rdma.c ---- linux-3.0.7/net/rds/iw_rdma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/iw_rdma.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/iw.h linux-3.0.8/net/rds/iw.h +--- linux-3.0.8/net/rds/iw.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/iw.h 2011-08-23 21:47:56.000000000 -0400 +@@ -133,7 +133,7 @@ struct rds_iw_connection { + /* sending acks */ + unsigned long i_ack_flags; + #ifdef KERNEL_HAS_ATOMIC64 +- atomic64_t i_ack_next; /* next ACK to send */ ++ atomic64_unchecked_t i_ack_next; /* next ACK to send */ + #else + spinlock_t i_ack_lock; /* protect i_ack_next */ + u64 i_ack_next; /* next ACK to send */ +diff -urNp linux-3.0.8/net/rds/iw_rdma.c linux-3.0.8/net/rds/iw_rdma.c +--- linux-3.0.8/net/rds/iw_rdma.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/iw_rdma.c 2011-08-23 21:48:14.000000000 -0400 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de struct rdma_cm_id *pcm_id; int rc; @@ -73850,9 +74405,9 @@ diff -urNp linux-3.0.7/net/rds/iw_rdma.c linux-3.0.7/net/rds/iw_rdma.c src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr; -diff -urNp linux-3.0.7/net/rds/iw_recv.c linux-3.0.7/net/rds/iw_recv.c ---- linux-3.0.7/net/rds/iw_recv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/iw_recv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/iw_recv.c linux-3.0.8/net/rds/iw_recv.c +--- linux-3.0.8/net/rds/iw_recv.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/iw_recv.c 2011-08-23 21:47:56.000000000 -0400 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq, int ack_required) @@ -73871,9 +74426,9 @@ diff -urNp linux-3.0.7/net/rds/iw_recv.c linux-3.0.7/net/rds/iw_recv.c } #endif -diff -urNp linux-3.0.7/net/rds/tcp.c linux-3.0.7/net/rds/tcp.c ---- linux-3.0.7/net/rds/tcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/tcp.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/tcp.c linux-3.0.8/net/rds/tcp.c +--- linux-3.0.8/net/rds/tcp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/tcp.c 2011-10-06 04:17:55.000000000 -0400 @@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock int val = 1; @@ -73883,9 +74438,9 @@ diff -urNp linux-3.0.7/net/rds/tcp.c linux-3.0.7/net/rds/tcp.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-3.0.7/net/rds/tcp_send.c linux-3.0.7/net/rds/tcp_send.c ---- linux-3.0.7/net/rds/tcp_send.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rds/tcp_send.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/rds/tcp_send.c linux-3.0.8/net/rds/tcp_send.c +--- linux-3.0.8/net/rds/tcp_send.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rds/tcp_send.c 2011-10-06 04:17:55.000000000 -0400 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket * oldfs = get_fs(); @@ -73895,9 +74450,9 @@ diff -urNp linux-3.0.7/net/rds/tcp_send.c linux-3.0.7/net/rds/tcp_send.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-3.0.7/net/rxrpc/af_rxrpc.c linux-3.0.7/net/rxrpc/af_rxrpc.c ---- linux-3.0.7/net/rxrpc/af_rxrpc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/af_rxrpc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/af_rxrpc.c linux-3.0.8/net/rxrpc/af_rxrpc.c +--- linux-3.0.8/net/rxrpc/af_rxrpc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/af_rxrpc.c 2011-08-23 21:47:56.000000000 -0400 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ __be32 rxrpc_epoch; @@ -73907,9 +74462,9 @@ diff -urNp linux-3.0.7/net/rxrpc/af_rxrpc.c linux-3.0.7/net/rxrpc/af_rxrpc.c /* count of skbs currently in use */ atomic_t rxrpc_n_skbs; -diff -urNp linux-3.0.7/net/rxrpc/ar-ack.c linux-3.0.7/net/rxrpc/ar-ack.c ---- linux-3.0.7/net/rxrpc/ar-ack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-ack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-ack.c linux-3.0.8/net/rxrpc/ar-ack.c +--- linux-3.0.8/net/rxrpc/ar-ack.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-ack.c 2011-08-23 21:48:14.000000000 -0400 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca _enter("{%d,%d,%d,%d},", @@ -73982,9 +74537,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-ack.c linux-3.0.7/net/rxrpc/ar-ack.c _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial)); send_message_2: -diff -urNp linux-3.0.7/net/rxrpc/ar-call.c linux-3.0.7/net/rxrpc/ar-call.c ---- linux-3.0.7/net/rxrpc/ar-call.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-call.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-call.c linux-3.0.8/net/rxrpc/ar-call.c +--- linux-3.0.8/net/rxrpc/ar-call.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-call.c 2011-08-23 21:47:56.000000000 -0400 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca spin_lock_init(&call->lock); rwlock_init(&call->state_lock); @@ -73994,9 +74549,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-call.c linux-3.0.7/net/rxrpc/ar-call.c call->state = RXRPC_CALL_CLIENT_SEND_REQUEST; memset(&call->sock_node, 0xed, sizeof(call->sock_node)); -diff -urNp linux-3.0.7/net/rxrpc/ar-connection.c linux-3.0.7/net/rxrpc/ar-connection.c ---- linux-3.0.7/net/rxrpc/ar-connection.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-connection.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-connection.c linux-3.0.8/net/rxrpc/ar-connection.c +--- linux-3.0.8/net/rxrpc/ar-connection.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-connection.c 2011-08-23 21:47:56.000000000 -0400 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al rwlock_init(&conn->lock); spin_lock_init(&conn->state_lock); @@ -74006,9 +74561,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-connection.c linux-3.0.7/net/rxrpc/ar-connec conn->avail_calls = RXRPC_MAXCALLS; conn->size_align = 4; conn->header_size = sizeof(struct rxrpc_header); -diff -urNp linux-3.0.7/net/rxrpc/ar-connevent.c linux-3.0.7/net/rxrpc/ar-connevent.c ---- linux-3.0.7/net/rxrpc/ar-connevent.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-connevent.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-connevent.c linux-3.0.8/net/rxrpc/ar-connevent.c +--- linux-3.0.8/net/rxrpc/ar-connevent.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-connevent.c 2011-08-23 21:47:56.000000000 -0400 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct len = iov[0].iov_len + iov[1].iov_len; @@ -74018,9 +74573,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-connevent.c linux-3.0.7/net/rxrpc/ar-conneve _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -diff -urNp linux-3.0.7/net/rxrpc/ar-input.c linux-3.0.7/net/rxrpc/ar-input.c ---- linux-3.0.7/net/rxrpc/ar-input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-input.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-input.c linux-3.0.8/net/rxrpc/ar-input.c +--- linux-3.0.8/net/rxrpc/ar-input.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-input.c 2011-08-23 21:47:56.000000000 -0400 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx /* track the latest serial number on this connection for ACK packet * information */ @@ -74033,9 +74588,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-input.c linux-3.0.7/net/rxrpc/ar-input.c serial); /* request ACK generation for any ACK or DATA packet that requests -diff -urNp linux-3.0.7/net/rxrpc/ar-internal.h linux-3.0.7/net/rxrpc/ar-internal.h ---- linux-3.0.7/net/rxrpc/ar-internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-internal.h linux-3.0.8/net/rxrpc/ar-internal.h +--- linux-3.0.8/net/rxrpc/ar-internal.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-internal.h 2011-08-23 21:47:56.000000000 -0400 @@ -272,8 +272,8 @@ struct rxrpc_connection { int error; /* error code for local abort */ int debug_id; /* debug ID for printks */ @@ -74065,9 +74620,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-internal.h linux-3.0.7/net/rxrpc/ar-internal extern struct workqueue_struct *rxrpc_workqueue; /* -diff -urNp linux-3.0.7/net/rxrpc/ar-local.c linux-3.0.7/net/rxrpc/ar-local.c ---- linux-3.0.7/net/rxrpc/ar-local.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-local.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-local.c linux-3.0.8/net/rxrpc/ar-local.c +--- linux-3.0.8/net/rxrpc/ar-local.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-local.c 2011-08-23 21:47:56.000000000 -0400 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st spin_lock_init(&local->lock); rwlock_init(&local->services_lock); @@ -74077,9 +74632,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-local.c linux-3.0.7/net/rxrpc/ar-local.c memcpy(&local->srx, srx, sizeof(*srx)); } -diff -urNp linux-3.0.7/net/rxrpc/ar-output.c linux-3.0.7/net/rxrpc/ar-output.c ---- linux-3.0.7/net/rxrpc/ar-output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-output.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-output.c linux-3.0.8/net/rxrpc/ar-output.c +--- linux-3.0.8/net/rxrpc/ar-output.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-output.c 2011-08-23 21:47:56.000000000 -0400 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb sp->hdr.cid = call->cid; sp->hdr.callNumber = call->call_id; @@ -74092,9 +74647,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-output.c linux-3.0.7/net/rxrpc/ar-output.c sp->hdr.type = RXRPC_PACKET_TYPE_DATA; sp->hdr.userStatus = 0; sp->hdr.securityIndex = conn->security_ix; -diff -urNp linux-3.0.7/net/rxrpc/ar-peer.c linux-3.0.7/net/rxrpc/ar-peer.c ---- linux-3.0.7/net/rxrpc/ar-peer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-peer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-peer.c linux-3.0.8/net/rxrpc/ar-peer.c +--- linux-3.0.8/net/rxrpc/ar-peer.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-peer.c 2011-08-23 21:47:56.000000000 -0400 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe INIT_LIST_HEAD(&peer->error_targets); spin_lock_init(&peer->lock); @@ -74104,9 +74659,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-peer.c linux-3.0.7/net/rxrpc/ar-peer.c memcpy(&peer->srx, srx, sizeof(*srx)); rxrpc_assess_MTU_size(peer); -diff -urNp linux-3.0.7/net/rxrpc/ar-proc.c linux-3.0.7/net/rxrpc/ar-proc.c ---- linux-3.0.7/net/rxrpc/ar-proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-proc.c linux-3.0.8/net/rxrpc/ar-proc.c +--- linux-3.0.8/net/rxrpc/ar-proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-proc.c 2011-08-23 21:47:56.000000000 -0400 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str atomic_read(&conn->usage), rxrpc_conn_states[conn->state], @@ -74118,9 +74673,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-proc.c linux-3.0.7/net/rxrpc/ar-proc.c return 0; } -diff -urNp linux-3.0.7/net/rxrpc/ar-transport.c linux-3.0.7/net/rxrpc/ar-transport.c ---- linux-3.0.7/net/rxrpc/ar-transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/ar-transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/ar-transport.c linux-3.0.8/net/rxrpc/ar-transport.c +--- linux-3.0.8/net/rxrpc/ar-transport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/ar-transport.c 2011-08-23 21:47:56.000000000 -0400 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all spin_lock_init(&trans->client_lock); rwlock_init(&trans->conn_lock); @@ -74130,9 +74685,9 @@ diff -urNp linux-3.0.7/net/rxrpc/ar-transport.c linux-3.0.7/net/rxrpc/ar-transpo if (peer->srx.transport.family == AF_INET) { switch (peer->srx.transport_type) { -diff -urNp linux-3.0.7/net/rxrpc/rxkad.c linux-3.0.7/net/rxrpc/rxkad.c ---- linux-3.0.7/net/rxrpc/rxkad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/rxrpc/rxkad.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/rxrpc/rxkad.c linux-3.0.8/net/rxrpc/rxkad.c +--- linux-3.0.8/net/rxrpc/rxkad.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/rxrpc/rxkad.c 2011-08-23 21:48:14.000000000 -0400 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c u16 check; int nsg; @@ -74169,9 +74724,9 @@ diff -urNp linux-3.0.7/net/rxrpc/rxkad.c linux-3.0.7/net/rxrpc/rxkad.c _proto("Tx RESPONSE %%%u", ntohl(hdr->serial)); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); -diff -urNp linux-3.0.7/net/sctp/proc.c linux-3.0.7/net/sctp/proc.c ---- linux-3.0.7/net/sctp/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sctp/proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/sctp/proc.c linux-3.0.8/net/sctp/proc.c +--- linux-3.0.8/net/sctp/proc.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sctp/proc.c 2011-08-23 21:48:14.000000000 -0400 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s seq_printf(seq, "%8pK %8pK %-3d %-3d %-2d %-4d " @@ -74182,9 +74737,9 @@ diff -urNp linux-3.0.7/net/sctp/proc.c linux-3.0.7/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-3.0.7/net/sctp/socket.c linux-3.0.7/net/sctp/socket.c ---- linux-3.0.7/net/sctp/socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sctp/socket.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sctp/socket.c linux-3.0.8/net/sctp/socket.c +--- linux-3.0.8/net/sctp/socket.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sctp/socket.c 2011-08-23 21:47:56.000000000 -0400 @@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) @@ -74194,9 +74749,9 @@ diff -urNp linux-3.0.7/net/sctp/socket.c linux-3.0.7/net/sctp/socket.c return -EFAULT; to += addrlen; cnt++; -diff -urNp linux-3.0.7/net/socket.c linux-3.0.7/net/socket.c ---- linux-3.0.7/net/socket.c 2011-10-16 21:54:54.000000000 -0400 -+++ linux-3.0.7/net/socket.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.8/net/socket.c linux-3.0.8/net/socket.c +--- linux-3.0.8/net/socket.c 2011-10-24 08:05:30.000000000 -0400 ++++ linux-3.0.8/net/socket.c 2011-10-16 21:55:28.000000000 -0400 @@ -88,6 +88,7 @@ #include <linux/nsproxy.h> #include <linux/magic.h> @@ -74464,9 +75019,9 @@ diff -urNp linux-3.0.7/net/socket.c linux-3.0.7/net/socket.c set_fs(KERNEL_DS); if (level == SOL_SOCKET) -diff -urNp linux-3.0.7/net/sunrpc/sched.c linux-3.0.7/net/sunrpc/sched.c ---- linux-3.0.7/net/sunrpc/sched.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/sched.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/sched.c linux-3.0.8/net/sunrpc/sched.c +--- linux-3.0.8/net/sunrpc/sched.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/sched.c 2011-08-23 21:47:56.000000000 -0400 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -74479,9 +75034,9 @@ diff -urNp linux-3.0.7/net/sunrpc/sched.c linux-3.0.7/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-3.0.7/net/sunrpc/svcsock.c linux-3.0.7/net/sunrpc/svcsock.c ---- linux-3.0.7/net/sunrpc/svcsock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/svcsock.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/svcsock.c linux-3.0.8/net/sunrpc/svcsock.c +--- linux-3.0.8/net/sunrpc/svcsock.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/svcsock.c 2011-10-06 04:17:55.000000000 -0400 @@ -392,7 +392,7 @@ static int svc_partial_recvfrom(struct s int buflen, unsigned int base) { @@ -74491,9 +75046,9 @@ diff -urNp linux-3.0.7/net/sunrpc/svcsock.c linux-3.0.7/net/sunrpc/svcsock.c unsigned int i; int ret; -diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR static unsigned int min_max_inline = 4096; static unsigned int max_max_inline = 65536; @@ -74601,9 +75156,9 @@ diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.7/net/sunrpc/xpr .mode = 0644, .proc_handler = read_reset_stat, }, -diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ---- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +--- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-08-23 21:47:56.000000000 -0400 @@ -499,7 +499,7 @@ next_sge: svc_rdma_put_context(ctxt, 0); goto out; @@ -74631,9 +75186,9 @@ diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.7/net/s /* Build up the XDR from the receive buffers. */ rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len); -diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c ---- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c +--- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-08-23 21:47:56.000000000 -0400 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm write_wr.wr.rdma.remote_addr = to; @@ -74643,9 +75198,9 @@ diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.7/net/sun if (svc_rdma_send(xprt, &write_wr)) goto err; return 0; -diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c ---- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c +--- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-08-23 21:47:56.000000000 -0400 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd return; @@ -74691,9 +75246,9 @@ diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.7/net/ /* See if we can opportunistically reap SQ WR to make room */ sq_cq_reap(xprt); -diff -urNp linux-3.0.7/net/sysctl_net.c linux-3.0.7/net/sysctl_net.c ---- linux-3.0.7/net/sysctl_net.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/sysctl_net.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/sysctl_net.c linux-3.0.8/net/sysctl_net.c +--- linux-3.0.8/net/sysctl_net.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/sysctl_net.c 2011-08-23 21:48:14.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -74703,9 +75258,9 @@ diff -urNp linux-3.0.7/net/sysctl_net.c linux-3.0.7/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-3.0.7/net/tipc/link.c linux-3.0.7/net/tipc/link.c ---- linux-3.0.7/net/tipc/link.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/tipc/link.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/tipc/link.c linux-3.0.8/net/tipc/link.c +--- linux-3.0.8/net/tipc/link.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/tipc/link.c 2011-10-06 04:17:55.000000000 -0400 @@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc struct tipc_msg fragm_hdr; struct sk_buff *buf, *buf_chain, *prev; @@ -74733,9 +75288,9 @@ diff -urNp linux-3.0.7/net/tipc/link.c linux-3.0.7/net/tipc/link.c sect_crs += sz; sect_rest -= sz; fragm_crs += sz; -diff -urNp linux-3.0.7/net/tipc/msg.c linux-3.0.7/net/tipc/msg.c ---- linux-3.0.7/net/tipc/msg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/tipc/msg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/tipc/msg.c linux-3.0.8/net/tipc/msg.c +--- linux-3.0.8/net/tipc/msg.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/tipc/msg.c 2011-10-06 04:17:55.000000000 -0400 @@ -101,7 +101,7 @@ int tipc_msg_build(struct tipc_msg *hdr, msg_sect[cnt].iov_len); else @@ -74745,9 +75300,9 @@ diff -urNp linux-3.0.7/net/tipc/msg.c linux-3.0.7/net/tipc/msg.c msg_sect[cnt].iov_len); pos += msg_sect[cnt].iov_len; } -diff -urNp linux-3.0.7/net/tipc/subscr.c linux-3.0.7/net/tipc/subscr.c ---- linux-3.0.7/net/tipc/subscr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/tipc/subscr.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/net/tipc/subscr.c linux-3.0.8/net/tipc/subscr.c +--- linux-3.0.8/net/tipc/subscr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/tipc/subscr.c 2011-10-06 04:17:55.000000000 -0400 @@ -101,7 +101,7 @@ static void subscr_send_event(struct sub { struct iovec msg_sect; @@ -74757,9 +75312,9 @@ diff -urNp linux-3.0.7/net/tipc/subscr.c linux-3.0.7/net/tipc/subscr.c msg_sect.iov_len = sizeof(struct tipc_event); sub->evt.event = htohl(event, sub->swap); -diff -urNp linux-3.0.7/net/unix/af_unix.c linux-3.0.7/net/unix/af_unix.c ---- linux-3.0.7/net/unix/af_unix.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/unix/af_unix.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/unix/af_unix.c linux-3.0.8/net/unix/af_unix.c +--- linux-3.0.8/net/unix/af_unix.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/unix/af_unix.c 2011-08-23 21:48:14.000000000 -0400 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -74806,9 +75361,9 @@ diff -urNp linux-3.0.7/net/unix/af_unix.c linux-3.0.7/net/unix/af_unix.c mutex_unlock(&nd.path.dentry->d_inode->i_mutex); dput(nd.path.dentry); nd.path.dentry = dentry; -diff -urNp linux-3.0.7/net/wireless/core.h linux-3.0.7/net/wireless/core.h ---- linux-3.0.7/net/wireless/core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/wireless/core.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/wireless/core.h linux-3.0.8/net/wireless/core.h +--- linux-3.0.8/net/wireless/core.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/wireless/core.h 2011-08-23 21:47:56.000000000 -0400 @@ -27,7 +27,7 @@ struct cfg80211_registered_device { struct mutex mtx; @@ -74818,9 +75373,9 @@ diff -urNp linux-3.0.7/net/wireless/core.h linux-3.0.7/net/wireless/core.h struct rfkill *rfkill; struct work_struct rfkill_sync; -diff -urNp linux-3.0.7/net/wireless/wext-core.c linux-3.0.7/net/wireless/wext-core.c ---- linux-3.0.7/net/wireless/wext-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/wireless/wext-core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/wireless/wext-core.c linux-3.0.8/net/wireless/wext-core.c +--- linux-3.0.8/net/wireless/wext-core.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/wireless/wext-core.c 2011-08-23 21:47:56.000000000 -0400 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc */ @@ -74854,9 +75409,9 @@ diff -urNp linux-3.0.7/net/wireless/wext-core.c linux-3.0.7/net/wireless/wext-co err = handler(dev, info, (union iwreq_data *) iwp, extra); iwp->length += essid_compat; -diff -urNp linux-3.0.7/net/xfrm/xfrm_policy.c linux-3.0.7/net/xfrm/xfrm_policy.c ---- linux-3.0.7/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/net/xfrm/xfrm_policy.c linux-3.0.8/net/xfrm/xfrm_policy.c +--- linux-3.0.8/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm { policy->walk.dead = 1; @@ -74929,9 +75484,9 @@ diff -urNp linux-3.0.7/net/xfrm/xfrm_policy.c linux-3.0.7/net/xfrm/xfrm_policy.c } } -diff -urNp linux-3.0.7/net/xfrm/xfrm_user.c linux-3.0.7/net/xfrm/xfrm_user.c ---- linux-3.0.7/net/xfrm/xfrm_user.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/net/xfrm/xfrm_user.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/net/xfrm/xfrm_user.c linux-3.0.8/net/xfrm/xfrm_user.c +--- linux-3.0.8/net/xfrm/xfrm_user.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/net/xfrm/xfrm_user.c 2011-08-23 21:48:14.000000000 -0400 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH]; int i; @@ -74950,53 +75505,9 @@ diff -urNp linux-3.0.7/net/xfrm/xfrm_user.c linux-3.0.7/net/xfrm/xfrm_user.c if (attrs[XFRMA_MIGRATE] == NULL) return -EINVAL; -diff -urNp linux-3.0.7/scripts/Makefile.build linux-3.0.7/scripts/Makefile.build ---- linux-3.0.7/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400 -@@ -109,7 +109,7 @@ endif - endif - - # Do not include host rules unless needed --ifneq ($(hostprogs-y)$(hostprogs-m),) -+ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),) - include scripts/Makefile.host - endif - -diff -urNp linux-3.0.7/scripts/Makefile.clean linux-3.0.7/scripts/Makefile.clean ---- linux-3.0.7/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400 -@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd - __clean-files := $(extra-y) $(always) \ - $(targets) $(clean-files) \ - $(host-progs) \ -- $(hostprogs-y) $(hostprogs-m) $(hostprogs-) -+ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ -+ $(hostlibs-y) $(hostlibs-m) $(hostlibs-) - - __clean-files := $(filter-out $(no-clean-files), $(__clean-files)) - -diff -urNp linux-3.0.7/scripts/Makefile.host linux-3.0.7/scripts/Makefile.host ---- linux-3.0.7/scripts/Makefile.host 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/Makefile.host 2011-08-23 21:47:56.000000000 -0400 -@@ -31,6 +31,7 @@ - # Note: Shared libraries consisting of C++ files are not supported - - __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) -+__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m)) - - # C code - # Executables compiled from a single .c file -@@ -54,6 +55,7 @@ host-cxxobjs := $(sort $(foreach m,$(hos - # Shared libaries (only .c supported) - # Shared libraries (.so) - all .so files referenced in "xxx-objs" - host-cshlib := $(sort $(filter %.so, $(host-cobjs))) -+host-cshlib += $(sort $(filter %.so, $(__hostlibs))) - # Remove .so files from "xxx-objs" - host-cobjs := $(filter-out %.so,$(host-cobjs)) - -diff -urNp linux-3.0.7/scripts/basic/fixdep.c linux-3.0.7/scripts/basic/fixdep.c ---- linux-3.0.7/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/basic/fixdep.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/scripts/basic/fixdep.c linux-3.0.8/scripts/basic/fixdep.c +--- linux-3.0.8/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/basic/fixdep.c 2011-10-06 04:17:55.000000000 -0400 @@ -161,7 +161,7 @@ static unsigned int strhash(const char * /* * Lookup a value in the configuration string. @@ -75040,15 +75551,59 @@ diff -urNp linux-3.0.7/scripts/basic/fixdep.c linux-3.0.7/scripts/basic/fixdep.c if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-3.0.7/scripts/gcc-plugin.sh linux-3.0.7/scripts/gcc-plugin.sh ---- linux-3.0.7/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/scripts/gcc-plugin.sh 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.8/scripts/gcc-plugin.sh linux-3.0.8/scripts/gcc-plugin.sh +--- linux-3.0.8/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/scripts/gcc-plugin.sh 2011-09-14 09:08:05.000000000 -0400 @@ -0,0 +1,2 @@ +#!/bin/sh +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y" -diff -urNp linux-3.0.7/scripts/mod/file2alias.c linux-3.0.7/scripts/mod/file2alias.c ---- linux-3.0.7/scripts/mod/file2alias.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/mod/file2alias.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/scripts/Makefile.build linux-3.0.8/scripts/Makefile.build +--- linux-3.0.8/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400 +@@ -109,7 +109,7 @@ endif + endif + + # Do not include host rules unless needed +-ifneq ($(hostprogs-y)$(hostprogs-m),) ++ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),) + include scripts/Makefile.host + endif + +diff -urNp linux-3.0.8/scripts/Makefile.clean linux-3.0.8/scripts/Makefile.clean +--- linux-3.0.8/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400 +@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd + __clean-files := $(extra-y) $(always) \ + $(targets) $(clean-files) \ + $(host-progs) \ +- $(hostprogs-y) $(hostprogs-m) $(hostprogs-) ++ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ ++ $(hostlibs-y) $(hostlibs-m) $(hostlibs-) + + __clean-files := $(filter-out $(no-clean-files), $(__clean-files)) + +diff -urNp linux-3.0.8/scripts/Makefile.host linux-3.0.8/scripts/Makefile.host +--- linux-3.0.8/scripts/Makefile.host 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/Makefile.host 2011-08-23 21:47:56.000000000 -0400 +@@ -31,6 +31,7 @@ + # Note: Shared libraries consisting of C++ files are not supported + + __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) ++__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m)) + + # C code + # Executables compiled from a single .c file +@@ -54,6 +55,7 @@ host-cxxobjs := $(sort $(foreach m,$(hos + # Shared libaries (only .c supported) + # Shared libraries (.so) - all .so files referenced in "xxx-objs" + host-cshlib := $(sort $(filter %.so, $(host-cobjs))) ++host-cshlib += $(sort $(filter %.so, $(__hostlibs))) + # Remove .so files from "xxx-objs" + host-cobjs := $(filter-out %.so,$(host-cobjs)) + +diff -urNp linux-3.0.8/scripts/mod/file2alias.c linux-3.0.8/scripts/mod/file2alias.c +--- linux-3.0.8/scripts/mod/file2alias.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/mod/file2alias.c 2011-10-06 04:17:55.000000000 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -75112,9 +75667,9 @@ diff -urNp linux-3.0.7/scripts/mod/file2alias.c linux-3.0.7/scripts/mod/file2ali sprintf(alias, "dmi*"); -diff -urNp linux-3.0.7/scripts/mod/modpost.c linux-3.0.7/scripts/mod/modpost.c ---- linux-3.0.7/scripts/mod/modpost.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/mod/modpost.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/scripts/mod/modpost.c linux-3.0.8/scripts/mod/modpost.c +--- linux-3.0.8/scripts/mod/modpost.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/mod/modpost.c 2011-08-23 21:47:56.000000000 -0400 @@ -892,6 +892,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, @@ -75191,9 +75746,9 @@ diff -urNp linux-3.0.7/scripts/mod/modpost.c linux-3.0.7/scripts/mod/modpost.c goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-3.0.7/scripts/mod/modpost.h linux-3.0.7/scripts/mod/modpost.h ---- linux-3.0.7/scripts/mod/modpost.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/mod/modpost.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/scripts/mod/modpost.h linux-3.0.8/scripts/mod/modpost.h +--- linux-3.0.8/scripts/mod/modpost.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/mod/modpost.h 2011-08-23 21:47:56.000000000 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -75213,9 +75768,9 @@ diff -urNp linux-3.0.7/scripts/mod/modpost.h linux-3.0.7/scripts/mod/modpost.h struct module { struct module *next; -diff -urNp linux-3.0.7/scripts/mod/sumversion.c linux-3.0.7/scripts/mod/sumversion.c ---- linux-3.0.7/scripts/mod/sumversion.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/mod/sumversion.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/scripts/mod/sumversion.c linux-3.0.8/scripts/mod/sumversion.c +--- linux-3.0.8/scripts/mod/sumversion.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/mod/sumversion.c 2011-08-23 21:47:56.000000000 -0400 @@ -470,7 +470,7 @@ static void write_version(const char *fi goto out; } @@ -75225,9 +75780,9 @@ diff -urNp linux-3.0.7/scripts/mod/sumversion.c linux-3.0.7/scripts/mod/sumversi warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-3.0.7/scripts/pnmtologo.c linux-3.0.7/scripts/pnmtologo.c ---- linux-3.0.7/scripts/pnmtologo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/scripts/pnmtologo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/scripts/pnmtologo.c linux-3.0.8/scripts/pnmtologo.c +--- linux-3.0.8/scripts/pnmtologo.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/scripts/pnmtologo.c 2011-08-23 21:47:56.000000000 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -75254,9 +75809,107 @@ diff -urNp linux-3.0.7/scripts/pnmtologo.c linux-3.0.7/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-3.0.7/security/Kconfig linux-3.0.7/security/Kconfig ---- linux-3.0.7/security/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/Kconfig 2011-10-06 04:19:25.000000000 -0400 +diff -urNp linux-3.0.8/security/apparmor/lsm.c linux-3.0.8/security/apparmor/lsm.c +--- linux-3.0.8/security/apparmor/lsm.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/security/apparmor/lsm.c 2011-08-23 21:48:14.000000000 -0400 +@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc + return error; + } + +-static struct security_operations apparmor_ops = { ++static struct security_operations apparmor_ops __read_only = { + .name = "apparmor", + + .ptrace_access_check = apparmor_ptrace_access_check, +diff -urNp linux-3.0.8/security/commoncap.c linux-3.0.8/security/commoncap.c +--- linux-3.0.8/security/commoncap.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/commoncap.c 2011-08-23 21:48:14.000000000 -0400 +@@ -28,6 +28,7 @@ + #include <linux/prctl.h> + #include <linux/securebits.h> + #include <linux/user_namespace.h> ++#include <net/sock.h> + + /* + * If a non-root user executes a setuid-root binary in +@@ -58,7 +59,7 @@ int cap_netlink_send(struct sock *sk, st + + int cap_netlink_recv(struct sk_buff *skb, int cap) + { +- if (!cap_raised(current_cap(), cap)) ++ if (!cap_raised(current_cap(), cap) || !gr_is_capable(cap)) + return -EPERM; + return 0; + } +@@ -575,6 +576,9 @@ int cap_bprm_secureexec(struct linux_bin + { + const struct cred *cred = current_cred(); + ++ if (gr_acl_enable_at_secure()) ++ return 1; ++ + if (cred->uid != 0) { + if (bprm->cap_effective) + return 1; +diff -urNp linux-3.0.8/security/integrity/ima/ima_api.c linux-3.0.8/security/integrity/ima/ima_api.c +--- linux-3.0.8/security/integrity/ima/ima_api.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/integrity/ima/ima_api.c 2011-08-23 21:47:56.000000000 -0400 +@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino + int result; + + /* can overflow, only indicator */ +- atomic_long_inc(&ima_htable.violations); ++ atomic_long_inc_unchecked(&ima_htable.violations); + + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) { +diff -urNp linux-3.0.8/security/integrity/ima/ima_fs.c linux-3.0.8/security/integrity/ima/ima_fs.c +--- linux-3.0.8/security/integrity/ima/ima_fs.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/integrity/ima/ima_fs.c 2011-08-23 21:47:56.000000000 -0400 +@@ -28,12 +28,12 @@ + static int valid_policy = 1; + #define TMPBUFLEN 12 + static ssize_t ima_show_htable_value(char __user *buf, size_t count, +- loff_t *ppos, atomic_long_t *val) ++ loff_t *ppos, atomic_long_unchecked_t *val) + { + char tmpbuf[TMPBUFLEN]; + ssize_t len; + +- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val)); ++ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val)); + return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); + } + +diff -urNp linux-3.0.8/security/integrity/ima/ima.h linux-3.0.8/security/integrity/ima/ima.h +--- linux-3.0.8/security/integrity/ima/ima.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/integrity/ima/ima.h 2011-08-23 21:47:56.000000000 -0400 +@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino + extern spinlock_t ima_queue_lock; + + struct ima_h_table { +- atomic_long_t len; /* number of stored measurements in the list */ +- atomic_long_t violations; ++ atomic_long_unchecked_t len; /* number of stored measurements in the list */ ++ atomic_long_unchecked_t violations; + struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; + }; + extern struct ima_h_table ima_htable; +diff -urNp linux-3.0.8/security/integrity/ima/ima_queue.c linux-3.0.8/security/integrity/ima/ima_queue.c +--- linux-3.0.8/security/integrity/ima/ima_queue.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/integrity/ima/ima_queue.c 2011-08-23 21:47:56.000000000 -0400 +@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i + INIT_LIST_HEAD(&qe->later); + list_add_tail_rcu(&qe->later, &ima_measurements); + +- atomic_long_inc(&ima_htable.len); ++ atomic_long_inc_unchecked(&ima_htable.len); + key = ima_hash_key(entry->digest); + hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); + return 0; +diff -urNp linux-3.0.8/security/Kconfig linux-3.0.8/security/Kconfig +--- linux-3.0.8/security/Kconfig 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/Kconfig 2011-10-06 04:19:25.000000000 -0400 @@ -4,6 +4,558 @@ menu "Security options" @@ -75825,107 +76478,9 @@ diff -urNp linux-3.0.7/security/Kconfig linux-3.0.7/security/Kconfig default 65536 help This is the portion of low virtual memory which should be protected -diff -urNp linux-3.0.7/security/apparmor/lsm.c linux-3.0.7/security/apparmor/lsm.c ---- linux-3.0.7/security/apparmor/lsm.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/security/apparmor/lsm.c 2011-08-23 21:48:14.000000000 -0400 -@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc - return error; - } - --static struct security_operations apparmor_ops = { -+static struct security_operations apparmor_ops __read_only = { - .name = "apparmor", - - .ptrace_access_check = apparmor_ptrace_access_check, -diff -urNp linux-3.0.7/security/commoncap.c linux-3.0.7/security/commoncap.c ---- linux-3.0.7/security/commoncap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/commoncap.c 2011-08-23 21:48:14.000000000 -0400 -@@ -28,6 +28,7 @@ - #include <linux/prctl.h> - #include <linux/securebits.h> - #include <linux/user_namespace.h> -+#include <net/sock.h> - - /* - * If a non-root user executes a setuid-root binary in -@@ -58,7 +59,7 @@ int cap_netlink_send(struct sock *sk, st - - int cap_netlink_recv(struct sk_buff *skb, int cap) - { -- if (!cap_raised(current_cap(), cap)) -+ if (!cap_raised(current_cap(), cap) || !gr_is_capable(cap)) - return -EPERM; - return 0; - } -@@ -575,6 +576,9 @@ int cap_bprm_secureexec(struct linux_bin - { - const struct cred *cred = current_cred(); - -+ if (gr_acl_enable_at_secure()) -+ return 1; -+ - if (cred->uid != 0) { - if (bprm->cap_effective) - return 1; -diff -urNp linux-3.0.7/security/integrity/ima/ima.h linux-3.0.7/security/integrity/ima/ima.h ---- linux-3.0.7/security/integrity/ima/ima.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/integrity/ima/ima.h 2011-08-23 21:47:56.000000000 -0400 -@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino - extern spinlock_t ima_queue_lock; - - struct ima_h_table { -- atomic_long_t len; /* number of stored measurements in the list */ -- atomic_long_t violations; -+ atomic_long_unchecked_t len; /* number of stored measurements in the list */ -+ atomic_long_unchecked_t violations; - struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; - }; - extern struct ima_h_table ima_htable; -diff -urNp linux-3.0.7/security/integrity/ima/ima_api.c linux-3.0.7/security/integrity/ima/ima_api.c ---- linux-3.0.7/security/integrity/ima/ima_api.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/integrity/ima/ima_api.c 2011-08-23 21:47:56.000000000 -0400 -@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino - int result; - - /* can overflow, only indicator */ -- atomic_long_inc(&ima_htable.violations); -+ atomic_long_inc_unchecked(&ima_htable.violations); - - entry = kmalloc(sizeof(*entry), GFP_KERNEL); - if (!entry) { -diff -urNp linux-3.0.7/security/integrity/ima/ima_fs.c linux-3.0.7/security/integrity/ima/ima_fs.c ---- linux-3.0.7/security/integrity/ima/ima_fs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/integrity/ima/ima_fs.c 2011-08-23 21:47:56.000000000 -0400 -@@ -28,12 +28,12 @@ - static int valid_policy = 1; - #define TMPBUFLEN 12 - static ssize_t ima_show_htable_value(char __user *buf, size_t count, -- loff_t *ppos, atomic_long_t *val) -+ loff_t *ppos, atomic_long_unchecked_t *val) - { - char tmpbuf[TMPBUFLEN]; - ssize_t len; - -- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val)); -+ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val)); - return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); - } - -diff -urNp linux-3.0.7/security/integrity/ima/ima_queue.c linux-3.0.7/security/integrity/ima/ima_queue.c ---- linux-3.0.7/security/integrity/ima/ima_queue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/integrity/ima/ima_queue.c 2011-08-23 21:47:56.000000000 -0400 -@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i - INIT_LIST_HEAD(&qe->later); - list_add_tail_rcu(&qe->later, &ima_measurements); - -- atomic_long_inc(&ima_htable.len); -+ atomic_long_inc_unchecked(&ima_htable.len); - key = ima_hash_key(entry->digest); - hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); - return 0; -diff -urNp linux-3.0.7/security/keys/compat.c linux-3.0.7/security/keys/compat.c ---- linux-3.0.7/security/keys/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/keys/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/security/keys/compat.c linux-3.0.8/security/keys/compat.c +--- linux-3.0.8/security/keys/compat.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/keys/compat.c 2011-10-06 04:17:55.000000000 -0400 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov( if (ret == 0) goto no_payload_free; @@ -75935,9 +76490,9 @@ diff -urNp linux-3.0.7/security/keys/compat.c linux-3.0.7/security/keys/compat.c if (iov != iovstack) kfree(iov); -diff -urNp linux-3.0.7/security/keys/keyctl.c linux-3.0.7/security/keys/keyctl.c ---- linux-3.0.7/security/keys/keyctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/keys/keyctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/security/keys/keyctl.c linux-3.0.8/security/keys/keyctl.c +--- linux-3.0.8/security/keys/keyctl.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/keys/keyctl.c 2011-10-06 04:17:55.000000000 -0400 @@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str /* * Copy the iovec data from userspace @@ -75974,9 +76529,9 @@ diff -urNp linux-3.0.7/security/keys/keyctl.c linux-3.0.7/security/keys/keyctl.c if (iov != iovstack) kfree(iov); -diff -urNp linux-3.0.7/security/keys/keyring.c linux-3.0.7/security/keys/keyring.c ---- linux-3.0.7/security/keys/keyring.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/keys/keyring.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/security/keys/keyring.c linux-3.0.8/security/keys/keyring.c +--- linux-3.0.8/security/keys/keyring.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/keys/keyring.c 2011-08-23 21:47:56.000000000 -0400 @@ -215,15 +215,15 @@ static long keyring_read(const struct ke ret = -EFAULT; @@ -75996,9 +76551,9 @@ diff -urNp linux-3.0.7/security/keys/keyring.c linux-3.0.7/security/keys/keyring goto error; buflen -= tmp; -diff -urNp linux-3.0.7/security/min_addr.c linux-3.0.7/security/min_addr.c ---- linux-3.0.7/security/min_addr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/min_addr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/security/min_addr.c linux-3.0.8/security/min_addr.c +--- linux-3.0.8/security/min_addr.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/min_addr.c 2011-08-23 21:48:14.000000000 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -76015,9 +76570,9 @@ diff -urNp linux-3.0.7/security/min_addr.c linux-3.0.7/security/min_addr.c } /* -diff -urNp linux-3.0.7/security/security.c linux-3.0.7/security/security.c ---- linux-3.0.7/security/security.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/security.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/security/security.c linux-3.0.8/security/security.c +--- linux-3.0.8/security/security.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/security.c 2011-08-23 21:48:14.000000000 -0400 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI /* things that live in capability.c */ extern void __init security_fixup_ops(struct security_operations *ops); @@ -76039,9 +76594,9 @@ diff -urNp linux-3.0.7/security/security.c linux-3.0.7/security/security.c } /* Save user chosen LSM */ -diff -urNp linux-3.0.7/security/selinux/hooks.c linux-3.0.7/security/selinux/hooks.c ---- linux-3.0.7/security/selinux/hooks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/selinux/hooks.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/security/selinux/hooks.c linux-3.0.8/security/selinux/hooks.c +--- linux-3.0.8/security/selinux/hooks.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/selinux/hooks.c 2011-08-23 21:48:14.000000000 -0400 @@ -93,7 +93,6 @@ #define NUM_SEL_MNT_OPTS 5 @@ -76059,9 +76614,9 @@ diff -urNp linux-3.0.7/security/selinux/hooks.c linux-3.0.7/security/selinux/hoo .name = "selinux", .ptrace_access_check = selinux_ptrace_access_check, -diff -urNp linux-3.0.7/security/selinux/include/xfrm.h linux-3.0.7/security/selinux/include/xfrm.h ---- linux-3.0.7/security/selinux/include/xfrm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/selinux/include/xfrm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/security/selinux/include/xfrm.h linux-3.0.8/security/selinux/include/xfrm.h +--- linux-3.0.8/security/selinux/include/xfrm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/selinux/include/xfrm.h 2011-08-23 21:47:56.000000000 -0400 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s static inline void selinux_xfrm_notify_policyload(void) @@ -76071,9 +76626,9 @@ diff -urNp linux-3.0.7/security/selinux/include/xfrm.h linux-3.0.7/security/seli } #else static inline int selinux_xfrm_enabled(void) -diff -urNp linux-3.0.7/security/selinux/ss/services.c linux-3.0.7/security/selinux/ss/services.c ---- linux-3.0.7/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.8/security/selinux/ss/services.c linux-3.0.8/security/selinux/ss/services.c +--- linux-3.0.8/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz int rc = 0; struct policy_file file = { data, len }, *fp = &file; @@ -76083,9 +76638,9 @@ diff -urNp linux-3.0.7/security/selinux/ss/services.c linux-3.0.7/security/selin if (!ss_initialized) { avtab_cache_init(); rc = policydb_read(&policydb, fp); -diff -urNp linux-3.0.7/security/smack/smack_lsm.c linux-3.0.7/security/smack/smack_lsm.c ---- linux-3.0.7/security/smack/smack_lsm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/smack/smack_lsm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/security/smack/smack_lsm.c linux-3.0.8/security/smack/smack_lsm.c +--- linux-3.0.8/security/smack/smack_lsm.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/smack/smack_lsm.c 2011-08-23 21:47:56.000000000 -0400 @@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct return 0; } @@ -76095,9 +76650,9 @@ diff -urNp linux-3.0.7/security/smack/smack_lsm.c linux-3.0.7/security/smack/sma .name = "smack", .ptrace_access_check = smack_ptrace_access_check, -diff -urNp linux-3.0.7/security/tomoyo/tomoyo.c linux-3.0.7/security/tomoyo/tomoyo.c ---- linux-3.0.7/security/tomoyo/tomoyo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/security/tomoyo/tomoyo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/security/tomoyo/tomoyo.c linux-3.0.8/security/tomoyo/tomoyo.c +--- linux-3.0.8/security/tomoyo/tomoyo.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/security/tomoyo/tomoyo.c 2011-08-23 21:47:56.000000000 -0400 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa * tomoyo_security_ops is a "struct security_operations" which is used for * registering TOMOYO. @@ -76107,9 +76662,9 @@ diff -urNp linux-3.0.7/security/tomoyo/tomoyo.c linux-3.0.7/security/tomoyo/tomo .name = "tomoyo", .cred_alloc_blank = tomoyo_cred_alloc_blank, .cred_prepare = tomoyo_cred_prepare, -diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.c linux-3.0.7/sound/aoa/codecs/onyx.c ---- linux-3.0.7/sound/aoa/codecs/onyx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/aoa/codecs/onyx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.c linux-3.0.8/sound/aoa/codecs/onyx.c +--- linux-3.0.8/sound/aoa/codecs/onyx.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/aoa/codecs/onyx.c 2011-08-23 21:47:56.000000000 -0400 @@ -54,7 +54,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -76138,9 +76693,9 @@ diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.c linux-3.0.7/sound/aoa/codecs/onyx onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.h linux-3.0.7/sound/aoa/codecs/onyx.h ---- linux-3.0.7/sound/aoa/codecs/onyx.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/aoa/codecs/onyx.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.h linux-3.0.8/sound/aoa/codecs/onyx.h +--- linux-3.0.8/sound/aoa/codecs/onyx.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/aoa/codecs/onyx.h 2011-08-23 21:47:56.000000000 -0400 @@ -11,6 +11,7 @@ #include <linux/i2c.h> #include <asm/pmac_low_i2c.h> @@ -76149,9 +76704,9 @@ diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.h linux-3.0.7/sound/aoa/codecs/onyx /* PCM3052 register definitions */ -diff -urNp linux-3.0.7/sound/core/oss/pcm_oss.c linux-3.0.7/sound/core/oss/pcm_oss.c ---- linux-3.0.7/sound/core/oss/pcm_oss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/core/oss/pcm_oss.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/sound/core/oss/pcm_oss.c linux-3.0.8/sound/core/oss/pcm_oss.c +--- linux-3.0.8/sound/core/oss/pcm_oss.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/core/oss/pcm_oss.c 2011-10-06 04:17:55.000000000 -0400 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str if (in_kernel) { mm_segment_t fs; @@ -76223,9 +76778,9 @@ diff -urNp linux-3.0.7/sound/core/oss/pcm_oss.c linux-3.0.7/sound/core/oss/pcm_o snd_leave_user(fs); } } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) { -diff -urNp linux-3.0.7/sound/core/pcm_compat.c linux-3.0.7/sound/core/pcm_compat.c ---- linux-3.0.7/sound/core/pcm_compat.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/sound/core/pcm_compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/sound/core/pcm_compat.c linux-3.0.8/sound/core/pcm_compat.c +--- linux-3.0.8/sound/core/pcm_compat.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/sound/core/pcm_compat.c 2011-10-06 04:17:55.000000000 -0400 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st int err; @@ -76235,9 +76790,9 @@ diff -urNp linux-3.0.7/sound/core/pcm_compat.c linux-3.0.7/sound/core/pcm_compat snd_leave_user(fs); if (err < 0) return err; -diff -urNp linux-3.0.7/sound/core/pcm_native.c linux-3.0.7/sound/core/pcm_native.c ---- linux-3.0.7/sound/core/pcm_native.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/core/pcm_native.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/sound/core/pcm_native.c linux-3.0.8/sound/core/pcm_native.c +--- linux-3.0.8/sound/core/pcm_native.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/core/pcm_native.c 2011-10-06 04:17:55.000000000 -0400 @@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_ switch (substream->stream) { case SNDRV_PCM_STREAM_PLAYBACK: @@ -76252,9 +76807,9 @@ diff -urNp linux-3.0.7/sound/core/pcm_native.c linux-3.0.7/sound/core/pcm_native break; default: result = -EINVAL; -diff -urNp linux-3.0.7/sound/core/seq/seq_device.c linux-3.0.7/sound/core/seq/seq_device.c ---- linux-3.0.7/sound/core/seq/seq_device.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/core/seq/seq_device.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/core/seq/seq_device.c linux-3.0.8/sound/core/seq/seq_device.c +--- linux-3.0.8/sound/core/seq/seq_device.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/core/seq/seq_device.c 2011-08-23 21:47:56.000000000 -0400 @@ -63,7 +63,7 @@ struct ops_list { int argsize; /* argument size */ @@ -76291,9 +76846,9 @@ diff -urNp linux-3.0.7/sound/core/seq/seq_device.c linux-3.0.7/sound/core/seq/se dev->status = SNDRV_SEQ_DEVICE_FREE; dev->driver_data = NULL; ops->num_init_devices--; -diff -urNp linux-3.0.7/sound/drivers/mts64.c linux-3.0.7/sound/drivers/mts64.c ---- linux-3.0.7/sound/drivers/mts64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/drivers/mts64.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/drivers/mts64.c linux-3.0.8/sound/drivers/mts64.c +--- linux-3.0.8/sound/drivers/mts64.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/drivers/mts64.c 2011-08-23 21:47:56.000000000 -0400 @@ -28,6 +28,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -76350,9 +76905,9 @@ diff -urNp linux-3.0.7/sound/drivers/mts64.c linux-3.0.7/sound/drivers/mts64.c return 0; } -diff -urNp linux-3.0.7/sound/drivers/opl4/opl4_lib.c linux-3.0.7/sound/drivers/opl4/opl4_lib.c ---- linux-3.0.7/sound/drivers/opl4/opl4_lib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/drivers/opl4/opl4_lib.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/drivers/opl4/opl4_lib.c linux-3.0.8/sound/drivers/opl4/opl4_lib.c +--- linux-3.0.8/sound/drivers/opl4/opl4_lib.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/drivers/opl4/opl4_lib.c 2011-08-23 21:47:56.000000000 -0400 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ MODULE_DESCRIPTION("OPL4 driver"); MODULE_LICENSE("GPL"); @@ -76362,9 +76917,9 @@ diff -urNp linux-3.0.7/sound/drivers/opl4/opl4_lib.c linux-3.0.7/sound/drivers/o { int timeout = 10; while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0) -diff -urNp linux-3.0.7/sound/drivers/portman2x4.c linux-3.0.7/sound/drivers/portman2x4.c ---- linux-3.0.7/sound/drivers/portman2x4.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/drivers/portman2x4.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/drivers/portman2x4.c linux-3.0.8/sound/drivers/portman2x4.c +--- linux-3.0.8/sound/drivers/portman2x4.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/drivers/portman2x4.c 2011-08-23 21:47:56.000000000 -0400 @@ -47,6 +47,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -76382,9 +76937,9 @@ diff -urNp linux-3.0.7/sound/drivers/portman2x4.c linux-3.0.7/sound/drivers/port int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-3.0.7/sound/firewire/amdtp.c linux-3.0.7/sound/firewire/amdtp.c ---- linux-3.0.7/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/firewire/amdtp.c linux-3.0.8/sound/firewire/amdtp.c +--- linux-3.0.8/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt ptr = s->pcm_buffer_pointer + data_blocks; if (ptr >= pcm->runtime->buffer_size) @@ -76403,9 +76958,9 @@ diff -urNp linux-3.0.7/sound/firewire/amdtp.c linux-3.0.7/sound/firewire/amdtp.c (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24; } EXPORT_SYMBOL(amdtp_out_stream_update); -diff -urNp linux-3.0.7/sound/firewire/amdtp.h linux-3.0.7/sound/firewire/amdtp.h ---- linux-3.0.7/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/firewire/amdtp.h linux-3.0.8/sound/firewire/amdtp.h +--- linux-3.0.8/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_ static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s, struct snd_pcm_substream *pcm) @@ -76415,9 +76970,9 @@ diff -urNp linux-3.0.7/sound/firewire/amdtp.h linux-3.0.7/sound/firewire/amdtp.h } /** -diff -urNp linux-3.0.7/sound/firewire/isight.c linux-3.0.7/sound/firewire/isight.c ---- linux-3.0.7/sound/firewire/isight.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/firewire/isight.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/firewire/isight.c linux-3.0.8/sound/firewire/isight.c +--- linux-3.0.8/sound/firewire/isight.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/firewire/isight.c 2011-08-23 21:47:56.000000000 -0400 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc ptr += count; if (ptr >= runtime->buffer_size) @@ -76458,9 +77013,9 @@ diff -urNp linux-3.0.7/sound/firewire/isight.c linux-3.0.7/sound/firewire/isight break; default: return -EINVAL; -diff -urNp linux-3.0.7/sound/isa/cmi8330.c linux-3.0.7/sound/isa/cmi8330.c ---- linux-3.0.7/sound/isa/cmi8330.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/isa/cmi8330.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/isa/cmi8330.c linux-3.0.8/sound/isa/cmi8330.c +--- linux-3.0.8/sound/isa/cmi8330.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/isa/cmi8330.c 2011-08-23 21:47:56.000000000 -0400 @@ -172,7 +172,7 @@ struct snd_cmi8330 { struct snd_pcm *pcm; @@ -76470,9 +77025,9 @@ diff -urNp linux-3.0.7/sound/isa/cmi8330.c linux-3.0.7/sound/isa/cmi8330.c snd_pcm_open_callback_t open; void *private_data; /* sb or wss */ } streams[2]; -diff -urNp linux-3.0.7/sound/oss/sb_audio.c linux-3.0.7/sound/oss/sb_audio.c ---- linux-3.0.7/sound/oss/sb_audio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/oss/sb_audio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/oss/sb_audio.c linux-3.0.8/sound/oss/sb_audio.c +--- linux-3.0.8/sound/oss/sb_audio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/oss/sb_audio.c 2011-08-23 21:47:56.000000000 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -76482,9 +77037,9 @@ diff -urNp linux-3.0.7/sound/oss/sb_audio.c linux-3.0.7/sound/oss/sb_audio.c if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-3.0.7/sound/oss/swarm_cs4297a.c linux-3.0.7/sound/oss/swarm_cs4297a.c ---- linux-3.0.7/sound/oss/swarm_cs4297a.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/oss/swarm_cs4297a.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/oss/swarm_cs4297a.c linux-3.0.8/sound/oss/swarm_cs4297a.c +--- linux-3.0.8/sound/oss/swarm_cs4297a.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/oss/swarm_cs4297a.c 2011-08-23 21:47:56.000000000 -0400 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -76519,9 +77074,9 @@ diff -urNp linux-3.0.7/sound/oss/swarm_cs4297a.c linux-3.0.7/sound/oss/swarm_cs4 list_add(&s->list, &cs4297a_devs); -diff -urNp linux-3.0.7/sound/pci/hda/hda_codec.h linux-3.0.7/sound/pci/hda/hda_codec.h ---- linux-3.0.7/sound/pci/hda/hda_codec.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/pci/hda/hda_codec.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/pci/hda/hda_codec.h linux-3.0.8/sound/pci/hda/hda_codec.h +--- linux-3.0.8/sound/pci/hda/hda_codec.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/pci/hda/hda_codec.h 2011-08-23 21:47:56.000000000 -0400 @@ -615,7 +615,7 @@ struct hda_bus_ops { /* notify power-up/down from codec to controller */ void (*pm_notify)(struct hda_bus *bus); @@ -76557,9 +77112,9 @@ diff -urNp linux-3.0.7/sound/pci/hda/hda_codec.h linux-3.0.7/sound/pci/hda/hda_c /* PCM to create, set by patch_ops.build_pcms callback */ unsigned int num_pcms; -diff -urNp linux-3.0.7/sound/pci/ice1712/ice1712.h linux-3.0.7/sound/pci/ice1712/ice1712.h ---- linux-3.0.7/sound/pci/ice1712/ice1712.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/pci/ice1712/ice1712.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/pci/ice1712/ice1712.h linux-3.0.8/sound/pci/ice1712/ice1712.h +--- linux-3.0.8/sound/pci/ice1712/ice1712.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/pci/ice1712/ice1712.h 2011-08-23 21:47:56.000000000 -0400 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private { unsigned int mask_flags; /* total mask bits */ struct snd_akm4xxx_ops { @@ -76578,9 +77133,9 @@ diff -urNp linux-3.0.7/sound/pci/ice1712/ice1712.h linux-3.0.7/sound/pci/ice1712 }; -diff -urNp linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c ---- linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c +--- linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0) break; @@ -76621,9 +77176,9 @@ diff -urNp linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c linux-3.0.7/sound/pci/ymfp chip->card = card; chip->pci = pci; chip->irq = -1; -diff -urNp linux-3.0.7/sound/soc/soc-core.c linux-3.0.7/sound/soc/soc-core.c ---- linux-3.0.7/sound/soc/soc-core.c 2011-09-02 18:11:21.000000000 -0400 -+++ linux-3.0.7/sound/soc/soc-core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/soc/soc-core.c linux-3.0.8/sound/soc/soc-core.c +--- linux-3.0.8/sound/soc/soc-core.c 2011-10-24 08:05:21.000000000 -0400 ++++ linux-3.0.8/sound/soc/soc-core.c 2011-08-23 21:47:56.000000000 -0400 @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer } @@ -76641,9 +77196,9 @@ diff -urNp linux-3.0.7/sound/soc/soc-core.c linux-3.0.7/sound/soc/soc-core.c soc_pcm_ops.mmap = platform->driver->ops->mmap; soc_pcm_ops.pointer = platform->driver->ops->pointer; soc_pcm_ops.ioctl = platform->driver->ops->ioctl; -diff -urNp linux-3.0.7/sound/usb/card.h linux-3.0.7/sound/usb/card.h ---- linux-3.0.7/sound/usb/card.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/sound/usb/card.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/sound/usb/card.h linux-3.0.8/sound/usb/card.h +--- linux-3.0.8/sound/usb/card.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/sound/usb/card.h 2011-08-23 21:47:56.000000000 -0400 @@ -44,6 +44,7 @@ struct snd_urb_ops { int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); @@ -76661,34 +77216,9 @@ diff -urNp linux-3.0.7/sound/usb/card.h linux-3.0.7/sound/usb/card.h }; struct snd_usb_stream { -diff -urNp linux-3.0.7/tools/gcc/Makefile linux-3.0.7/tools/gcc/Makefile ---- linux-3.0.7/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/Makefile 2011-10-06 04:17:55.000000000 -0400 -@@ -0,0 +1,21 @@ -+#CC := gcc -+#PLUGIN_SOURCE_FILES := pax_plugin.c -+#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) -+GCCPLUGINS_DIR := $(shell $(HOSTCC) -print-file-name=plugin) -+#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -+ -+HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -+ -+hostlibs-y := constify_plugin.so -+hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so -+hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so -+hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so -+hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so -+ -+always := $(hostlibs-y) -+ -+stackleak_plugin-objs := stackleak_plugin.o -+constify_plugin-objs := constify_plugin.o -+kallocstat_plugin-objs := kallocstat_plugin.o -+kernexec_plugin-objs := kernexec_plugin.o -+checker_plugin-objs := checker_plugin.o -diff -urNp linux-3.0.7/tools/gcc/checker_plugin.c linux-3.0.7/tools/gcc/checker_plugin.c ---- linux-3.0.7/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/checker_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/tools/gcc/checker_plugin.c linux-3.0.8/tools/gcc/checker_plugin.c +--- linux-3.0.8/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/checker_plugin.c 2011-10-06 04:17:55.000000000 -0400 @@ -0,0 +1,169 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -76859,9 +77389,9 @@ diff -urNp linux-3.0.7/tools/gcc/checker_plugin.c linux-3.0.7/tools/gcc/checker_ + + return 0; +} -diff -urNp linux-3.0.7/tools/gcc/constify_plugin.c linux-3.0.7/tools/gcc/constify_plugin.c ---- linux-3.0.7/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/constify_plugin.c 2011-08-30 18:23:52.000000000 -0400 +diff -urNp linux-3.0.8/tools/gcc/constify_plugin.c linux-3.0.8/tools/gcc/constify_plugin.c +--- linux-3.0.8/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/constify_plugin.c 2011-08-30 18:23:52.000000000 -0400 @@ -0,0 +1,293 @@ +/* + * Copyright 2011 by Emese Revfy <re.emese@gmail.com> @@ -77156,9 +77686,9 @@ diff -urNp linux-3.0.7/tools/gcc/constify_plugin.c linux-3.0.7/tools/gcc/constif + + return 0; +} -diff -urNp linux-3.0.7/tools/gcc/kallocstat_plugin.c linux-3.0.7/tools/gcc/kallocstat_plugin.c ---- linux-3.0.7/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/kallocstat_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/tools/gcc/kallocstat_plugin.c linux-3.0.8/tools/gcc/kallocstat_plugin.c +--- linux-3.0.8/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/kallocstat_plugin.c 2011-10-06 04:17:55.000000000 -0400 @@ -0,0 +1,165 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -77325,9 +77855,9 @@ diff -urNp linux-3.0.7/tools/gcc/kallocstat_plugin.c linux-3.0.7/tools/gcc/kallo + + return 0; +} -diff -urNp linux-3.0.7/tools/gcc/kernexec_plugin.c linux-3.0.7/tools/gcc/kernexec_plugin.c ---- linux-3.0.7/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/kernexec_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.8/tools/gcc/kernexec_plugin.c linux-3.0.8/tools/gcc/kernexec_plugin.c +--- linux-3.0.8/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/kernexec_plugin.c 2011-10-06 04:17:55.000000000 -0400 @@ -0,0 +1,273 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -77602,9 +78132,34 @@ diff -urNp linux-3.0.7/tools/gcc/kernexec_plugin.c linux-3.0.7/tools/gcc/kernexe + + return 0; +} -diff -urNp linux-3.0.7/tools/gcc/stackleak_plugin.c linux-3.0.7/tools/gcc/stackleak_plugin.c ---- linux-3.0.7/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.7/tools/gcc/stackleak_plugin.c 2011-09-17 00:53:44.000000000 -0400 +diff -urNp linux-3.0.8/tools/gcc/Makefile linux-3.0.8/tools/gcc/Makefile +--- linux-3.0.8/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/Makefile 2011-10-06 04:17:55.000000000 -0400 +@@ -0,0 +1,21 @@ ++#CC := gcc ++#PLUGIN_SOURCE_FILES := pax_plugin.c ++#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES)) ++GCCPLUGINS_DIR := $(shell $(HOSTCC) -print-file-name=plugin) ++#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W ++ ++HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include ++ ++hostlibs-y := constify_plugin.so ++hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so ++hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so ++hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so ++hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so ++ ++always := $(hostlibs-y) ++ ++stackleak_plugin-objs := stackleak_plugin.o ++constify_plugin-objs := constify_plugin.o ++kallocstat_plugin-objs := kallocstat_plugin.o ++kernexec_plugin-objs := kernexec_plugin.o ++checker_plugin-objs := checker_plugin.o +diff -urNp linux-3.0.8/tools/gcc/stackleak_plugin.c linux-3.0.8/tools/gcc/stackleak_plugin.c +--- linux-3.0.8/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.8/tools/gcc/stackleak_plugin.c 2011-09-17 00:53:44.000000000 -0400 @@ -0,0 +1,251 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -77857,9 +78412,20 @@ diff -urNp linux-3.0.7/tools/gcc/stackleak_plugin.c linux-3.0.7/tools/gcc/stackl + + return 0; +} -diff -urNp linux-3.0.7/usr/gen_init_cpio.c linux-3.0.7/usr/gen_init_cpio.c ---- linux-3.0.7/usr/gen_init_cpio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/usr/gen_init_cpio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h +--- linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h 2011-10-20 04:46:01.000000000 -0400 +@@ -5,4 +5,7 @@ + + #define altinstruction_entry # + ++ .macro pax_force_retaddr rip=0 ++ .endm ++ + #endif +diff -urNp linux-3.0.8/usr/gen_init_cpio.c linux-3.0.8/usr/gen_init_cpio.c +--- linux-3.0.8/usr/gen_init_cpio.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/usr/gen_init_cpio.c 2011-08-23 21:47:56.000000000 -0400 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -77882,9 +78448,9 @@ diff -urNp linux-3.0.7/usr/gen_init_cpio.c linux-3.0.7/usr/gen_init_cpio.c } else break; } -diff -urNp linux-3.0.7/virt/kvm/kvm_main.c linux-3.0.7/virt/kvm/kvm_main.c ---- linux-3.0.7/virt/kvm/kvm_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.7/virt/kvm/kvm_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.8/virt/kvm/kvm_main.c linux-3.0.8/virt/kvm/kvm_main.c +--- linux-3.0.8/virt/kvm/kvm_main.c 2011-07-21 22:17:23.000000000 -0400 ++++ linux-3.0.8/virt/kvm/kvm_main.c 2011-08-23 21:47:56.000000000 -0400 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list); static cpumask_var_t cpus_hardware_enabled; diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index fddc2a7e17b..fe29b050258 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -4421,7 +4421,7 @@ CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 5d4051246b5..da9d1acecc9 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -4377,7 +4377,7 @@ CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/main/linux-scst/APKBUILD b/main/linux-scst/APKBUILD index 70720776e5f..8c1f8471c91 100644 --- a/main/linux-scst/APKBUILD +++ b/main/linux-scst/APKBUILD @@ -12,7 +12,7 @@ else _kernver=${pkgver%.*} fi -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with SCST" url="http://scst.sourceforge.net" depends="mkinitfs linux-firmware" @@ -133,5 +133,5 @@ dev() { md5sums="1aab7a741abe08d42e8eccf20de61e05 linux-2.6.39.tar.bz2 ff5eb7323c054a128d2922bde3297ed5 patch-2.6.39.4.bz2 -4fea1df4f5f8358c521d88b94af6c704 kernelconfig.x86_64 +82712844db0333b4dccb38638a73f640 kernelconfig.x86_64 456cd9f0a71d9b2ca15d207f2d2a59a1 scst-2.1.0-2.6.39.patch" diff --git a/main/linux-scst/kernelconfig.x86_64 b/main/linux-scst/kernelconfig.x86_64 index 5482bee6ef8..699eee34273 100644 --- a/main/linux-scst/kernelconfig.x86_64 +++ b/main/linux-scst/kernelconfig.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.39.4 Kernel Configuration -# Tue Oct 4 16:04:36 2011 +# Fri Oct 28 15:00:53 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1380,7 +1380,8 @@ CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m -# CONFIG_BLK_DEV_DRBD is not set +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m @@ -5099,4 +5100,5 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index ac83c869b5c..d8739b16295 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -11,7 +11,7 @@ else _kernver=${pkgver%.*} fi -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -134,5 +134,5 @@ dev() { md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 451412dc3b25c60fed80ddd5c49cb855 patch-3.0.7.bz2 ca74964b1209abf7d46f0f0d9745e364 patch-3.0.7-vs2.3.1.diff -01e44a2dd6a9aff23247660f1f68644a kernelconfig.x86 -60c2ecbc06e0e25d099bd3507d4c5fb1 kernelconfig.x86_64" +e9bebab5a2c44afbbbcd724126bd42a3 kernelconfig.x86 +d667fe6cc4f4e855a3141e4cd4e06a2a kernelconfig.x86_64" diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 5d561a4979f..7234d4200a9 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -4426,7 +4426,7 @@ CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64 index 79af47ce7e1..8fd5ea150f7 100644 --- a/main/linux-vserver/kernelconfig.x86_64 +++ b/main/linux-vserver/kernelconfig.x86_64 @@ -4380,7 +4380,7 @@ CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/main/live-media/APKBUILD b/main/live-media/APKBUILD index a9871f42860..e1038f9bbf6 100644 --- a/main/live-media/APKBUILD +++ b/main/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=live-media -pkgver=2011.01.24 +pkgver=2011.10.27 pkgrel=0 pkgdesc="A set of C++ libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -44,4 +44,4 @@ package() { done } -md5sums="0626e80c774fb27c651c3daf6cc3fb91 live.2011.01.24.tar.gz" +md5sums="fe776efc25fbb98c6279b97cb9c48006 live.2011.10.27.tar.gz" diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index a4ce52f51f0..b52c56e5d3b 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=llvm pkgver=2.9 -pkgrel=2 +pkgrel=3 pkgdesc="low level virtual machine compiler system" arch="x86 x86_64" url="http://llvm.org/" license="UOI-NCSA" depends= -makedepends="groff perl libffi-dev" +depends_dev="perl" +makedepends="$depends_dev groff libffi-dev" install= subpackages="clang $pkgname-dev $pkgname-doc $pkgname-libs" source="http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz diff --git a/main/lua-lgob/APKBUILD b/main/lua-lgob/APKBUILD index 629e0f2d022..50353f08d19 100644 --- a/main/lua-lgob/APKBUILD +++ b/main/lua-lgob/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-lgob pkgver=11.04 -pkgrel=1 +pkgrel=2 pkgdesc="Set of Lua bindings that uses gobject-instrospection" url="http://oproj.tuxfamily.org" arch="all" diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD index 1b371db1398..61aa452d872 100644 --- a/main/mesa-demos/APKBUILD +++ b/main/mesa-demos/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=mesa-demos pkgver=8.0.1 -pkgrel=0 +pkgrel=2 pkgdesc="Mesa demos and utils" url="http://mesa3d.sourceforge.net" arch="all" @@ -13,7 +13,8 @@ makedepends="$depends_dev mesa-dev glew-dev automake autoconf libtool" install="" subpackages= source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2 - sincos.patch" + sincos.patch + mesa-demos-gles.patch" _builddir="$srcdir/$pkgname-$pkgver" @@ -39,4 +40,5 @@ package() { } md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4 mesa-demos-8.0.1.tar.bz2 -75be22556a657f0a157028233832d167 sincos.patch" +75be22556a657f0a157028233832d167 sincos.patch +dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch" diff --git a/main/mesa-demos/mesa-demos-gles.patch b/main/mesa-demos/mesa-demos-gles.patch new file mode 100644 index 00000000000..20d44306625 --- /dev/null +++ b/main/mesa-demos/mesa-demos-gles.patch @@ -0,0 +1,15 @@ +diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c +index 93816b5..647d634 100644 +--- a/src/egl/opengles2/es2_info.c ++++ b/src/egl/opengles2/es2_info.c +@@ -18,8 +18,8 @@ + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include <X11/keysym.h> +-#include <GLES/gl.h> +-#include <GLES/glext.h> ++#include <GLES2/gl2.h> ++#include <GLES2/gl2ext.h> + #include <EGL/egl.h> + + diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 40cbe65f7ee..8bb47f286a6 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=7.10.3 +pkgver=7.11 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -18,21 +18,21 @@ subpackages="$pkgname-dev $pkgname-dri-tdfx:tdfx $pkgname-dri-unichrome:unichrome $pkgname-dri-nouveau:nouveau - $pkgname-egl + $pkgname-dri-vmwgfx:vmwgfx + $pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles " -makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev - dri2proto xextproto libx11-dev glproto python libxt-dev makedepend - talloc-dev py-libxml2 flex bison" +depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev + libxdamage-dev libxfixes-dev libxcb-dev glproto" +makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend + talloc-dev py-libxml2 flex bison llvm-dev" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 mesa-7.10-uclibc.patch mesa-7.10-uclibc-glsl.patch mesa-7.10-uclibc-gallium.patch - Mesa-7.10.1-nouveau-compile.patch " +# Mesa-7.10.1-nouveau-compile.patch -depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev - libxdamage-dev libxfixes-dev libxcb-dev glproto" _dri_driverdir=/usr/lib/xorg/modules/dri @@ -58,7 +58,7 @@ prepare() { dev() { default_dev; - depends="$depends_dev mesa mesa-egl" + depends="$depends_dev mesa mesa-egl mesa-gl mesa-glu mesa-gles" } build() { @@ -69,12 +69,10 @@ build() { --disable-asm \ --disable-glx-tls \ --with-driver=dri \ - --with-state-trackers=dri,glx,egl \ --enable-xcb \ --enable-egl \ --enable-gles2 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ + --with-gallium-drivers=i915,i965,nouveau,r300,r600,svga,swrast \ --disable-gallium-egl \ --disable-glut \ --disable-glw || return 1 @@ -93,11 +91,32 @@ package() { egl() { replaces="mesa" - pkgdesc="Mesa OpenGLES support library and modules" - + pkgdesc="Mesa libEGL runtime libraries" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/ - mv "$pkgdir"/usr/lib/egl "$subpkgdir"/usr/lib/egl +} + +gl() { + replaces="mesa" + pkgdesc="Mesa libGL runtime libraries" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/ +} + +glu() { + replaces="mesa" + pkgdesc="Mesa libGLU runtime libraries" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libGLU.so* "$subpkgdir"/usr/lib/ +} + +gles() { + replaces="mesa" + pkgdesc="Mesa libGLESv2 runtime libraries" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libGLESv2.so* \ + "$pkgdir"/usr/lib/libglapi.so.* \ + "$subpkgdir"/usr/lib/ } _mv_dri() { @@ -120,11 +139,11 @@ savage() { _mv_dri savage_dri; } sis() { _mv_dri sis_dri; } tdfx() { _mv_dri tdfx_dri; } unichrome() { _mv_dri unichrome_dri; } -nouveau() { _mv_dri nouveau_dri; } -swrast() { _mv_dri swrast_dri; } +nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri; } +swrast() { _mv_dri swrast_dri swrastg_dri; } +vmwgfx() { _mv_dri vmwgfx_dri; } -md5sums="8c38fe8266be8e1ed1d84076ba5a703b MesaLib-7.10.3.tar.bz2 +md5sums="ff03aca82d0560009a076a87c888cf13 MesaLib-7.11.tar.bz2 9c8c161f954f0d08895cd9d45e63f498 mesa-7.10-uclibc.patch 03e9685b0d714e915c35fd0fb5fde810 mesa-7.10-uclibc-glsl.patch -90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch -34e3d4bb5f16bae55929958083087c0a Mesa-7.10.1-nouveau-compile.patch" +90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch" diff --git a/main/mesa/Mesa-7.10.1-nouveau-compile.patch b/main/mesa/Mesa-7.10.1-nouveau-compile.patch deleted file mode 100644 index 96dafceb07b..00000000000 --- a/main/mesa/Mesa-7.10.1-nouveau-compile.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c.ark 2011-04-11 10:26:00.717291484 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c 2011-04-11 10:26:05.600624698 +0200 -@@ -24,6 +24,8 @@ - #include "pipe/p_defines.h" - #include "pipe/p_state.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - - void ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c.ark 2011-04-11 10:25:55.913958268 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c 2011-04-11 10:26:00.663958154 +0200 -@@ -23,6 +23,8 @@ - #include "draw/draw_context.h" - #include "pipe/p_defines.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - #include "nv50_screen.h" - #include "nv50_resource.h" ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c.ark 2011-04-11 10:25:50.250625073 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c 2011-04-11 10:25:55.873958269 +0200 -@@ -4,6 +4,8 @@ - #include "util/u_format.h" - #include "util/u_split_prim.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - #include "nv50_resource.h" - ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c.ark 2011-04-11 10:25:44.790625206 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c 2011-04-11 10:25:50.183958407 +0200 -@@ -23,6 +23,8 @@ - #include "pipe/p_context.h" - #include "util/u_inlines.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - - struct nv50_query { ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c.ark 2011-04-11 10:25:32.790625497 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c 2011-04-11 10:25:38.633958688 +0200 -@@ -23,6 +23,8 @@ - #include "util/u_format_s3tc.h" - #include "pipe/p_screen.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - #include "nv50_screen.h" - #include "nv50_resource.h" ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c.ark 2011-04-11 10:25:38.710625354 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c 2011-04-11 10:25:44.713958540 +0200 -@@ -26,6 +26,8 @@ - #include "pipe/p_state.h" - #include "util/u_inlines.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - - static void ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c.ark 2011-04-11 10:25:27.520625626 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c 2011-04-11 10:25:32.737292166 +0200 -@@ -22,6 +22,7 @@ - - #include "util/u_format.h" - -+#include <nouveau/nv04_pushbuf.h> - #include "nv50_context.h" - #include "nv50_resource.h" - #include "nouveau/nouveau_stateobj.h" ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c.ark 2011-04-11 10:25:22.407292417 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c 2011-04-11 10:25:27.450625628 +0200 -@@ -22,6 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nouveau/nouveau_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c.ark 2011-04-11 10:25:14.903959267 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c 2011-04-11 10:25:22.353959086 +0200 -@@ -4,6 +4,8 @@ - #include "util/u_format.h" - #include "util/u_math.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - #include "nv50_transfer.h" - #include "nv50_resource.h" ---- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c.ark 2011-04-11 10:25:01.717292921 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c 2011-04-11 10:25:14.850625935 +0200 -@@ -26,6 +26,8 @@ - #include "util/u_format.h" - #include "util/u_split_prim.h" - -+#include <nouveau/nv04_pushbuf.h> -+ - #include "nv50_context.h" - #include "nv50_resource.h" - ---- Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c.ark 2011-04-11 10:23:22.800628664 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c 2011-04-11 10:25:01.640626257 +0200 -@@ -39,6 +39,7 @@ - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" ---- Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c.ark 2011-04-11 10:27:59.380621927 +0200 -+++ Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c 2011-04-11 10:28:02.833955176 +0200 -@@ -3,6 +3,7 @@ - #include "util/u_format_s3tc.h" - #include "util/u_simple_screen.h" - -+#include <nouveau/nv04_pushbuf.h> - #include "nouveau/nouveau_screen.h" - #include "nouveau/nv_object.xml.h" - #include "nvfx_context.h" ---- Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c.ark 2011-04-11 10:27:27.220622711 +0200 -+++ Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c 2011-04-11 11:09:24.147228063 +0200 -@@ -24,6 +24,8 @@ - * - */ - -+#include <stdint.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nouveau_driver.h" - #include "nouveau_context.h" - #include "nouveau_fbo.h" diff --git a/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch b/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch new file mode 100644 index 00000000000..01cb2c2e3b8 --- /dev/null +++ b/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch @@ -0,0 +1,60 @@ +From 60821c8ba0118d231cd3b4fd008cd42868337439 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 27 Oct 2011 09:54:59 +0000 +Subject: [PATCH 1/2] init: try detect alpine_dev filesystem if not specified + +Note that ext4 will be detected as ext3 +--- + initramfs-init.in | 22 +++++++++++++++++++++- + 1 files changed, 21 insertions(+), 1 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 0e30137..7c477c7 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -255,6 +255,20 @@ relocate_alpine_mnt() { + fi + } + ++# detect filesystem type on given device/UUID ++find_fs_type() { ++ local dev=$(findfs $1) ++ local i= ++ for i in $(blkid $dev); do ++ case $i in ++ TYPE=*) eval "$i" ++ echo $TYPE ++ return ++ ;; ++ esac ++ done ++} ++ + # gotta start from somewhere :) + echo "Alpine Init $VERSION" + +@@ -314,7 +328,7 @@ case "$ALPINE_DEV" in + UUID=*|LABEL=*) ;; + *) ALPINE_DEV=/dev/$ALPINE_DEV ;; + esac +- ++ + # look for standard mountpoint locations + ALPINE_MNT=$(find_mnt $ALPINE_DEV /etc/fstab) + [ -z "$ALPINE_MNT" ] && ALPINE_MNT=/media/${ALPINE_DEV##*/} +@@ -398,6 +412,12 @@ start_lvm + # locate boot media and mount it + ebegin "Mounting boot media" + mkdir -p $ALPINE_MNT ++ ++# try detect the filesystem ++if [ -z "$ALPINE_DEV_FS" ]; then ++ ALPINE_DEV_FS=$(find_fs_type $ALPINE_DEV) ++fi ++ + if [ -n "$ALPINE_DEV_FS" ]; then + mount_opts="-t $ALPINE_DEV_FS" + fi +-- +1.7.7.1 + diff --git a/main/mkinitfs/0002-init-new-boot-option-debug_init.patch b/main/mkinitfs/0002-init-new-boot-option-debug_init.patch new file mode 100644 index 00000000000..361c1da239e --- /dev/null +++ b/main/mkinitfs/0002-init-new-boot-option-debug_init.patch @@ -0,0 +1,27 @@ +From 8ff0a825348f5a0c628540d3a859a73624c7f066 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 27 Oct 2011 12:05:27 +0000 +Subject: [PATCH 2/2] init: new boot option: debug_init + +will enable lots of verbose debugging +--- + initramfs-init.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 7c477c7..69e8d27 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -289,6 +289,9 @@ while [ $# -gt 0 ]; do + shift + done + ++# enable debugging if requested ++[ -n "$KOPT_debug_init" ] && set -x ++ + # pick first keymap if found + for map in /etc/keymap/*; do + if [ -f "$map" ]; then +-- +1.7.7.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 2067ae14282..2a6991dfa2e 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,12 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.4.0 -pkgrel=0 +pkgver=2.4.1 +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.git/snapshot/$pkgname-$pkgver.tar.bz2 +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch + 0002-init-new-boot-option-debug_init.patch eglibc.patch " arch="noarch" @@ -42,5 +44,7 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="3b7ca4f70bdded5fca0c0c70ddac56f6 mkinitfs-2.4.0.tar.bz2 +md5sums="f38010635e83fe277e1e261a4a9ea66e mkinitfs-2.4.1.tar.bz2 +1ae074d8f56f355c4fdb3a3813c7cd4a 0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch +5182b1172fb8f975d208f5cff8497ae0 0002-init-new-boot-option-debug_init.patch e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD index c7eff9e0306..c4ed04198c3 100644 --- a/main/mplayer/APKBUILD +++ b/main/mplayer/APKBUILD @@ -2,7 +2,7 @@ pkgname=mplayer pkgver=1.0_rc4 _ver=${pkgver%_*}${pkgver#*_} -pkgrel=3 +pkgrel=5 pkgdesc="A movie player for linux" url="http://www.mplayerhq.hu/" arch="all" @@ -14,11 +14,18 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev mesa-dev" -# cdparanoia libcaca lirc-utils libgl-dev smbclient-dev -# aalib-dev jack-audio-connection-kit libmng-dev libxss-dev - -source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2" +source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2 + mplayer-libpng-1.5.patch + " _builddir="$srcdir"/MPlayer-$_ver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) patch -p1 -i "$srcdir"/$i || return 1 ;; + esac; + done +} build() { cd "$_builddir" @@ -67,4 +74,5 @@ package() { "$pkgdir"/usr/share/mplayer/subfont.ttf || return 1 rm -rf "$pkgdir"/usr/share/mplayer/font } -md5sums="1699c94de39da9c4c5d34e8f58e418f0 MPlayer-1.0rc4.tar.bz2" +md5sums="1699c94de39da9c4c5d34e8f58e418f0 MPlayer-1.0rc4.tar.bz2 +f3f3bae09f6cee684ced1dbc7d7ed23c mplayer-libpng-1.5.patch" diff --git a/main/mplayer/mplayer-libpng-1.5.patch b/main/mplayer/mplayer-libpng-1.5.patch new file mode 100644 index 00000000000..704c64c97ab --- /dev/null +++ b/main/mplayer/mplayer-libpng-1.5.patch @@ -0,0 +1,41 @@ +diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c +index 13dcfdb..c430566 100644 +--- a/libmpcodecs/vd_mpng.c ++++ b/libmpcodecs/vd_mpng.c +@@ -74,7 +74,7 @@ static int pngLength; + + static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size ) + { +- char * p = pngstr->io_ptr; ++ char * p = png_get_io_ptr(pngstr); + if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer; + fast_memcpy( buffer,(char *)&p[pngPointer],size ); + pngPointer+=size; +@@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ + png_uint_32 png_width=0,png_height=0; + int depth,color; + png_uint_32 i; ++ png_byte color_type; + mp_image_t* mpi; + + int cols; +@@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ + png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL ); + png_set_bgr( png ); + +- switch( info->color_type ) { ++ color_type=png_get_color_type(png, info); ++ ++ switch( color_type ) { + case PNG_COLOR_TYPE_GRAY_ALPHA: + mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" ); + break; +@@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ + out_fmt=IMGFMT_BGR24; + break; + default: +- mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type); ++ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type); + } + + // (re)init libvo if image parameters changed (width/height/colorspace) diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index d6727fb4e83..e08d116682d 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=nginx -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="nginx [engine x] is a HTTP and reverse proxy server" url="http://www.nginx.org" @@ -16,14 +16,15 @@ source="http://nginx.org/download/$pkgname-$pkgver.tar.gz nginx.initd nginx.logrotate $install + ipv6.patch " - _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" # apply patches here + patch -Np1 -i "$srcdir"/ipv6.patch } build() { @@ -56,6 +57,7 @@ package() { install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="d23f6e6b07b57ac061e790b1ed64bb98 nginx-1.0.4.tar.gz +md5sums="373c7761a7c682b92b164c8ee3d6d243 nginx-1.0.5.tar.gz b06f6e23753385be0076539ba1806cb6 nginx.initd -8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate" +8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate +801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch" diff --git a/main/nginx/ipv6.patch b/main/nginx/ipv6.patch new file mode 100644 index 00000000000..9b05f8ff83a --- /dev/null +++ b/main/nginx/ipv6.patch @@ -0,0 +1,42 @@ +--- a/src/http/ngx_http_core_module.c ++++ b/src/http/ngx_http_core_module.c +@@ -2442,7 +2442,11 @@ + ngx_uint_t i; + ngx_conf_t pcf; + ngx_http_module_t *module; ++#if (NGX_HAVE_INET6) ++ struct sockaddr_in6 *sin6; ++#else + struct sockaddr_in *sin; ++#endif + ngx_http_conf_ctx_t *ctx, *http_ctx; + ngx_http_listen_opt_t lsopt; + ngx_http_core_srv_conf_t *cscf, **cscfp; +@@ -2526,6 +2530,19 @@ + if (rv == NGX_CONF_OK && !cscf->listen) { + ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); + ++#if (NGX_HAVE_INET6) ++ sin6 = &lsopt.u.sockaddr_in6; ++ ++ sin6->sin6_family = AF_INET6; ++#if (NGX_WIN32) ++ sin6->sin6_port = htons(80); ++#else ++ sin6->sin6_port = htons((getuid() == 0) ? 80 : 8000); ++#endif ++ sin6->sin6_addr = in6addr_any; ++ ++ lsopt.socklen = sizeof(struct sockaddr_in6); ++#else + sin = &lsopt.u.sockaddr_in; + + sin->sin_family = AF_INET; +@@ -2537,6 +2554,7 @@ + sin->sin_addr.s_addr = INADDR_ANY; + + lsopt.socklen = sizeof(struct sockaddr_in); ++#endif + + lsopt.backlog = NGX_LISTEN_BACKLOG; + lsopt.rcvbuf = -1; diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index 64a741db056..0920894389c 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -52,4 +52,4 @@ package() { } md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz -f0f19dceca333bdee4fa1f2804382f02 Makefile-Alpine-kernels-support.patch" +3d0806dc1c3c61b40a1e10eef63a1007 Makefile-Alpine-kernels-support.patch" diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch index d0e8e1c165f..69e03c1afa4 100644 --- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch +++ b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch @@ -26,7 +26,7 @@ linux_2_6_35: $(unpatch_code) + -+linux_3_0_7: $(unpatch_code) ++linux_3_0_8: $(unpatch_code) do_unpatch_code: echo "Un-patching source code for use with linux-2.6.14 and up ..." diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 8f719ec3456..70f84d0207e 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -24,13 +24,14 @@ pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" -arch="" +arch="all" license="LGPL" subpackages="" depends="linux-${_flavor}=${_kernelver}" makedepends="glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}" source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$_realver-$_realsubver.tar.gz vmware-modules.initd + vmci_driver_c.patch " install_if="linux-${_flavor}=${_kernelver} open-vm-tools" @@ -38,6 +39,11 @@ _builddir="$srcdir/$_realname-$_realver-$_realsubver" prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -48,7 +54,7 @@ build() { --without-dnet \ --without-icu \ --without-procps \ - --with-kernel-release="$_abi_release" \ + --with-kernel-release="${_abi_release}" \ || return 1 cd "$_builddir"/modules make -j1 modules || return 1 @@ -58,12 +64,13 @@ package() { cd "$_builddir" install -D -m755 "$srcdir"/vmware-modules.initd \ "$pkgdir"/etc/init.d/vmware-modules-${_flavor} || return 1 - mkdir -p $pkgdir/lib/modules/$_abi_release/misc/ + mkdir -p $pkgdir/lib/modules/${_abi_release}/misc/ cd "$_builddir"/modules for module in `find -type f -name '*.ko'`; do - install -D -m644 $module "$pkgdir/lib/modules/$_abi_release/misc/" + install -D -m644 $module "$pkgdir/lib/modules/${_abi_release}/misc/" done } -md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz -afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" +md5sums="599342eee8d531b35ca1cc948b61868f open-vm-tools-2011.09.23-491607.tar.gz +afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd +993aac6dce319e41c1b922b9672c39bc vmci_driver_c.patch" diff --git a/main/open-vm-tools-grsec/vmci_driver_c.patch b/main/open-vm-tools-grsec/vmci_driver_c.patch new file mode 100644 index 00000000000..67faea55134 --- /dev/null +++ b/main/open-vm-tools-grsec/vmci_driver_c.patch @@ -0,0 +1,56 @@ +diff -Naur open-vm-tools-2011.09.23-491607-before/modules/linux/vmci/linux/driver.c open-vm-tools-2011.09.23-491607-after/modules/linux/vmci/linux/driver.c +--- open-vm-tools-2011.09.23-491607-before/modules/linux/vmci/linux/driver.c 2011-09-26 15:16:30.000000000 -0500 ++++ open-vm-tools-2011.09.23-491607-after/modules/linux/vmci/linux/driver.c 2011-10-13 15:13:19.266661488 -0500 +@@ -241,7 +241,24 @@ + #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0) + #endif + +-static struct file_operations vmuser_fops; ++/* ++ * Moved file operations initialize here because of incompatibilites ++ * with Gentoo hardened profile/hardend Linux 3. ++ */ ++static struct file_operations vmuser_fops = { ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, ++#else ++ .ioctl = LinuxDriver_Ioctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = LinuxDriver_UnlockedIoctl, ++#endif ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close ++}; + + + /* +@@ -378,26 +395,6 @@ + return -ENOMEM; + } + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vmuser_fops, 0, sizeof vmuser_fops); +- vmuser_fops.owner = THIS_MODULE; +- vmuser_fops.poll = LinuxDriverPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; +-#else +- vmuser_fops.ioctl = LinuxDriver_Ioctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; +-#endif +- vmuser_fops.open = LinuxDriver_Open; +- vmuser_fops.release = LinuxDriver_Close; +- + sprintf(linuxState.deviceName, "vmci"); + linuxState.major = 10; + linuxState.misc.minor = MISC_DYNAMIC_MINOR; diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index 692b03ce323..06d2a48c659 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver _realname=open-vm-tools -_mypkgrel=3 +_mypkgrel=4 # source open-vm-tools version if [ -f ../../main/$_realname/APKBUILD ]; then @@ -65,5 +65,5 @@ package() { done } -md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz +md5sums="599342eee8d531b35ca1cc948b61868f open-vm-tools-2011.09.23-491607.tar.gz afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index dd4c4d57890..c322e88183d 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=open-vm-tools -pkgver=2011.08.21 -_pkgsubver=471295 +pkgver=2011.09.23 +_pkgsubver=491607 pkgrel=0 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" @@ -74,15 +74,14 @@ gtk() { mkdir -p "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/lib/open-vm-tools/plugins \ "$subpkgdir"/etc/ - mv "$pkgdir"/usr/bin/vmware-toolbox \ - "$pkgdir"/usr/bin/vmware-user-suid-wrapper \ + mv "$pkgdir"/usr/bin/vmware-user-suid-wrapper \ "$subpkgdir"/usr/bin/ mv "$pkgdir"/etc/xdg "$subpkgdir"/etc/ mv "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr \ "$subpkgdir"/usr/lib/open-vm-tools/plugins/ } -md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz +md5sums="599342eee8d531b35ca1cc948b61868f open-vm-tools-2011.09.23-491607.tar.gz 49e2e394d0b567fa71fcd295e96bc1c8 getloadavg-uclibc.patch 82840b6bed002284b9bd2358707ee826 codeset-uclibc.patch 840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 4d12f92dd44..9a91ef059f5 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.8.3 _ver=${pkgver/_git*/} -pkgrel=6 +pkgrel=7 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -77,6 +77,6 @@ c32e15b0858eef708497e7ee6355a055 hostname.initd b1e64885f301166df30be3e3cf5338ff hwdrivers.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd 098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd -c268461826dfa21a781249f5b65017bc modloop.initd +d10c4fd412faf0b970bb470f493fe718 modloop.initd af16db0d798392c7c0ed3434e4bad241 networking.initd c1ec888202d868710b5749f7b217d1e3 modloop.confd" diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd index 3a694984208..97a45cc19a0 100644 --- a/main/openrc/modloop.initd +++ b/main/openrc/modloop.initd @@ -54,6 +54,7 @@ find_mnt() { # initialies: alpine_dev, alpine_mnt, alpine_fs, alpine_mounted find_media() { init_KOPT + [ -z "$KOPT_alpine_dev" ] && return 0 alpine_mounted= alpine_dev=${KOPT_alpine_dev%%:*} alpine_fs=${KOPT_alpine_dev#*:} diff --git a/main/pangomm/APKBUILD b/main/pangomm/APKBUILD index 0a2dc05186d..b77f7df3e0d 100644 --- a/main/pangomm/APKBUILD +++ b/main/pangomm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pangomm -pkgver=2.28.3 +pkgver=2.28.4 pkgrel=0 pkgdesc="C++ bindings for pango" url="http://gtkmm.sourceforge.net/" @@ -25,4 +25,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="be8f595aac3ed0d4c6b8df4630ee5aa7 pangomm-2.28.3.tar.bz2" +md5sums="40b3b34dbbefbc411a81d05dba5275ca pangomm-2.28.4.tar.bz2" diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index 9de60dcd6f9..ec97759799f 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre -pkgver=8.13 +pkgver=8.20 pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" @@ -46,4 +46,4 @@ libpcrecpp() { mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/ } -md5sums="5e595edbcded141813fa1a10dbce05cb pcre-8.13.tar.bz2" +md5sums="a1931c70e1273e3450d5036fe273d25c pcre-8.20.tar.bz2" diff --git a/main/perl-date-manip/APKBUILD b/main/perl-date-manip/APKBUILD index 6ab42f904aa..532b3e65cd7 100644 --- a/main/perl-date-manip/APKBUILD +++ b/main/perl-date-manip/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=perl-date-manip _realname=Date-Manip -pkgver=6.23 +pkgver=6.25 pkgrel=0 pkgdesc="Perl - Date manipulation routines" url="http://search.cpan.org/~sbeck/$_realname-$pkgver/" @@ -32,4 +32,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="e00c4c5758ac3692db99422e7c389675 Date-Manip-6.23.tar.gz" +md5sums="9b6725c4874a97149419518688af3ecc Date-Manip-6.25.tar.gz" diff --git a/main/perl-digest-hmac/APKBUILD b/main/perl-digest-hmac/APKBUILD index c9e435065aa..b8e65b06bf5 100644 --- a/main/perl-digest-hmac/APKBUILD +++ b/main/perl-digest-hmac/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-digest-hmac _realname=Digest-HMAC -pkgver=1.02 -pkgrel=2 +pkgver=1.03 +pkgrel=0 pkgdesc="Keyed-Hashing for Message Authentication Perl module" url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/" -arch="all" +arch="noarch" license="GPL PerlArtistic" depends="perl perl-digest-sha1" makedepends="perl-dev" @@ -27,4 +27,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="64c4b247d83cd64ec32aa22bf58a709b Digest-HMAC-1.02.tar.gz" +md5sums="e6a5d6f552da16eacb5157ea4369ff9d Digest-HMAC-1.03.tar.gz" diff --git a/main/perl-fcgi/APKBUILD b/main/perl-fcgi/APKBUILD index 2185e3ff264..9318bd5bd1b 100644 --- a/main/perl-fcgi/APKBUILD +++ b/main/perl-fcgi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-fcgi _realname=FCGI -pkgver=0.73 +pkgver=0.74 pkgrel=0 pkgdesc="Perl Fast CGI module" url="http://search.cpan.org/~flora/FCGI" @@ -29,4 +29,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="b55c8b93ccd175b3c0e4473f1a6c0bdd FCGI-0.73.tar.gz" +md5sums="462a77a0072480fea791a4d3095eb486 FCGI-0.74.tar.gz" diff --git a/main/perl-json/APKBUILD b/main/perl-json/APKBUILD index 3d105c1a776..48b8add731e 100644 --- a/main/perl-json/APKBUILD +++ b/main/perl-json/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> pkgname=perl-json _pkgreal=JSON -pkgver=2.51 -pkgrel=1 +pkgver=2.53 +pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" url="http://search.cpan.org/dist/JSON/" arch="noarch" @@ -28,4 +28,4 @@ package() { find "$pkgdir" -name .packlist -delete } -md5sums="d0ead26851f1e84d122f34533c3809cc JSON-2.51.tar.gz" +md5sums="7db1be00d44414c4962eeac222395a76 JSON-2.53.tar.gz" diff --git a/main/perl-pod-coverage/APKBUILD b/main/perl-pod-coverage/APKBUILD index 0cf141704e4..44356417920 100644 --- a/main/perl-pod-coverage/APKBUILD +++ b/main/perl-pod-coverage/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=perl-pod-coverage _realname=Pod-Coverage -pkgver=0.20 -pkgrel=3 +pkgver=0.21 +pkgrel=0 pkgdesc="Perl - Checks if the documentation of a module is comprehensive" url="http://search.cpan.org/~rclamp/$_realname-$pkgver/" arch="noarch" @@ -34,4 +34,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="292a5b8d3a93597af441d3e6467b8ad6 Pod-Coverage-0.20.tar.gz" +md5sums="3d8acba0817cc01b03d63bb05e4cef52 Pod-Coverage-0.21.tar.gz" diff --git a/main/perl-test-exception/APKBUILD b/main/perl-test-exception/APKBUILD index df814f10f0c..c9fa8b7a0d6 100644 --- a/main/perl-test-exception/APKBUILD +++ b/main/perl-test-exception/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=perl-test-exception _realname=Test-Exception -pkgver=0.29 -pkgrel=2 +pkgver=0.31 +pkgrel=0 pkgdesc="Perl - Test exception based code" url="http://search.cpan.org/~adie/$_realname-$pkgver/" arch="noarch" @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="9aea475db531d4fd4ce40cf25a0acd14 Test-Exception-0.29.tar.gz" +md5sums="adb57ca7614d15e5b307bf5e024b35a8 Test-Exception-0.31.tar.gz" diff --git a/main/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD index 5da9981e4f1..347c4a24749 100644 --- a/main/perl-test-pod/APKBUILD +++ b/main/perl-test-pod/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-test-pod _realname=Test-Pod -pkgver=1.44 -pkgrel=2 +pkgver=1.45 +pkgrel=0 pkgdesc="Check for POD errors in files" -url="http://search.cpan.org/~petdance/Test-Pod-1.26/" +url="http://search.cpan.org/~dwheeler/" arch="noarch" license="Unknown" depends="perl" @@ -27,4 +27,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="02380af5539521524d5df17273a57ae7 Test-Pod-1.44.tar.gz" +md5sums="089c8f272931df82f6c4d11a74f04628 Test-Pod-1.45.tar.gz" diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 303e75be978..0162ca22924 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ pkgname=php pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=0 +pkgrel=1 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" arch="all" @@ -19,6 +19,7 @@ makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev readline-dev enchant-dev gdbm-dev freetds-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi $pkgname-cli $pkgname-fpm $pkgname-apache2 $pkgname-embed + $pkgname-pear $pkgname-bcmath $pkgname-bz2 $pkgname-calendar @@ -72,6 +73,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi # http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 + php-install-pear-xml.patch suhosin-patch-${_suhosinver}.patch php-fpm.initd php5-module.conf @@ -88,6 +90,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + # safty check for api changes local vapi=$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h) if [ "$vapi" != "$_apiver" ]; then @@ -108,10 +111,6 @@ _do_build() { } build() { - # Set PEAR_INSTALLDIR to ensure that the hard-coded include_path - # is properly set even if we install php-pear separately - export PEAR_INSTALLDIR=/usr/share/pear - _phpconfig="--build=${CHOST:-i486-alpine-linux-uclibc} \ --prefix=/usr \ --sysconfdir=/etc/php \ @@ -202,12 +201,13 @@ build() { --enable-mailparse \ " - # cgi, fcgi, cli and extensions + # cgi, fcgi, cli, pear and extensions _do_build cgi \ ${_phpconfig} \ --disable-cli \ --enable-cgi \ --enable-cli \ + --with-pear \ ${_phpextensions} \ || return 1 @@ -242,8 +242,11 @@ build() { package() { cd "$srcdir"/build-cgi - # install php-cgi, cli and modules - make -j1 install INSTALL_ROOT="$pkgdir" || return 1 + # install php-cgi, cli, pear and modules + make -j1 install install-pear INSTALL_ROOT="$pkgdir" || return 1 + + # cleanup after pear + find "$pkgdir" -name '.*' | xargs rm -rf || return 1 # install fpm install -D -m755 "$srcdir"/build-fpm/sapi/fpm/php-fpm \ @@ -354,6 +357,21 @@ embed() { mv "$pkgdir"/usr/lib/libphp5.so "$subpkgdir"/usr/lib/ } +pear() { + pkgdesc="PHP Extension and Application Repository (PEAR)" + depends="php-cli php-xml" + mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/etc/php \ + "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/pecl \ + "$pkgdir"/usr/bin/pear \ + "$pkgdir"/usr/bin/peardev \ + "$subpkgdir"/usr/bin/ || return 1 + mv "$pkgdir"/etc/php/pear.conf \ + "$subpkgdir"/etc/php/ || return 1 + mv "$pkgdir"/usr/share/pear \ + "$subpkgdir"/usr/share/ || return 1 +} + _mv_ext() { local ext=$1 pkgdesc="${ext} extension for PHP" @@ -425,6 +443,7 @@ mssql() { _mv_ext mssql; } pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } md5sums="704cd414a0565d905e1074ffdc1fadfb php-5.3.8.tar.bz2 +5111e3be06d391f8772587c675240fab php-install-pear-xml.patch 8bd8840465d6bcd8e1e5d2cec80a1bfc suhosin-patch-5.3.7-0.9.10.patch 8f2bb2b744a2de50025842cb51fb6a3a php-fpm.initd 67719f428f44ec004da18705cbabe2ee php5-module.conf" diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD index 74d9d94a94f..d04c1eadab4 100644 --- a/main/poppler-gtk/APKBUILD +++ b/main/poppler-gtk/APKBUILD @@ -16,9 +16,9 @@ pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" arch="all" license="GPL" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-demo" makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev glib-dev gtk+-dev - poppler-dev lcms-dev" + poppler-dev lcms-dev gobject-introspection-dev" depends= replaces="poppler-glib" depends_dev="$makedepends" @@ -39,9 +39,8 @@ build() { --enable-libjpeg \ --enable-zlib \ --enable-poppler-glib \ - --enable-gdk \ + --enable-introspection \ --disable-poppler-qt4 \ - --disable-poppler-qt \ --disable-utils \ || return 1 make || return 1 @@ -55,4 +54,10 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="3afa28e3c8c4f06b0fbca3c91e06394e poppler-0.16.7.tar.gz" +demo() { + pkgdesc="poppler gtk demo" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +md5sums="4cd3bf2a0a13fa8eaf00d31368915f77 poppler-0.18.0.tar.gz" diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD index 0974eefa484..ddabbd26af1 100644 --- a/main/poppler/APKBUILD +++ b/main/poppler/APKBUILD @@ -4,7 +4,7 @@ # circular make dependency: gtk <- cups <- poppler <- gtk # So we build gtk support in poppler-gtk pkgname=poppler -pkgver=0.16.7 +pkgver=0.18.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" @@ -27,9 +27,7 @@ build() { --enable-libjpeg \ --enable-zlib \ --disable-poppler-glib \ - --disable-gdk \ --disable-poppler-qt4 \ - --disable-poppler-qt \ || return 1 make } @@ -46,4 +44,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="3afa28e3c8c4f06b0fbca3c91e06394e poppler-0.16.7.tar.gz" +md5sums="4cd3bf2a0a13fa8eaf00d31368915f77 poppler-0.18.0.tar.gz" diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index aff2a4cb9da..d7d7525189c 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.8.5 +pkgver=2.8.6 pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" @@ -152,7 +152,7 @@ pcre() { _mv_dict pcre ; } pgsql() { _mv_dict pgsql ; } sqlite() { _mv_dict sqlite ; } -md5sums="a38128959af680009cae8cbcc03e0f10 postfix-2.8.5.tar.gz +md5sums="c9cb89bfa660379b71fab356d2bf426e postfix-2.8.6.tar.gz 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd 632fce950f64aa0794f9c2af85d45423 0001-support-for-dynamic-maps.patch 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index d5d1c5c2543..e0c70cb5aa3 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql pkgver=9.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" arch="all" @@ -58,7 +58,7 @@ client() { md5sums="061a9f17323117c9358ed60f33ecff78 postgresql-9.1.1.tar.bz2 -66c197b8186a6df0752fe2aed40c90c4 postgresql.initd +7d7b7815f2bf133830f65ed9830ce461 postgresql.initd c56a4db0c3757f5dc7f9d59132b428ba postgresql.confd 5f6d10a6a3d71dcee856fa6671954ab4 pg-restore.initd bf45384752b320b369f1425939763178 pg-restore.confd" diff --git a/main/postgresql/postgresql.initd b/main/postgresql/postgresql.initd index 2de91d0df6d..3452db85668 100644 --- a/main/postgresql/postgresql.initd +++ b/main/postgresql/postgresql.initd @@ -50,7 +50,8 @@ start() { return 1 fi - local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid") + local pid + read pid < "$PGDATA/postmaster.pid" test -d /proc/"${pid}" eend $? } diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD index 1d215427faf..b83dca2de69 100644 --- a/main/postgrey/APKBUILD +++ b/main/postgrey/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=postgrey -pkgver=1.33 +pkgver=1.34 pkgrel=0 pkgdesc="Postfix policy server implementing greylisting" url="http://postgrey.schweikert.ch/" @@ -36,6 +36,6 @@ package() { install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="334c908bb9d34e9b87790d4b0b6db87e postgrey-1.33.tar.gz +md5sums="f736a7be1094593f1a66cd13f32b39ef postgrey-1.34.tar.gz caaad5770ab07fb5af3bbd522a05b84f postgrey.confd d0611b244202c77ad7ad79862721a738 postgrey.initd" diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 5ec16ff0e34..169b445d8f4 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD index d797b3b6adf..c99ae35db8d 100644 --- a/main/ristretto/APKBUILD +++ b/main/ristretto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ristretto -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=0 pkgdesc="Ristretto is a image viewer for Xfce" url="http://goodies.xfce.org/projects/applications/ristretto" @@ -36,4 +36,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="85e9b3d83309cdd84898f35b8d223121 ristretto-0.2.0.tar.bz2" +md5sums="df5c2082013f4ad2fc49cd7c25965741 ristretto-0.2.1.tar.bz2" diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 94b82e93a17..7652f8d98d3 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=3.5.11 +pkgver=3.6.1 pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" arch="all" license="GPL3" subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common - $pkgname-initscript tdb libsmbclient $pkgname-client" + $pkgname-initscript tdb libsmbclient $pkgname-client $pkgname-lang" depends="samba-initscript samba-client" makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev libiconv-dev talloc-dev" @@ -15,16 +15,16 @@ source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz samba.initd samba.confd samba.logrotate - samba-uclibc-fstab.patch - samba-maximum-number-of-winbindd-clients.patch " pkggroups="winbind" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - for i in "$srcdir"/*.patch; do - patch -p1 -i "$i" || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done } @@ -47,7 +47,7 @@ build() { --disable-nss-wrapper \ --disable-dnssd \ --disable-swat - make everything || return 1 + make || return 1 } package() { @@ -152,9 +152,7 @@ client() { } -md5sums="81bbd16048c6ca40baea8c59126ee385 samba-3.5.11.tar.gz +md5sums="5291717be0734e07dc07b6110e162e87 samba-3.6.1.tar.gz c8a7f6ac5df2f73dbf023e25ea39927b samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd -b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate -811e5a3f570d0053cf27a73248be4ae6 samba-uclibc-fstab.patch -a906d4049df6ca1a3c106e7df52d9925 samba-maximum-number-of-winbindd-clients.patch" +b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate" diff --git a/main/samba/samba-maximum-number-of-winbindd-clients.patch b/main/samba/samba-maximum-number-of-winbindd-clients.patch deleted file mode 100644 index 6e84bb413be..00000000000 --- a/main/samba/samba-maximum-number-of-winbindd-clients.patch +++ /dev/null @@ -1,134 +0,0 @@ -From eeb24afd78a6448e808aaf96dbd7d5abf51bbd40 Mon Sep 17 00:00:00 2001 -From: Pierre Carrier <pcarrier@redhat.com> -Date: Tue, 14 Sep 2010 16:43:39 -0700 -Subject: [PATCH] Allows changing the maximum number of simultaneous clients in winbindd through an smb.conf option. - -Signed-off-by: Jeremy Allison <jra@samba.org> ---- - docs-xml/smbdotconf/winbind/winbindmaxclients.xml | 14 ++++++++++++++ - source3/include/local.h | 3 --- - source3/include/proto.h | 1 + - source3/param/loadparm.c | 13 ++++++++++++- - source3/winbindd/winbindd.c | 8 +++----- - 5 files changed, 30 insertions(+), 9 deletions(-) - create mode 100644 docs-xml/smbdotconf/winbind/winbindmaxclients.xml - -diff --git a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml -new file mode 100644 -index 0000000..ae49e45 ---- /dev/null -+++ b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml -@@ -0,0 +1,14 @@ -+<samba:parameter name="winbind max clients" -+ context="G" -+ type="integer" -+ advanced="1" developer="1" -+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> -+<description> -+ <para>This parameter specifies the maximum number of clients -+ the <citerefentry><refentrytitle>winbindd</refentrytitle> -+ <manvolnum>8</manvolnum></citerefentry> daemon can connect with. -+ </para> -+</description> -+ -+<value type="default">200</value> -+</samba:parameter> -diff --git a/source3/include/local.h b/source3/include/local.h -index a3baf64..93ec4cc 100644 ---- a/source3/include/local.h -+++ b/source3/include/local.h -@@ -239,9 +239,6 @@ - /* Number in seconds for winbindd to wait for the mutex. Make this 2 * smbd wait time. */ - #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2) - --/* Max number of simultaneous winbindd socket connections. */ --#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200 -- - /* Buffer size to use when printing backtraces */ - #define BACKTRACE_STACK_SIZE 64 - -diff --git a/source3/include/proto.h b/source3/include/proto.h -index f089c69..e1751e8 100644 ---- a/source3/include/proto.h -+++ b/source3/include/proto.h -@@ -3539,6 +3539,7 @@ int lp_smb_encrypt(int ); - char lp_magicchar(const struct share_params *p ); - int lp_winbind_cache_time(void); - int lp_winbind_reconnect_delay(void); -+int lp_winbind_max_clients(void); - const char **lp_winbind_nss_info(void); - int lp_algorithmic_rid_base(void); - int lp_name_cache_timeout(void); -diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c -index e3fc2d8..bb6e132 100644 ---- a/source3/param/loadparm.c -+++ b/source3/param/loadparm.c -@@ -262,7 +262,7 @@ struct global { - int oplock_break_wait_time; - int winbind_cache_time; - int winbind_reconnect_delay; -- int winbind_max_idle_children; -+ int winbind_max_clients; - char **szWinbindNssInfo; - int iLockSpinTime; - char *szLdapMachineSuffix; -@@ -4606,6 +4606,15 @@ static struct parm_struct parm_table[] = { - .flags = FLAG_ADVANCED, - }, - { -+ .label = "winbind max clients", -+ .type = P_INTEGER, -+ .p_class = P_GLOBAL, -+ .ptr = &Globals.winbind_max_clients, -+ .special = NULL, -+ .enum_list = NULL, -+ .flags = FLAG_ADVANCED, -+ }, -+ { - .label = "winbind enum users", - .type = P_BOOL, - .p_class = P_GLOBAL, -@@ -5299,6 +5308,7 @@ static void init_globals(bool reinit_globals) - - Globals.winbind_cache_time = 300; /* 5 minutes */ - Globals.winbind_reconnect_delay = 30; /* 30 seconds */ -+ Globals.winbind_max_clients = 200; - Globals.bWinbindEnumUsers = False; - Globals.bWinbindEnumGroups = False; - Globals.bWinbindUseDefaultDomain = False; -@@ -5877,6 +5887,7 @@ FN_LOCAL_INTEGER(lp_smb_encrypt, ismb_encrypt) - FN_LOCAL_CHAR(lp_magicchar, magic_char) - FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time) - FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay) -+FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients) - FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo) - FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase) - FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout) -diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c -index 7a9ebb8..9c0a1fb 100644 ---- a/source3/winbindd/winbindd.c -+++ b/source3/winbindd/winbindd.c -@@ -908,17 +908,15 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev, - struct winbindd_listen_state *s = talloc_get_type_abort(private_data, - struct winbindd_listen_state); - -- while (winbindd_num_clients() > -- WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) { -+ while (winbindd_num_clients() > lp_winbind_max_clients() - 1) { - DEBUG(5,("winbindd: Exceeding %d client " - "connections, removing idle " -- "connection.\n", -- WINBINDD_MAX_SIMULTANEOUS_CLIENTS)); -+ "connection.\n", lp_winbind_max_clients())); - if (!remove_idle_client()) { - DEBUG(0,("winbindd: Exceeding %d " - "client connections, no idle " - "connection found\n", -- WINBINDD_MAX_SIMULTANEOUS_CLIENTS)); -+ lp_winbind_max_clients())); - break; - } - } --- -1.7.0.4 - diff --git a/main/samba/samba-uclibc-fstab.patch b/main/samba/samba-uclibc-fstab.patch deleted file mode 100644 index 3fdbc903082..00000000000 --- a/main/samba/samba-uclibc-fstab.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./client/mount.cifs.c.orig -+++ ./client/mount.cifs.c -@@ -39,7 +39,11 @@ - #include <mntent.h> - #include <fcntl.h> - #include <limits.h> --#include <fstab.h> -+#if defined(__UCLIBC__) -+ #define _PATH_FSTAB "/etc/fstab" -+#else -+ #include <fstab.h> -+#endif - #include "mount.h" - - #define MOUNT_CIFS_VERSION_MAJOR "1" diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD index 1d0de3a6b41..60ec3ab7099 100644 --- a/main/sdl/APKBUILD +++ b/main/sdl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sdl pkgver=1.2.14 -pkgrel=4 +pkgrel=5 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" url="http://www.libsdl.org" arch="all" diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD index 6874b7ec2ea..e5401a84c4a 100644 --- a/main/smartmontools/APKBUILD +++ b/main/smartmontools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=smartmontools -pkgver=5.41 +pkgver=5.42 pkgrel=0 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives." url="http://smartmontools.sourceforge.net" @@ -27,6 +27,6 @@ package() { install -Dm755 ../smartd.initd "$pkgdir"/etc/init.d/smartd install -Dm644 ../smartd.confd "$pkgdir"/etc/conf.d/smartd } -md5sums="4577886bea79d4ff12bd9a7d323ce692 smartmontools-5.41.tar.gz +md5sums="4460bf9a79a1252ff5c00ba52cf76b2a smartmontools-5.42.tar.gz 64e6fc908146b885aa3f88796edf72f3 smartd.initd 371cdb7cc9dc924b6d12224d66b193c6 smartd.confd" diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index 4179562577c..52df249af01 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=spamassassin _realname=Mail-SpamAssassin -pkgver=3.3.1 -pkgrel=9 +pkgver=3.3.2 +pkgrel=0 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://spamassassin.apache.org" arch="all" @@ -13,12 +13,10 @@ depends="gnupg perl perl-digest-sha1 perl-io-compress perl-time-hires makedepends="perl-dev zlib-dev" install= subpackages="$pkgname-doc" -source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz - spamassassin-3.3.1-PERL-5-12.patch" +source="http://www.apache.org/dist/spamassassin/source/$_realname-$pkgver.tar.gz" prepare() { cd "$srcdir/$_realname-$pkgver" - patch -p2 < ../spamassassin-3.3.1-PERL-5-12.patch || return 1 } build() { @@ -39,5 +37,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz -aea0b415deb2a827c50653dafb80d6e4 spamassassin-3.3.1-PERL-5-12.patch" +md5sums="d1d62cc5c6eac57e88c4006d9633b81e Mail-SpamAssassin-3.3.2.tar.gz" diff --git a/main/spamassassin/spamassassin-3.2.5-DESTDIR.patch b/main/spamassassin/spamassassin-3.2.5-DESTDIR.patch deleted file mode 100644 index a9765fc55db..00000000000 --- a/main/spamassassin/spamassassin-3.2.5-DESTDIR.patch +++ /dev/null @@ -1,273 +0,0 @@ ---- Mail-SpamAssassin-3.2.5/Makefile.PL.old 2009-10-21 23:25:18.000000000 +0200 -+++ Mail-SpamAssassin-3.2.5/Makefile.PL 2009-10-21 23:31:28.000000000 +0200 -@@ -12,12 +12,12 @@ - - # avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings; - # strip off the beta subversion noise that causes the trouble. - $mm_version =~ s/_\S+$//; # "6.30_01" => "6.30" - --if ($mm_version+0 < 5.45) { -- die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v5.45"; -+if ($mm_version < 6.17) { -+ die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17"; - } - - use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi); - use constant HAS_DBI => eval { require DBI; }; - -@@ -82,11 +82,10 @@ - ); - - - sub parse_arg { - my($val, $name) = (@_); -- - if ($val =~ /^($name)=["']?(.*?)["']?$/) { - return $2; - } else { - return undef; - } -@@ -107,53 +106,27 @@ - return 'yes' if bool($val, $def); - return 'no'; - } - - -- - my %opt = ( -- 'build_spamc' => undef, -+ 'build_spamc' => undef, - 'enable_ssl' => undef, - 'contact_address' => undef, - 'destdir' => undef, - ); - ARGV: foreach (@ARGV) { - foreach my $key (keys %opt) { -- my $val; -- -- $val = parse_arg($_, uc($key)); -+ my $val = parse_arg($_, uc($key)); - if (defined $val) { - $opt{$key} = $val; - next ARGV; - } - } - } - - --# Gather some information about what EU::MM offers and/or needs --my( -- $mm_knows_destdir, -- $mm_has_destdir, -- $mm_has_good_destdir, -- $mm_needs_destdir, --); -- --# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for --# packaging with builddir!=destdir. See bug 2388. --$mm_knows_destdir = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR}; --$mm_has_good_destdir = $mm_version >= 6.11; --# Add DESTDIR hack only if it's requested (and necessary) --$mm_needs_destdir = $opt{'destdir'} && !$mm_has_good_destdir; --$mm_has_destdir = $mm_knows_destdir || $mm_needs_destdir; --push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir; -- --# Now make EU::MM understand our extended vars --foreach my $key (@ATT_KEYS) { -- $ExtUtils::MakeMaker::Recognized_Att_Keys{$key} = 1; --} -- -- - # Gather the rules files in the range 00-69; we do this in perl because - # it's more portable. Also, plugin .pm files. - my @datafiles = map { s,^rules/,,; $_ } - grep { -f $_ } (<rules/*.cf>, <rules/*.pm>); - my $datafiles = join(' ', (grep -@@ -270,75 +243,27 @@ - - # We have only this Makefile.PL and this option keeps MakeMaker from - # asking all questions twice after a 'make dist*'. - 'NORECURS' => 1, - -- # bug 5074: perl 5.6.1 (with ExtUtils::MakeMaker 5.45) attempts to -- # recurse anyway unless this is explicitly specified -- 'DIR' => [ ], -- - # Don't add META.yml to the MANIFEST for god's sake! - 'NO_META' => 1, - ); - - # rules/72_active.cf is built from "rulesrc", but *must* exist before - # WriteMakefile() is called due to shortcomings in MakeMaker. - my @FILES_THAT_MUST_EXIST = qw( - rules/72_active.cf - ); - --# That META.yml stuff was introduced with Perl 6.06_03, see --# <http://archive.develooper.com/makemaker@perl.org/msg00922.html> --# <http://archive.develooper.com/makemaker@perl.org/msg00984.html> --delete $makefile{'NO_META'} if $mm_version < 6.06_03; -- - # make sure certain optional modules are up-to-date if they are installed - # also see PREREQ_PM above - my %CURRENT_PM = ( - 'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), - 'Razor2::Client::Agent' => 2.40, - ); - --if ($mm_needs_destdir) { -- my $error = <<DESTDIR_HACK; -- -- *********************************************************************** -- ExtUtils::MakeMaker ${mm_version} doesn't include support for DESTDIR, -- so if you want to be on the safe side, you might want to upgrade your -- ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN. -- -- You can use either the CPAN shell or go to -- <http://search.cpan.org/search?module=ExtUtils::MakeMaker> -- to get an up-to-date version. -- -- This should only be necessary if you are creating binary packages. -- *********************************************************************** -- --DESTDIR_HACK -- $error =~ s/^ {4}//gm; -- warn $error; --} --elsif ($opt{'destdir'} and !$mm_has_good_destdir) { -- my $error = <<DESTDIR_BUG; -- -- *********************************************************************** -- ExtUtils::MakeMaker ${mm_version} contains bugs that may cause problems -- in the \"make\" process. It is recommended that you upgrade -- ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN. -- -- You can use either the CPAN shell or go to -- <http://search.cpan.org/search?module=ExtUtils::MakeMaker> -- to get an up-to-date version. -- -- This should only be necessary if you are creating binary packages. -- *********************************************************************** -- --DESTDIR_BUG -- $error =~ s/^ {4}//gm; -- warn $error; --} -- - - # All the $(*MAN1*) stuff is empty/zero if Perl was Configured with -Dman1dir=none; - # however, support site/vendor man1 dirs (bug 5338) - unless($Config{installman1dir} - || $Config{installsiteman1dir} -@@ -405,22 +330,19 @@ - - # Now finish the meta hash and dump the Makefile - $makefile{EXE_FILES} = [ values %{$makefile{EXE_FILES}} ]; - $makefile{AUTHOR} =~ s/(<.+) at (.+>)/$1\@$2/; - WriteMakefile(%makefile); --print "Makefile written by ExtUtils::MakeMaker ${mm_version}\n"; -+print "Makefile written by ExtUtils::MakeMaker $mm_version\n"; - - ####################################################################### - - package MY; - -- - use vars qw( - $MY_GLOBALS_ARE_SANE -- - $RUNNING_ON_WINDOWS -- - @REPOSITORIES - - $MACRO_RE - $EQ_RE - $EQ -@@ -906,19 +828,10 @@ - init_MY_globals($self); - - foreach (@code) { - # Add our install targets as a dependency to all top-level install targets - s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 conf__install data__install/; -- -- # Now do the DESTDIR hack, if necessary. -- next if !$mm_needs_destdir; -- # Write the correct path to perllocal.pod -- next if /installed into/; -- -- # Replace all other $(INSTALL*) vars (except $(INSTALLDIRS) of course) -- # with their $(DESTINSTALL*) counterparts -- s/\Q$(\E(INSTALL(?!DIRS)${MACRO_RE})\Q)\E/\$(DEST$1)/g; - } - - clean_MY_globals($self); - return join("\n", @code); - } -@@ -956,32 +869,10 @@ - set_macro($rprefix, macro_ref('PREFIX')); - $line .= "\n" . macro_def($rprefix); - } - } - } -- -- if (line_has_macro_def($line, 'MM_VERSION')) { -- # These macros are just for debugging purposes. -- $line = join("\n", $line, -- macro_def(MM_HAS_DESTDIR => ::yesno($mm_has_destdir)), -- macro_def(MM_HAS_GOOD_DESTDIR => ::yesno($mm_has_good_destdir)), -- macro_def(MM_KNOWS_DESTDIR => ::yesno($mm_knows_destdir)), -- macro_def(MM_NEEDS_DESTDIR => ::yesno($mm_needs_destdir)), -- ); -- } -- -- # Add DESTDIR support if necessary -- if ($mm_needs_destdir) { -- if (line_has_macro_def($line, 'INSTALLDIRS')) { -- $line .= "\n" . macro_def('DESTDIR'); -- } -- elsif (line_has_macro_def($line, qr/INSTALL${MACRO_RE}/)) { -- my $macro = get_macro_name_from_line($line); -- $line .= "\n" . macro_def('DEST' . $macro, -- macro_ref('DESTDIR') . macro_ref($macro)); -- } -- } - } - push(@code, qq{}); - - # Add some additional target dirs - { -@@ -1015,13 +906,11 @@ - foreach my $r (@REPOSITORIES) { - my $macro = 'INSTALL' . repository($r) . $m; - # The INSTALL* macros. - push(@code, macro_def($macro)); - # The DESTINSTALL* macros. -- push(@code, macro_def('DEST' . $macro, -- macro_ref('DESTDIR') . macro_ref($macro))) -- if $mm_has_destdir; -+ push(@code, macro_def('DEST' . $macro, macro_ref('DESTDIR') . macro_ref($macro))); - } - } - } - - # Set the PERL_* stuff -@@ -1068,17 +957,12 @@ - # SCRIPT macro is the same for all repositories. - foreach my $macro (qw(SCRIPT DATA CONF LIB)) { - push(@code, macro_def('I_' . $macro . 'DIR', - macro_ref('INSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); - -- if ($mm_has_destdir) { -- push(@code, macro_def('B_' . $macro . 'DIR', -- macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); -- } else { -- push(@code, macro_def('B_' . $macro . 'DIR', -- macro_ref('I_' . $macro . 'DIR'))); -- } -+ push(@code, macro_def('B_' . $macro . 'DIR', -+ macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro))); - } - } - - clean_MY_globals($self); - return join("\n", @code); diff --git a/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch b/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch deleted file mode 100644 index 5b4039c4d5c..00000000000 --- a/main/spamassassin/spamassassin-3.3.1-PERL-5-12.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm ---- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm 2010-03-16 10:49:21.000000000 -0400 -+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm 2010-07-20 15:54:23.000000000 -0400 -@@ -754,7 +754,7 @@ - dbg("dns: entering helper-app run mode"); - $self->{old_slash} = $/; # Razor pollutes this - %{$self->{old_env}} = (); -- if ( defined %ENV ) { -+ if ( %ENV ) { - # undefined values in %ENV can result due to autovivification elsewhere, - # this prevents later possible warnings when we restore %ENV - while (my ($key, $value) = each %ENV) { -Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin: Dns.pm~ -diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm ---- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm 2010-03-16 10:49:21.000000000 -0400 -+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm 2010-07-20 15:52:50.000000000 -0400 -@@ -191,7 +191,7 @@ - my $self = shift; - my %options = @_; - -- return join('', @{ $self->{text} }) unless keys %options; -+ return join('', @{ $self->{text} }) unless %options; - - my $mask; - while (my ($k, $v) = each %options) { -Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin: HTML.pm~ -diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm ---- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-03-16 10:49:21.000000000 -0400 -+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-07-20 16:04:57.000000000 -0400 -@@ -119,7 +119,7 @@ - } - - # If there are no words, mark if there's at least 1 image ... -- if (keys %html == 0 && exists $pms->{html}{inside}{img}) { -+ if (!%html && exists $pms->{html}{inside}{img}) { - # Use "\n" as the mark since it can't ever occur normally - $html{"\n"}=1; - } -Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: BodyEval.pm~ -Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: check.patch -diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm ---- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-03-16 10:49:21.000000000 -0400 -+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-07-20 16:03:00.000000000 -0400 -@@ -307,64 +307,51 @@ - my $package_name = __PACKAGE__; - my $methodname = $package_name."::_".$ruletype."_tests_".$clean_priority; - -- if (defined &{$methodname} && !$doing_user_rules) { --run_compiled_method: -- # dbg("rules: run_generic_tests - calling %s", $methodname); -- my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline }); -- my $err = $t->run(sub { -- no strict "refs"; -- $methodname->($pms, @{$opts{args}}); -- }); -- if ($t->timed_out() && $master_deadline && time > $master_deadline) { -- info("check: exceeded time limit in $methodname, skipping further tests"); -- $pms->{deadline_exceeded} = 1; -- } -- return; -- } -+ if (!defined &{$methodname} || $doing_user_rules) { - -- # use %nopts for named parameter-passing; it's more friendly to future-proof -- # subclassing, since new parameters can be added without breaking third-party -- # subclassed implementations of this plugin. -- my %nopts = ( -- ruletype => $ruletype, -- doing_user_rules => $doing_user_rules, -- priority => $priority, -- clean_priority => $clean_priority -- ); -- -- # build up the eval string... -- $self->{evalstr_methodname} = $methodname; -- $self->{evalstr_chunk_current_methodname} = undef; -- $self->{evalstr_chunk_methodnames} = []; -- $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections -- $self->{evalstr} = ''; $self->{evalstr_l} = 0; -- $self->{evalstr2} = ''; -- $self->begin_evalstr_chunk($pms); -- -- $self->push_evalstr_prefix($pms, ' -- # start_rules_plugin_code '.$ruletype.' '.$priority.' -- my $scoresptr = $self->{conf}->{scores}; -- '); -- if (defined $opts{pre_loop_body}) { -- $opts{pre_loop_body}->($self, $pms, $conf, %nopts); -- } -- $self->add_evalstr($pms, -- $self->start_rules_plugin_code($ruletype, $priority) ); -- while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) { -- $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts); -- } -- if (defined $opts{post_loop_body}) { -- $opts{post_loop_body}->($self, $pms, $conf, %nopts); -- } -+ # use %nopts for named parameter-passing; it's more friendly -+ # to future-proof subclassing, since new parameters can be added without -+ # breaking third-party subclassed implementations of this plugin. -+ my %nopts = ( -+ ruletype => $ruletype, -+ doing_user_rules => $doing_user_rules, -+ priority => $priority, -+ clean_priority => $clean_priority -+ ); -+ -+ # build up the eval string... -+ $self->{evalstr_methodname} = $methodname; -+ $self->{evalstr_chunk_current_methodname} = undef; -+ $self->{evalstr_chunk_methodnames} = []; -+ $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections -+ $self->{evalstr} = ''; $self->{evalstr_l} = 0; -+ $self->{evalstr2} = ''; -+ $self->begin_evalstr_chunk($pms); -+ -+ $self->push_evalstr_prefix($pms, ' -+ # start_rules_plugin_code '.$ruletype.' '.$priority.' -+ my $scoresptr = $self->{conf}->{scores}; -+ '); -+ if (defined $opts{pre_loop_body}) { -+ $opts{pre_loop_body}->($self, $pms, $conf, %nopts); -+ } -+ $self->add_evalstr($pms, -+ $self->start_rules_plugin_code($ruletype, $priority) ); -+ while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) { -+ $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts); -+ } -+ if (defined $opts{post_loop_body}) { -+ $opts{post_loop_body}->($self, $pms, $conf, %nopts); -+ } - -- $self->flush_evalstr($pms, 'run_generic_tests'); -- $self->free_ruleset_source($pms, $ruletype, $priority); -+ $self->flush_evalstr($pms, 'run_generic_tests'); -+ $self->free_ruleset_source($pms, $ruletype, $priority); - -- # clear out a previous version of this method -- undef &{$methodname}; -+ # clear out a previous version of this method -+ undef &{$methodname}; - -- # generate the loop that goes through each line... -- my $evalstr = <<"EOT"; -+ # generate the loop that goes through each line... -+ my $evalstr = <<"EOT"; - { - package $package_name; - -@@ -373,40 +360,51 @@ - sub $methodname { - EOT - -- for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) { -- $evalstr .= " $chunk_methodname(\@_);\n"; -- } -+ for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) { -+ $evalstr .= " $chunk_methodname(\@_);\n"; -+ } - -- $evalstr .= <<"EOT"; -+ $evalstr .= <<"EOT"; - } - - 1; - } - EOT - -- delete $self->{evalstr}; # free up some RAM before we eval() -- delete $self->{evalstr2}; -- delete $self->{evalstr_methodname}; -- delete $self->{evalstr_chunk_current_methodname}; -- delete $self->{evalstr_chunk_methodnames}; -- delete $self->{evalstr_chunk_prefix}; -- -- dbg("rules: run_generic_tests - compiling eval code: %s, priority %s", -- $ruletype, $priority); --# dbg("rules: eval code to compile: $evalstr"); -- my $eval_result; -- { my $timer = $self->{main}->time_method('compile_gen'); -- $eval_result = eval($evalstr); -- } -- if (!$eval_result) { -- my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; -- warn "rules: failed to compile $ruletype tests, skipping:\n". -- "\t($eval_stat)\n"; -- $pms->{rule_errors}++; -- } -- else { -+ delete $self->{evalstr}; # free up some RAM before we eval() -+ delete $self->{evalstr2}; -+ delete $self->{evalstr_methodname}; -+ delete $self->{evalstr_chunk_current_methodname}; -+ delete $self->{evalstr_chunk_methodnames}; -+ delete $self->{evalstr_chunk_prefix}; -+ -+ dbg("rules: run_generic_tests - compiling eval code: %s, priority %s", -+ $ruletype, $priority); -+ # dbg("rules: eval code to compile: $evalstr"); -+ my $eval_result; -+ { my $timer = $self->{main}->time_method('compile_gen'); -+ $eval_result = eval($evalstr); -+ } -+ if (!$eval_result) { -+ my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; -+ warn "rules: failed to compile $ruletype tests, skipping:\n". -+ "\t($eval_stat)\n"; -+ $pms->{rule_errors}++; -+ return; -+ } - dbg("rules: compiled $ruletype tests"); -- goto run_compiled_method; -+ } -+ -+#run_compiled_method: -+# dbg("rules: run_generic_tests - calling %s", $methodname); -+ my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline }); -+ my $err = $t->run(sub { -+ no strict "refs"; -+ $methodname->($pms, @{$opts{args}}); -+ }); -+ if ($t->timed_out() && $master_deadline && time > $master_deadline) { -+ info("check: exceeded time limit in $methodname, skipping further tests"); -+ $pms->{deadline_exceeded} = 1; - } - } - -diff -ur a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm ---- a/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-03-16 10:49:21.000000000 -0400 -+++ b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-07-20 16:06:47.000000000 -0400 -@@ -498,7 +498,7 @@ - # perhaps just limit to test, and image? - next if ($ctype eq 'application/ics'); - -- my $cte = lc $p->get_header('content-transfer-encoding') || ''; -+ my $cte = lc($p->get_header('content-transfer-encoding') || ''); - next if ($cte !~ /^base64$/); - foreach my $l ( @{$p->raw()} ) { - my $len = length $l; -Only in b/Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin: MIMEEval.pm~ diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index aa9f3613392..7e31aa125e9 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" @@ -76,7 +76,7 @@ pl() { mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ } -md5sums="930e6644a1b6094efd268fde6a318f04 subversion-1.7.0.tar.bz2 +md5sums="8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2 e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch d084a7558053784886bc858b94fa9186 svnserve.confd 22c274fafb4817e31126f60f9d84039f svnserve.initd" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index 35e6abb0733..b66a5e3e016 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.8.2 +pkgver=1.8.3 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -42,5 +42,5 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="000f458e7391be9fdf459a9ad6a4912a sudo-1.8.2.tar.gz +md5sums="9e5517bbf3aee420b38c2d1d7a71bcad sudo-1.8.3.tar.gz 429d9613091f1f3f19ce8def5b3032b3 libcrypt.patch" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index daf06fb52d9..ba4b1e03d11 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux pkgver=4.04 -pkgrel=9 +pkgrel=10 pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" arch="x86 x86_64" @@ -38,4 +38,4 @@ package() { md5sums="a3936208767eb7ced65320abe2e33a10 syslinux-4.04.tar.bz2 7ef73a7a858b8aa1ac6635d6391ac8e5 update-extlinux.conf -2206105f11b92971abb768ac0aa2e7d8 update-extlinux" +2414de8196826e20292825d69c75184b update-extlinux" diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux index 2de06e259a7..157d33529f1 100755 --- a/main/syslinux/update-extlinux +++ b/main/syslinux/update-extlinux @@ -78,6 +78,8 @@ fi everbose "Installing $syslinux_menu to /boot." cp /usr/share/syslinux/vesamenu.c32 /boot +umask 0022 +rm -f $conf.new echo "# Generated by update-extlinux" > $conf.new echo "DEFAULT $syslinux_menu" >> $conf.new echo "PROMPT 0" >> $conf.new diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD index 4e9cf93cc13..1ce0c08ade2 100644 --- a/main/tinyproxy/APKBUILD +++ b/main/tinyproxy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tinyproxy -pkgver=1.6.5 -pkgrel=7 +pkgver=1.8.3 +pkgrel=0 pkgdesc="Lightweight HTTP proxy" pkgusers="tinyproxy" pkggroups="tinyproxy" @@ -10,37 +10,39 @@ url="https://www.banu.com/tinyproxy/" arch="all" license="GPL" depends= -makedepends=wget -install="tinyproxy.pre-install tinyproxy.post-install" +makedepends="wget asciidoc" +install="tinyproxy.pre-install" subpackages="$pkgname-doc" -source="https://www.banu.com/pub/$pkgname/1.6/$pkgname-$pkgver.tar.gz +source="https://www.banu.com/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 tinyproxy.initd " _builddir="$srcdir/$pkgname-$pkgver" -build() { +prepare() { cd "$_builddir" # set default user to tinyproxy:tinyproxy and correct pidfile sed -i -e 's:^User.*:User tinyproxy:' \ -e 's:^Group.*:Group tinyproxy:' \ -e 's:^PidFile.*:PidFile "/var/run/tinyproxy/tinyproxy.pid":' \ - doc/tinyproxy.conf + etc/tinyproxy.conf.in +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - + --sysconfdir=/etc/tinyproxy \ + --disable-dependency-tracking \ + || return make || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 install -d -D -o tinyproxy -g tinyproxy "$pkgdir"/var/run/tinyproxy install -Dm755 "$srcdir"/tinyproxy.initd "$pkgdir"/etc/init.d/tinyproxy } -md5sums="2b2862ba33d2939e4572688d442ba415 tinyproxy-1.6.5.tar.gz +md5sums="292ac51da8ad6ae883d4ebf56908400d tinyproxy-1.8.3.tar.bz2 ce2b2e3c79fa0e8491fe625bbb15710a tinyproxy.initd" diff --git a/main/tinyproxy/tinyproxy.post-install b/main/tinyproxy/tinyproxy.post-install deleted file mode 100755 index ef518c61620..00000000000 --- a/main/tinyproxy/tinyproxy.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -chown tinyproxy:tinyproxy /var/run/tinyproxy - -# return with success even if user already exist -exit 0 diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install index ffa4e65b8b7..22cd241a60c 100755 --- a/main/tinyproxy/tinyproxy.pre-install +++ b/main/tinyproxy/tinyproxy.pre-install @@ -1,6 +1,8 @@ #!/bin/sh -adduser -h /var/run/tinyproxy -s /bin/false -D tinyproxy 2>/dev/null +addgroup -S tinyproxy 2>/dev/null +adduser -S -s /bin/false -D -H -h /var/run/tinyproxy -G tinyproxy \ + -g "tinyproxy user" tinyproxy 2>/dev/null # return with success even if user already exist exit 0 diff --git a/main/ttf-ubuntu-font-family/APKBUILD b/main/ttf-ubuntu-font-family/APKBUILD index 5c7fb17019d..a6882d02195 100644 --- a/main/ttf-ubuntu-font-family/APKBUILD +++ b/main/ttf-ubuntu-font-family/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=ttf-ubuntu-font-family -pkgver=0.70.1 +pkgver=0.80 pkgrel=0 pkgdesc="Ubuntu font family" url="http://font.ubuntu.com/" @@ -26,4 +26,4 @@ package() { install -m644 -D TRADEMARKS.txt "$pkgdir"/usr/share/licenses/$pkgname/TRADEMARKS.txt } -md5sums="ec2e9b6535c74a654cc6bd2d935b5856 ubuntu-font-family-0.70.1.zip" +md5sums="a1fc70f5a5b1d096ab8310886cddaa1c ubuntu-font-family-0.80.zip" diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD index f8431e787c9..e9f82bc8b98 100644 --- a/main/tumbler/APKBUILD +++ b/main/tumbler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tumbler pkgver=0.1.22 -pkgrel=0 +pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/apps/tumbler/" arch="all" @@ -10,7 +10,7 @@ license="GPL2" depends= makedepends="gtk+-dev dbus-glib-dev jpeg-dev poppler-gtk-dev" install="" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://archive.xfce.org/src/apps/tumbler/${pkgver%.*}/tumbler-$pkgver.tar.bz2" _builddir="$srcdir"/tumbler-$pkgver diff --git a/main/unrar/APKBUILD b/main/unrar/APKBUILD index 3a2e07904d2..d3bf22049e7 100644 --- a/main/unrar/APKBUILD +++ b/main/unrar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unrar -pkgver=4.0.7 +pkgver=4.1.2 pkgrel=0 pkgdesc="The RAR uncompression program" url="http://www.rarlab.com" @@ -24,4 +24,4 @@ package() { } -md5sums="41b0a9bca945b4ae2608421afd8f606e unrarsrc-4.0.7.tar.gz" +md5sums="bd6761e8be6281b945db8e15564e412c unrarsrc-4.1.2.tar.gz" diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD index 887379ab0ea..8935e95c23b 100644 --- a/main/v4l-utils/APKBUILD +++ b/main/v4l-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=v4l-utils -pkgver=0.8.4 -pkgrel=1 +pkgver=0.8.5 +pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="http://freshmeat.net/projects/libv4l" arch="all" @@ -26,6 +26,7 @@ prepare() { rm -rf utils/decode_tm6000 utils/keytable sed -i 's/decode_tm6000 //g' utils/Makefile sed -i 's/keytable //g' utils/Makefile + sed -i 's/v4l2-sysfs-path //g' utils/Makefile } build() { @@ -49,6 +50,6 @@ qv4l2() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/ || return 1 } -md5sums="f2ded401b9b8d77f5ec7fac4683cfadf v4l-utils-0.8.4.tar.bz2 +md5sums="037bec9f68cfb0b84bcccb00d30e429b v4l-utils-0.8.5.tar.bz2 75ef594ddfe48e48df99c96c2af6b51e qv4l2.svg b2e51f9663cee1c38a1d99d76a6b529f qv4l2.desktop" diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 9910c990a54..291076bf881 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=1.1.11 -pkgrel=1 +pkgver=1.1.12 +pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" pkgusers="vlc" pkggroups="vlc" @@ -183,9 +183,9 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="a64846d6f21ea179ae8e8bfb6f9447fe vlc-1.1.11.tar.bz2 +md5sums="91de1ad308c947e35380f9d747ff5713 vlc-1.1.12.tar.bz2 ba24152286d98f8a367c7fd0cb8949f4 uclibc3.patch -d718e22a7de9f38579f276f720b2f36a uclibc-libcompat.patch -43bea31edd02de2b53075e5e883706db uclibc-inhibit-spawn.patch +402d28075ff672d4f273cf8b9b1b3137 uclibc-libcompat.patch +c40a7df07af3b68a109b4d6bf04155d2 uclibc-inhibit-spawn.patch ddbd40bd72fedc1449be45588aea5d66 vlc.trigger e1ef2dec8e25f7ea6ba40e646c63e061 vlc-1.1.7-disable-cache-gen.patch" diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 1fe27fbab27..75cff1bb6b3 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,6 +1,8 @@ ---- a/modules/misc/inhibit/xdg.c.orig +diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c +index cfb3b2a..16a2ce9 100644 +--- a/modules/misc/inhibit/xdg.c +++ b/modules/misc/inhibit/xdg.c -@@ -26,7 +26,12 @@ +@@ -26,7 +26,11 @@ #include <vlc_plugin.h> #include <vlc_inhibit.h> #include <assert.h> @@ -10,16 +12,59 @@ +#else +# include <spawn.h> +#endif -+ #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -137,7 +142,15 @@ +@@ -46,7 +50,9 @@ struct vlc_inhibit_sys + vlc_thread_t thread; + vlc_cond_t update, inactive; + vlc_mutex_t lock; ++#if (_POSIX_SPAWN >= 0) + posix_spawnattr_t attr; ++#endif + bool suspend, suspended; + }; + +@@ -66,17 +72,21 @@ static int Open (vlc_object_t *obj) + vlc_mutex_init (&p_sys->lock); + vlc_cond_init (&p_sys->update); + vlc_cond_init (&p_sys->inactive); ++#if (_POSIX_SPAWN >= 0) + posix_spawnattr_init (&p_sys->attr); ++#endif + /* Reset signal handlers to default and clear mask in the child process */ + { + sigset_t set; + + sigemptyset (&set); +- posix_spawnattr_setsigmask (&p_sys->attr, &set); + sigaddset (&set, SIGPIPE); ++#if (_POSIX_SPAWN >= 0) ++ posix_spawnattr_setsigmask (&p_sys->attr, &set); + posix_spawnattr_setsigdefault (&p_sys->attr, &set); + posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF + | POSIX_SPAWN_SETSIGMASK); ++#endif + } + p_sys->suspend = false; + p_sys->suspended = false; +@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj) + + vlc_cancel (p_sys->thread); + vlc_join (p_sys->thread, NULL); ++#if (_POSIX_SPAWN >= 0) + posix_spawnattr_destroy (&p_sys->attr); ++#endif + vlc_cond_destroy (&p_sys->inactive); + vlc_cond_destroy (&p_sys->update); + vlc_mutex_destroy (&p_sys->lock); +@@ -152,8 +164,16 @@ static void *Thread (void *data) pid_t pid; vlc_mutex_unlock (&p_sys->lock); +#if (_POSIX_SPAWN >= 0) - if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ)) + if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr, + argv, environ)) +#else + pid = fork(); + if (pid == 0) { diff --git a/main/vlc/uclibc-libcompat.patch b/main/vlc/uclibc-libcompat.patch index e4008002f49..056b1411d3a 100644 --- a/main/vlc/uclibc-libcompat.patch +++ b/main/vlc/uclibc-libcompat.patch @@ -1,21 +1,27 @@ -commit c605c09bbc29d88619264c55c371c9dcbc839eda -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu Jul 29 19:20:17 2010 +0000 +From b5f5c2cc68f60feea3b8f397f13f13e514d852d4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 28 Oct 2011 09:50:08 +0000 +Subject: [PATCH] build: libcompat fix in case there are no functions to + replace - build: libcompat fix in case there are no functions to replace - - If the libc provides all the funcs in libcompat the libcompat.a will - never be created due to LIBOBJS is empty (normally it contains whatever - AC_REPLACE_FUNCS detects). This happens on uclibc. - - Since Makefile.am have a hardcoded LDADD to ../compat/libcompat.la things - goes bad when there is no libcompat.a at all. We solve this by checking - if LIBOBJS is set by AC_REPLACE_FUNCS and add libcompat via LTLIBCOMPAT. - - For alternative fixes see http://www.gnu.org/software/hello/manual/automake/LIBOBJS.html +If the libc provides all the funcs in libcompat the libcompat.a will +never be created due to LIBOBJS is empty (normally it contains whatever +AC_REPLACE_FUNCS detects). This happens on uclibc. + +Since Makefile.am have a hardcoded LDADD to ../compat/libcompat.la things +goes bad when there is no libcompat.a at all. We solve this by checking +if LIBOBJS is set by AC_REPLACE_FUNCS and add libcompat via LTLIBCOMPAT. + +For alternative fixes see http://www.gnu.org/software/hello/manual/automake/LIBOBJS.html +--- + bin/Makefile.am | 2 +- + configure.ac | 8 ++++++++ + modules/common.am | 2 +- + src/Makefile.am | 4 ++-- + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am -index 92e6879..a941d99 100644 +index 19dfb57..9214016 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -60,5 +60,5 @@ vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc @@ -26,10 +32,10 @@ index 92e6879..a941d99 100644 + $(LTLIBCOMPAT) \ ../src/libvlc.la ../src/libvlccore.la diff --git a/configure.ac b/configure.ac -index 52e4830..b385100 100644 +index f216fa4..3997a85 100644 --- a/configure.ac +++ b/configure.ac -@@ -547,6 +547,14 @@ need_libc=false +@@ -557,6 +557,14 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale]) AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf]) @@ -45,10 +51,10 @@ index 52e4830..b385100 100644 [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) diff --git a/modules/common.am b/modules/common.am -index 5e4d65f..9e2c739 100644 +index ac88493..a117cc4 100644 --- a/modules/common.am +++ b/modules/common.am -@@ -24,7 +24,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ +@@ -25,7 +25,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ -no-undefined \ `$(VLC_CONFIG) --ldflags plugin $@` AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \ @@ -58,19 +64,19 @@ index 5e4d65f..9e2c739 100644 include $(srcdir)/Modules.am diff --git a/src/Makefile.am b/src/Makefile.am -index f46a154..6aad884 100644 +index a8ab729..01c5158 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -201,7 +201,7 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ +@@ -204,7 +204,7 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ -export-symbols $(srcdir)/libvlccore.sym \ - -version-info 5:0:0 + -version-info 4:3:0 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \ - $(LTLIBINTL) ../compat/libcompat.la + $(LTLIBINTL) $(LTLIBCOMPAT) libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -@@ -214,7 +214,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc +@@ -217,7 +217,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc libvlc_la_SOURCES = $(SOURCES_libvlc_control) nodist_libvlc_la_SOURCES = revision.c libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \ @@ -78,4 +84,7 @@ index f46a154..6aad884 100644 + libvlccore.la $(LTLIBCOMPAT) libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \ - -version-info 6:0:1 \ + -version-info 7:1:2 \ +-- +1.7.7.1 + diff --git a/main/vlc/vlc.initd b/main/vlc/vlc.initd index 2c431c90f04..3616158602f 100755 --- a/main/vlc/vlc.initd +++ b/main/vlc/vlc.initd @@ -7,7 +7,7 @@ depend() { start() { ebegin "Starting VLC" start-stop-daemon --start --oknodo \ - --pidfile /var/run/vlc.pid --chuid vlc \ + --pidfile /var/run/vlc.pid --user vlc \ --exec /usr/bin/vlc -- ${VLC_OPTS} eend $? } diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 591672b6612..ca533315a9f 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine pkgver=1.3.31 -pkgrel=0 +pkgrel=1 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" arch="x86" diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD index b983286e02a..751e8b0690f 100644 --- a/main/x264/APKBUILD +++ b/main/x264/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=x264 -pkgver=20110621 +pkgver=20111001 pkgrel=0 pkgdesc="free library for encoding H264/AVC video streams" url="http://www.videolan.org/developers/x264.html" @@ -25,4 +25,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 } -md5sums="cecaaab3265cbdc46cc89920742d7339 x264-snapshot-20110621-2245-stable.tar.bz2" +md5sums="78a5a6fea4cafac6d9863b19bffc119f x264-snapshot-20111001-2245-stable.tar.bz2" diff --git a/main/xdriinfo/APKBUILD b/main/xdriinfo/APKBUILD index 0d77f1d6c1f..5366c30e482 100644 --- a/main/xdriinfo/APKBUILD +++ b/main/xdriinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdriinfo pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="query configuration information of DRI drivers" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index cf179749db5..b427fbd3740 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xen pkgver=4.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Xen hypervisor" url="http://www.xen.org/" license="GPL" diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD index 52be1face6a..1af4efcb009 100644 --- a/main/xf86-video-ati/APKBUILD +++ b/main/xf86-video-ati/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ati pkgver=6.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="ATI video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD index e863283d51f..575b2cc1080 100644 --- a/main/xf86-video-glint/APKBUILD +++ b/main/xf86-video-glint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-glint pkgver=1.2.6 -pkgrel=0 +pkgrel=1 pkgdesc="GLINT/Permedia video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD index 862a36563af..a839df8e10c 100644 --- a/main/xf86-video-intel/APKBUILD +++ b/main/xf86-video-intel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-intel pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD index 668b6bb24d5..c809ad3d71b 100644 --- a/main/xf86-video-mach64/APKBUILD +++ b/main/xf86-video-mach64/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-mach64 pkgver=6.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="ATI Mach64 video driver" url="http://xorg.freedesktop.org/" arch="" diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD index e0fb9f5630a..fcbff2b7ff6 100644 --- a/main/xf86-video-openchrome/APKBUILD +++ b/main/xf86-video-openchrome/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-openchrome pkgver=0.2.904 -pkgrel=9 +pkgrel=10 pkgdesc="X.Org driver for VIA/S3G cards" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD index 4989c3276d4..9d84166aebb 100644 --- a/main/xf86-video-r128/APKBUILD +++ b/main/xf86-video-r128/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-r128 pkgver=6.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="ATI Rage128 video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD index 3990fa36b8c..3bdf1c628c7 100644 --- a/main/xf86-video-savage/APKBUILD +++ b/main/xf86-video-savage/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-savage pkgver=2.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="S3 Savage video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD index c392c861204..ea0c9ffde33 100644 --- a/main/xf86-video-sis/APKBUILD +++ b/main/xf86-video-sis/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-sis pkgver=0.10.3 -pkgrel=3 +pkgrel=4 pkgdesc="X.org SiS video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD index 8dde3a5a082..4b62d7297c6 100644 --- a/main/xf86-video-tdfx/APKBUILD +++ b/main/xf86-video-tdfx/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-tdfx pkgver=1.4.3 -pkgrel=5 +pkgrel=6 pkgdesc="3Dfx video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD index 3cdb65ae65a..02103e53d8c 100644 --- a/main/xfce4-notes-plugin/APKBUILD +++ b/main/xfce4-notes-plugin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-notes-plugin pkgver=1.7.7 -pkgrel=2 +pkgrel=3 pkgdesc="Notes plugin for the Xfce4 desktop" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" arch="all" @@ -10,7 +10,7 @@ license="GPL" depends= makedepends="xfce4-panel-dev libunique-dev libxfcegui4-dev" install= -subpackages= +subpackages="$pkgname-lang" source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver diff --git a/main/xfce4-xkb-plugin/APKBUILD b/main/xfce4-xkb-plugin/APKBUILD index 8f05a7f1e30..8103045766b 100644 --- a/main/xfce4-xkb-plugin/APKBUILD +++ b/main/xfce4-xkb-plugin/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.4.1 +pkgver=0.5.4.2 _maj=${pkgver%%.*} _min=${pkgver#${_maj}.} _min=${_min%%.*} @@ -10,7 +10,7 @@ pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" arch="all" license="custom" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang" depends= makedepends="xfce4-panel-dev libxklavier-dev librsvg-dev intltool libwnck-dev libxi-dev libxkbfile-dev libsm-dev libgsf-dev e2fsprogs-dev bzip2-dev libxfce4ui-dev" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="8512c0b180004e1150d8c05255c202d8 xfce4-xkb-plugin-0.5.4.1.tar.bz2" +md5sums="b79f7c65f8155cb77d99dcf9716bb38b xfce4-xkb-plugin-0.5.4.2.tar.bz2" diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 67ee0e1d0b8..1d7d5b963de 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.11.1 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD index 002c9f1e1f7..701ff3d26cc 100644 --- a/main/xscreensaver/APKBUILD +++ b/main/xscreensaver/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xscreensaver pkgver=5.15 -pkgrel=0 +pkgrel=2 pkgdesc="screensavers for X11 environment" url="http://www.jwz.org/xscreensaver/" license="GPL" depends="bc" makedepends="gtk+-dev jpeg-dev mesa-dev gettext-dev libxmu-dev perl-dev - libxml2-dev libglade-dev" + libxml2-dev libglade-dev libxinerama-dev libxrandr-dev" install= subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang" source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz" @@ -30,6 +30,9 @@ build() { --infodir=/usr/share/info \ --with-gtk \ --libexecdir=$_libexecdir \ + --with-xinerama-ext \ + --with-xf86vmode-ext \ + --with-randr-ext \ || return 1 make || return 1 } diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index bdc4e3b87ca..f37c076f204 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -13,7 +13,7 @@ _kpkgrel=$pkgrel pkgname=${_realname}-${_flavor} pkgver=${pkgver} _realver=1.37 -_mypkgrel=2 +_mypkgrel=0 pkgrel=$(($_kpkgrel + $_mypkgrel)) pkgdesc="Iptables extensions kernel modules" url="http://xtables-addons.sourceforge.net/" diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 8be015f2c67..d912821112c 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -3,7 +3,7 @@ pkgname=xulrunner pkgver=7.0.1 _ffoxver=7.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" arch="all" diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD index e793a5c8462..e94651055cb 100644 --- a/main/znc/APKBUILD +++ b/main/znc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=znc -pkgver=0.098 -pkgrel=2 +pkgver=0.202 +pkgrel=0 pkgdesc="An advanced IRC bouncer" url="http://znc.in" arch="all" @@ -26,7 +26,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - aclocal && autoconf || return 1 + aclocal -I m4 && autoconf || return 1 } build() { @@ -105,5 +105,5 @@ modperl() { _mv_mod modperl modperl.so } -md5sums="5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz -90b3493803bf7a3aa224e6cbbd644bdf libiconv.patch" +md5sums="3c6ff4620e139e3d9745cd53111bab20 znc-0.202.tar.gz +c0c8a4372b79a52a287923240f24c644 libiconv.patch" diff --git a/main/znc/libiconv.patch b/main/znc/libiconv.patch index 0af3a210481..276fbcfd8c1 100644 --- a/main/znc/libiconv.patch +++ b/main/znc/libiconv.patch @@ -1,6 +1,8 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -419,7 +419,12 @@ +diff --git a/configure.ac b/configure.ac +index 9131a01..47a2e37 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -458,7 +458,12 @@ fi if test x"$EXTRA" = "xyes" then AC_CHECK_FUNC( iconv, CHARSET=1 ) diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD index 72c3d7a1d5b..50f0530f184 100644 --- a/main/zsnes/APKBUILD +++ b/main/zsnes/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zsnes pkgver=1.51 -pkgrel=4 +pkgrel=5 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch="x86" diff --git a/testing/cgdb/APKBUILD b/testing/cgdb/APKBUILD new file mode 100644 index 00000000000..d3981d964bd --- /dev/null +++ b/testing/cgdb/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Harry +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> + +pkgname=cgdb +pkgver=0.6.6 +pkgrel=0 +pkgdesc="The Curses Debugger" +arch="all" +license=GPL +url="http://cgdb.sourceforge.net/" +depends="ncurses-dev readline-dev gdb" +source="http://downloads.sourceforge.net/project/cgdb/cgdb/cgdb-$pkgver/cgdb-$pkgver.tar.gz" +subpackages="$pkgname-doc" + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libdir=/usr/lib || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install \ + pkgconfigdir="/usr/lib/pkgconfig" \ + DESTDIR="$pkgdir" || return 1 + mkdir -p "$pkgdir"/usr/share/doc + mv "$pkgdir"/usr/share/cgdb "$pkgdir"/usr/share/doc/ +} + +md5sums="394b542b495755ab8392b7e88dace744 cgdb-0.6.6.tar.gz" + + diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD new file mode 100644 index 00000000000..6a5879abce0 --- /dev/null +++ b/testing/exim/APKBUILD @@ -0,0 +1,83 @@ +# Contributor: Jesse Young <jlyo@jlyo.org> +# Maintainer: Jesse Young <jlyo@jlyo.org> +pkgname=exim +pkgver=4.77 +pkgrel=1 +pkgdesc="A Message Transfer Agent" +url="http://www.exim.org/" +arch="all" +license="GPL" +depends="openssl" +depends_dev="db-dev pcre-dev openssl-dev" +makedepends="$depends_dev" +install= +subpackages="$pkgname-doc" +source="ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2 + exim.Makefile + exim.confd + exim.initd + exim.logrotate + aliases" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here + cp "$srcdir/$pkgname.Makefile" Local/Makefile + sed -e 's/^LIBS = -lnsl/LIBS =/g' \ + -e 's/^HAVE_ICONV=yes/#HAVE_ICONV=yes/' \ + -i OS/Makefile-Linux +} + +build() { + cd "$_builddir" + # do not build parallel + export MAKEFLAGS=-j1 + make makefile + make || { + cd build-Linux-* + sh ../scripts/Configure-config.h "make" + } && make || return 1 +} + +package() { + cd "$_builddir" + + install -D -m644 ../${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 + mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ + ${pkgdir}/var/log/exim ${pkgdir}/usr/lib \ + ${pkgdir}/var/log/exim ${pkgdir}/usr/sbin + chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim + cd build-Linux-* + for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ + exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ + exim_fixdb eximstats exinext exiqgrep exiwhat; do + install -m 0755 "$i" "$pkgdir/usr/sbin" + done + + cd "$srcdir/exim-$pkgver/src" + sed -e "s|/etc/aliases|/etc/mail/aliases|g" \ + -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \ + >"$pkgdir/etc/mail/exim.conf" + + cp "$srcdir/aliases" "$pkgdir/etc/mail" + cd "$pkgdir/usr/sbin" + for i in mailq rmail rsmtp runq sendmail; do + ln -s exim "$i" + done + # fhs compliancy + ln -s ../sbin/exim ../lib/sendmail + + # remove the 2 lines below (and this) if there is no init.d script + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="5d746275f2cc85845567f9d5eb84a57a exim-4.77.tar.bz2 +7dfc9ed9307db655c8aec33b9618608d exim.Makefile +f442b68d435598831bab8536ade071b8 exim.confd +2f6d768039d74caf433345cace4bc540 exim.initd +281ad020d1df8c6ed0f4ecb53c0fce63 exim.logrotate +eaec7a2a5f49b768fa168415ef0105fb aliases" diff --git a/testing/exim/aliases b/testing/exim/aliases new file mode 100644 index 00000000000..3f76693d0bf --- /dev/null +++ b/testing/exim/aliases @@ -0,0 +1,35 @@ +# +# /etc/mail/aliases +# +# NOTE: Make sure you run 'newaliases' after modifying this file +# + +# Basic system aliases -- these MUST be present. +MAILER-DAEMON: postmaster +postmaster: root +hostmaster: root +webmaster: hostmaster +ftpmaster: hostmaster +admin: hostmaster +administrator: hostmaster + +# General redirections for pseudo accounts. +bin: root +daemon: root +games: root +ingres: root +nobody: root +system: root +toor: root +uucp: root + +# Well-known aliases. +manager: root +dumper: root +operator: root + +# trap decode to catch security attacks +decode: root + +# Person who should get root's mail +#root: diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile new file mode 100644 index 00000000000..a7ec877f9a9 --- /dev/null +++ b/testing/exim/exim.Makefile @@ -0,0 +1,1227 @@ +# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ + +################################################## +# The Exim mail transport agent # +################################################## + +# This is the template for Exim's main build-time configuration file. It +# contains settings that are independent of any operating system. These are +# things that are mostly sysadmin choices. The items below are divided into +# those you must specify, those you probably want to specify, those you might +# often want to specify, and those that you almost never need to mention. + +# Edit this file and save the result to a file called Local/Makefile within the +# Exim distribution directory before running the "make" command. + +# Things that depend on the operating system have default settings in +# OS/Makefile-Default, but these are overridden for some OS by files called +# called OS/Makefile-<osname>. You can further override these by creating files +# called Local/Makefile-<osname>, where "<osname>" stands for the name of your +# operating system - look at the names in the OS directory to see which names +# are recognized. + +# However, if you are building Exim for a single OS only, you don't need to +# worry about setting up Local/Makefile-<osname>. Any build-time configuration +# settings you require can in fact be placed in the one file called +# Local/Makefile. It is only if you are building for several OS from the same +# source files that you need to worry about splitting off your own OS-dependent +# settings into separate files. (There's more explanation about how this all +# works in the toplevel README file, under "Modifying the building process", as +# well as in the Exim specification.) + +# One OS-specific thing that may need to be changed is the command for running +# the C compiler; the overall default is gcc, but some OS Makefiles specify cc. +# You can override anything that is set by putting CC=whatever in your +# Local/Makefile. + +# NOTE: You should never need to edit any of the distributed Makefiles; all +# overriding can be done in your Local/Makefile(s). This will make it easier +# for you when the next release comes along. + +# The location of the X11 libraries is something else that is quite variable +# even between different versions of the same operating system (and indeed +# there are different versions of X11 as well, of course). The four settings +# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB +# (dynamic run-time library). You need not worry about X11 unless you want to +# compile the Exim monitor utility. Exim itself does not use X11. + +# Another area of variability between systems is the type and location of the +# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. +# By default the code assumes ndbm; this often works with gdbm or DB, provided +# they are correctly installed, via their compatibility interfaces. However, +# Exim can also be configured to use the native calls for Berkeley DB (obsolete +# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm. + +# For some operating systems, a default DBM library (other than ndbm) is +# selected by a setting in the OS-specific Makefile. Most modern OS now have +# a DBM library installed as standard, and in many cases this will be selected +# for you by the OS-specific configuration. If Exim compiles without any +# problems, you probably do not have to worry about the DBM library. If you +# do want or need to change it, you should first read the discussion in the +# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's +# interface to the DBM library. + +# In Local/Makefiles blank lines and lines starting with # are ignored. It is +# also permitted to use the # character to add a comment to a setting, for +# example +# +# EXIM_GID=42 # the "mail" group +# +# However, with some versions of "make" this works only if there is no white +# space between the end of the setting and the #, so perhaps it is best +# avoided. A consequence of this facility is that it is not possible to have +# the # character present in any setting, but I can't think of any cases where +# this would be wanted. +############################################################################### + + + +############################################################################### +# THESE ARE THINGS YOU MUST SPECIFY # +############################################################################### + +# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and +# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number. + +# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it +# really is a very good idea to specify it here rather than at run time. This +# is particularly true if you let the logs go to their default location in the +# spool directory, because it means that the location of the logs is known +# before Exim has read the run time configuration file. + +#------------------------------------------------------------------------------ +# BIN_DIRECTORY defines where the exim binary will be installed by "make +# install". The path is also used internally by Exim when it needs to re-invoke +# itself, either to send an error message, or to recover root privilege. Exim's +# utility binaries and scripts are also installed in this directory. There is +# no "standard" place for the binary directory. Some people like to keep all +# the Exim files under one directory such as /usr/exim; others just let the +# Exim binaries go into an existing directory such as /usr/sbin or +# /usr/local/sbin. The installation script will try to create this directory, +# and any superior directories, if they do not exist. + +BIN_DIRECTORY=/usr/sbin + + +#------------------------------------------------------------------------------ +# CONFIGURE_FILE defines where Exim's run time configuration file is to be +# found. It is the complete pathname for the file, not just a directory. The +# location of all other run time files and directories can be changed in the +# run time configuration file. There is a lot of variety in the choice of +# location in different OS, and in the preferences of different sysadmins. Some +# common locations are in /etc or /etc/mail or /usr/local/etc or +# /usr/local/etc/mail. Another possibility is to keep all the Exim files under +# a single directory such as /usr/exim. Whatever you choose, the installation +# script will try to make the directory and any superior directories if they +# don't exist. It will also install a default runtime configuration if this +# file does not exist. + +CONFIGURE_FILE=/etc/mail/exim.conf + +# It is possible to specify a colon-separated list of files for CONFIGURE_FILE. +# In this case, Exim will use the first of them that exists when it is run. +# However, if a list is specified, the installation script no longer tries to +# make superior directories or to install a default runtime configuration. + + +#------------------------------------------------------------------------------ +# The Exim binary must normally be setuid root, so that it starts executing as +# root, but (depending on the options with which it is called) it does not +# always need to retain the root privilege. These settings define the user and +# group that is used for Exim processes when they no longer need to be root. In +# particular, this applies when receiving messages and when doing remote +# deliveries. (Local deliveries run as various non-root users, typically as the +# owner of a local mailbox.) Specifying these values as root is not supported. + +EXIM_USER=ref:exim + +# If you specify EXIM_USER as a name, this is looked up at build time, and the +# uid number is built into the binary. However, you can specify that this +# lookup is deferred until runtime. In this case, it is the name that is built +# into the binary. You can do this by a setting of the form: + +# EXIM_USER=ref:exim + +# In other words, put "ref:" in front of the user name. If you set EXIM_USER +# like this, any value specified for EXIM_GROUP is also passed "by reference". +# Although this costs a bit of resource at runtime, it is convenient to use +# this feature when building binaries that are to be run on multiple systems +# where the name may refer to different uids. It also allows you to build Exim +# on a system where there is no Exim user defined. + +# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must +# also be a setting of EXIM_GROUP. If, on the other hand, you use a name +# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless +# you want to use a group other than the default group for the given user. + +# EXIM_GROUP= + +# Many sites define a user called "exim", with an appropriate default group, +# and use +# +# EXIM_USER=exim +# +# while leaving EXIM_GROUP unspecified (commented out). + + +#------------------------------------------------------------------------------ +# SPOOL_DIRECTORY defines the directory where all the data for messages in +# transit is kept. It is strongly recommended that you define it here, though +# it is possible to leave this till the run time configuration. + +# Exim creates the spool directory if it does not exist. The owner and group +# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to +# all the files and directories that are created in the spool directory. + +# Almost all installations choose this: + +SPOOL_DIRECTORY=/var/spool/exim + + + +############################################################################### +# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # +############################################################################### + +# If you need extra header file search paths on all compiles, put the -I +# options in INCLUDE. If you want the extra searches only for certain +# parts of the build, see more specific xxx_INCLUDE variables below. + +# INCLUDE=-I/example/include + +# You need to specify some routers and transports if you want the Exim that you +# are building to be capable of delivering mail. You almost certainly need at +# least one type of lookup. You should consider whether you want to build +# the Exim monitor or not. + + +#------------------------------------------------------------------------------ +# These settings determine which individual router drivers are included in the +# Exim binary. There are no defaults in the code; those routers that are wanted +# must be defined here by setting the appropriate variables to the value "yes". +# Including a router in the binary does not cause it to be used automatically. +# It has also to be configured in the run time configuration file. By +# commenting out those you know you don't want to use, you can make the binary +# a bit smaller. If you are unsure, leave all of these included for now. + +ROUTER_ACCEPT=yes +ROUTER_DNSLOOKUP=yes +ROUTER_IPLITERAL=yes +ROUTER_MANUALROUTE=yes +ROUTER_QUERYPROGRAM=yes +ROUTER_REDIRECT=yes + +# This one is very special-purpose, so is not included by default. + +# ROUTER_IPLOOKUP=yes + + +#------------------------------------------------------------------------------ +# These settings determine which individual transport drivers are included in +# the Exim binary. There are no defaults; those transports that are wanted must +# be defined here by setting the appropriate variables to the value "yes". +# Including a transport in the binary does not cause it to be used +# automatically. It has also to be configured in the run time configuration +# file. By commenting out those you know you don't want to use, you can make +# the binary a bit smaller. If you are unsure, leave all of these included for +# now. + +TRANSPORT_APPENDFILE=yes +TRANSPORT_AUTOREPLY=yes +TRANSPORT_PIPE=yes +TRANSPORT_SMTP=yes + +# This one is special-purpose, and commonly not required, so it is not +# included by default. + +TRANSPORT_LMTP=yes + + +#------------------------------------------------------------------------------ +# The appendfile transport can write messages to local mailboxes in a number +# of formats. The code for three specialist formats, maildir, mailstore, and +# MBX, is included only when requested. If you do not know what this is about, +# leave these settings commented out. + +SUPPORT_MAILDIR=yes +# SUPPORT_MAILSTORE=yes +# SUPPORT_MBX=yes + + +#------------------------------------------------------------------------------ +# See below for dynamic lookup modules. +# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ +# If not using package management but using this anyway, then think about how +# you perform upgrades and revert them. You should consider the benefit of +# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can +# maintain two concurrent sets of modules. + +# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for +# your platform. Eg: +# CFLAGS_DYNAMIC=-shared -rdynamic +# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC + +#------------------------------------------------------------------------------ +# These settings determine which file and database lookup methods are included +# in the binary. See the manual chapter entitled "File and database lookups" +# for discussion. DBM and lsearch (linear search) are included by default. If +# you are unsure about the others, leave them commented out for now. +# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is +# for the specialist case of using the DNS as a general database facility (not +# common). +# If set to "2" instead of "yes" then the corresponding lookup will be +# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to +# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to +# EXTRALIBS so that dlopen() is available to Exim. You need to define +# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup +# modules. +# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and +# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS +# (where * is the name as given here in this list). That ensures that only +# the dynamic library and not the exim binary will be linked against the +# library. +# NOTE: LDAP cannot be built as a module! + +LOOKUP_DBM=yes +LOOKUP_LSEARCH=yes +LOOKUP_DNSDB=yes + +# LOOKUP_CDB=yes +LOOKUP_DSEARCH=yes +# LOOKUP_IBASE=yes +# LOOKUP_LDAP=yes +# LOOKUP_MYSQL=yes +# LOOKUP_NIS=yes +# LOOKUP_NISPLUS=yes +# LOOKUP_ORACLE=yes +# LOOKUP_PASSWD=yes +# LOOKUP_PGSQL=yes +# LOOKUP_SQLITE=yes +# LOOKUP_WHOSON=yes + +# These two settings are obsolete; all three lookups are compiled when +# LOOKUP_LSEARCH is enabled. However, we retain these for backward +# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. + +# LOOKUP_WILDLSEARCH=yes +# LOOKUP_NWILDLSEARCH=yes + + +#------------------------------------------------------------------------------ +# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate +# which LDAP library you have. Unfortunately, though most of their functions +# are the same, there are minor differences. Currently Exim knows about four +# LDAP libraries: the one from the University of Michigan (also known as +# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes +# with Solaris 7 onwards. Uncomment whichever of these you are using. + +# LDAP_LIB_TYPE=OPENLDAP1 +# LDAP_LIB_TYPE=OPENLDAP2 +# LDAP_LIB_TYPE=NETSCAPE +# LDAP_LIB_TYPE=SOLARIS + +# If you don't set any of these, Exim assumes the original University of +# Michigan (OpenLDAP 1) library. + + +#------------------------------------------------------------------------------ +# The PCRE library is required for exim. There is no longer an embedded +# version of the PCRE library included with the source code, instead you +# must use a system library or build your own copy of PCRE. +# In either case you must specify the library link info here. If the +# PCRE header files are not in the standard search path you must also +# modify the INCLUDE path (above) +# The default setting of PCRE_LIBS should work on the vast majority of +# systems + +PCRE_LIBS=-lpcre + + +#------------------------------------------------------------------------------ +# Additional libraries and include directories may be required for some +# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on +# the command for linking Exim itself, not on any auxiliary programs. You +# don't need to set LOOKUP_INCLUDE if the relevant directories are already +# specified in INCLUDE. The settings below are just examples; -lpq is for +# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. + +# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include +# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 + + +#------------------------------------------------------------------------------ +# Compiling the Exim monitor: If you want to compile the Exim monitor, a +# program that requires an X11 display, then EXIM_MONITOR should be set to the +# value "eximon.bin". Comment out this setting to disable compilation of the +# monitor. The locations of various X11 directories for libraries and include +# files are defaulted in the OS/Makefile-Default file, but can be overridden in +# local OS-specific make files. + + + + +#------------------------------------------------------------------------------ +# Compiling Exim with content scanning support: If you want to compile Exim +# with support for message body content scanning, set WITH_CONTENT_SCAN to +# the value "yes". This will give you malware and spam scanning in the DATA ACL, +# and the MIME ACL. Please read the documentation to learn more about these +# features. + +WITH_CONTENT_SCAN=yes + +# If you want to use the deprecated "demime" condition in the DATA ACL, +# uncomment the line below. Doing so will also explicitly turn on the +# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of +# the "demime" condition. + +WITH_OLD_DEMIME=yes + +# If you're using ClamAV and are backporting fixes to an old version, instead +# of staying current (which is the more usual approach) then you may need to +# use an older API which uses a STREAM command, now deprecated, instead of +# zINSTREAM. If you need to set this, please let the Exim developers know, as +# if nobody reports a need for it, we'll remove this option and clean up the +# code. zINSTREAM was introduced with ClamAV 0.95. +# +# WITH_OLD_CLAMAV_STREAM=yes + +#------------------------------------------------------------------------------ +# By default Exim includes code to support DKIM (DomainKeys Identified +# Mail, RFC4871) signing and verification. Verification of signatures is +# turned on by default. See the spec for information on conditionally +# disabling it. To disable the inclusion of the entire feature, set +# DISABLE_DKIM to "yes" + +# DISABLE_DKIM=yes + + +#------------------------------------------------------------------------------ +# Compiling Exim with experimental features. These are documented in +# experimental-spec.txt. "Experimental" means that the way these features are +# implemented may still change. Backward compatibility is not guaranteed. + +# Uncomment the following lines to add SPF support. You need to have libspf2 +# installed on your system (www.libspf2.org). Depending on where it is installed +# you may have to edit the CFLAGS and LDFLAGS lines. + +# EXPERIMENTAL_SPF=yes +# CFLAGS += -I/usr/local/include +# LDFLAGS += -lspf2 + +# Uncomment the following lines to add SRS (Sender rewriting scheme) support. +# You need to have libsrs_alt installed on your system (srs.mirtol.com). +# Depending on where it is installed you may have to edit the CFLAGS and +# LDFLAGS lines. + +# EXPERIMENTAL_SRS=yes +# CFLAGS += -I/usr/local/include +# LDFLAGS += -lsrs_alt + +# Uncomment the following lines to add Brightmail AntiSpam support. You need +# to have the Brightmail client SDK installed. Please check the experimental +# documentation for implementation details. You need to edit the CFLAGS and +# LDFLAGS lines. + +# EXPERIMENTAL_BRIGHTMAIL=yes +# CFLAGS += -I/opt/brightmail/bsdk-6.0/include +# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib + + + +############################################################################### +# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # +############################################################################### + +# The items in this section are those that are commonly changed according to +# the sysadmin's preferences, but whose defaults are often acceptable. The +# first five are concerned with security issues, where differing levels of +# paranoia are appropriate in different environments. Sysadmins also vary in +# their views on appropriate levels of defence in these areas. If you do not +# understand these issues, go with the defaults, which are used by many sites. + + +#------------------------------------------------------------------------------ +# Although Exim is normally a setuid program, owned by root, it refuses to run +# local deliveries as root by default. There is a runtime option called +# "never_users" which lists the users that must never be used for local +# deliveries. There is also the setting below, which provides a list that +# cannot be overridden at runtime. This guards against problems caused by +# unauthorized changes to the runtime configuration. You are advised not to +# remove "root" from this option, but you can add other users if you want. The +# list is colon-separated. It must NOT contain any spaces. + +# FIXED_NEVER_USERS=root:bin:daemon +FIXED_NEVER_USERS=root + + +#------------------------------------------------------------------------------ +# By default, Exim insists that its configuration file be owned by root. You +# can specify one additional permitted owner here. + +# CONFIGURE_OWNER= + +# If the configuration file is group-writeable, Exim insists by default that it +# is owned by root. You can specify one additional permitted group owner here. + +# CONFIGURE_GROUP= + +# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked +# up at build time, and the uid or gid number is built into the binary. +# However, you can specify that the lookup is deferred until runtime. In this +# case, it is the name that is built into the binary. You can do this by a +# setting of the form: + +# CONFIGURE_OWNER=ref:mail +# CONFIGURE_GROUP=ref:sysadmin + +# In other words, put "ref:" in front of the user or group name. Although this +# costs a bit of resource at runtime, it is convenient to use this feature when +# building binaries that are to be run on multiple systems where the names may +# refer to different uids or gids. It also allows you to build Exim on a system +# where the relevant user or group is not defined. + + +#------------------------------------------------------------------------------ +# The -C option allows Exim to be run with an alternate runtime configuration +# file. When this is used by root, root privilege is retained by the binary +# (for any other caller including the Exim user, it is dropped). You can +# restrict the location of alternate configurations by defining a prefix below. +# Any file used with -C must then start with this prefix (except that /dev/null +# is also permitted if the caller is root, because that is used in the install +# script). If the prefix specifies a directory that is owned by root, a +# compromise of the Exim account does not permit arbitrary alternate +# configurations to be used. The prefix can be more restrictive than just a +# directory (the second example). + +# ALT_CONFIG_PREFIX=/some/directory/ +# ALT_CONFIG_PREFIX=/some/directory/exim.conf- + + +#------------------------------------------------------------------------------ +# When a user other than root uses the -C option to override the configuration +# file (including the Exim user when re-executing Exim to regain root +# privileges for local message delivery), this will normally cause Exim to +# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which +# contains a list of trusted configuration filenames, one per line. If the -C +# option is used by the Exim user or by the user specified in the +# CONFIGURE_OWNER setting, to specify a configuration file which is listed in +# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. + +# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs + + +#------------------------------------------------------------------------------ +# Uncommenting this option disables the use of the -D command line option, +# which changes the values of macros in the runtime configuration file. +# This is another protection against somebody breaking into the Exim account. + +# DISABLE_D_OPTION=yes + + +#------------------------------------------------------------------------------ +# By contrast, you might be maintaining a system which relies upon the ability +# to override values with -D and assumes that these will be passed through to +# the delivery processes. As of Exim 4.73, this is no longer the case by +# default. Going forward, we strongly recommend that you use a shim Exim +# configuration file owned by root stored under TRUSTED_CONFIG_LIST. +# That shim can set macros before .include'ing your main configuration file. +# +# As a strictly transient measure to ease migration to 4.73, the +# WHITELIST_D_MACROS value definies a colon-separated list of macro-names +# which are permitted to be overridden from the command-line which will be +# honoured by the Exim user. So these are macros that can persist to delivery +# time. +# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the +# command-line are filtered to only permit: [A-Za-z0-9_/.-]* +# +# This option is highly likely to be removed in a future release. It exists +# only to make 4.73 as easy as possible to migrate to. If you use it, we +# encourage you to schedule time to rework your configuration to not depend +# upon it. Most people should not need to use this. +# +# By default, no macros are whitelisted for -D usage. + +# WHITELIST_D_MACROS=TLS:SPOOL + +#------------------------------------------------------------------------------ +# Exim has support for the AUTH (authentication) extension of the SMTP +# protocol, as defined by RFC 2554. If you don't know what SMTP authentication +# is, you probably won't want to include this code, so you should leave these +# settings commented out. If you do want to make use of SMTP authentication, +# you must uncomment at least one of the following, so that appropriate code is +# included in the Exim binary. You will then need to set up the run time +# configuration to make use of the mechanism(s) selected. + +AUTH_CRAM_MD5=yes +# AUTH_CYRUS_SASL=yes +AUTH_DOVECOT=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes + + +#------------------------------------------------------------------------------ +# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the +# Cyrus SASL library installed before trying to build Exim, and you probably +# want to uncomment the following line: + +# AUTH_LIBS=-lsasl2 + + +#------------------------------------------------------------------------------ +# When Exim is decoding MIME "words" in header lines, most commonly for use +# in the $header_xxx expansion, it converts any foreign character sets to the +# one that is set in the headers_charset option. The default setting is +# defined by this setting: + +HEADERS_CHARSET="ISO-8859-1" + +# If you are going to make use of $header_xxx expansions in your configuration +# file, or if your users are going to use them in filter files, and the normal +# character set on your host is something other than ISO-8859-1, you might +# like to specify a different default here. This value can be overridden in +# the runtime configuration, and it can also be overridden in individual filter +# files. +# +# IMPORTANT NOTE: The iconv() function is needed for character code +# conversions. Please see the next item... + + +#------------------------------------------------------------------------------ +# Character code conversions are possible only if the iconv() function is +# installed on your operating system. There are two places in Exim where this +# is relevant: (a) The $header_xxx expansion (see the previous item), and (b) +# the Sieve filter support. For those OS where iconv() is known to be installed +# as standard, the file in OS/Makefile-xxxx contains +# +# HAVE_ICONV=yes +# +# If you are not using one of those systems, but have installed iconv(), you +# need to uncomment that line above. In some cases, you may find that iconv() +# and its header file are not in the default places. You might need to use +# something like this: +# +# HAVE_ICONV=yes +# CFLAGS=-O -I/usr/local/include +# EXTRALIBS_EXIM=-L/usr/local/lib -liconv +# +# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM +# as well. + + +#------------------------------------------------------------------------------ +# The passwords for user accounts are normally encrypted with the crypt() +# function. Comparisons with encrypted passwords can be done using Exim's +# "crypteq" expansion operator. (This is commonly used as part of the +# configuration of an authenticator for use with SMTP AUTH.) At least one +# operating system has an extended function called crypt16(), which uses up to +# 16 characters of a password (the normal crypt() uses only the first 8). Exim +# supports the use of crypt16() as well as crypt() but note the warning below. + +# You can always indicate a crypt16-encrypted password by preceding it with +# "{crypt16}". If you want the default handling (without any preceding +# indicator) to use crypt16(), uncomment the following line: + +# DEFAULT_CRYPT=crypt16 + +# If you do that, you can still access the basic crypt() function by preceding +# an encrypted password with "{crypt}". For more details, see the description +# of the "crypteq" condition in the manual chapter on string expansions. + +# Some operating systems do not include a crypt16() function, so Exim has one +# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will +# be set in an OS-specific Makefile for the OS that have such a function, so +# you should not need to bother with it. + +# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** +# It turns out that the above is not entirely accurate. As well as crypt16() +# there is a function called bigcrypt() that some operating systems have. This +# may or may not use the same algorithm, and both of them may be different to +# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined. +# +# However, since there is now a move away from the traditional crypt() +# functions towards using SHA1 and other algorithms, tidying up this area of +# Exim is seen as very low priority. In practice, if you need to, you can +# define DEFAULT_CRYPT to the name of any function that has the same interface +# as the traditional crypt() function. +# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** + + +#------------------------------------------------------------------------------ +# Exim can be built to support the SMTP STARTTLS command, which implements +# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you +# must install the OpenSSL library package or the GnuTLS library. Exim contains +# no cryptographic code of its own. Uncomment the following lines if you want +# to build Exim with TLS support. If you don't know what this is all about, +# leave these settings commented out. + +# This setting is required for any TLS support (either OpenSSL or GnuTLS) +SUPPORT_TLS=yes + +# Uncomment this setting if you are using OpenSSL +TLS_LIBS=-lssl -lcrypto + +# Uncomment these settings if you are using GnuTLS +# USE_GNUTLS=yes +# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt + +# If you are running Exim as a server, note that just building it with TLS +# support is not all you need to do. You also need to set up a suitable +# certificate, and tell Exim about it by means of the tls_certificate +# and tls_privatekey run time options. You also need to set tls_advertise_hosts +# to specify the hosts to which Exim advertises TLS support. On the other hand, +# if you are running Exim only as a client, building it with TLS support +# is all you need to do. + +# Additional libraries and include files are required for both OpenSSL and +# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed +# with all your other libraries. If they are in a special directory, you may +# need something like + +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto +# or +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt + +# TLS_LIBS is included only on the command for linking Exim itself, not on any +# auxiliary programs. If the include files are not in a standard place, you can +# set TLS_INCLUDE to specify where they are, for example: + +# TLS_INCLUDE=-I/usr/local/openssl/include/ +# or +# TLS_INCLUDE=-I/opt/gnu/include + +# You don't need to set TLS_INCLUDE if the relevant directories are already +# specified in INCLUDE. + + +#------------------------------------------------------------------------------ +# The default distribution of Exim contains only the plain text form of the +# documentation. Other forms are available separately. If you want to install +# the documentation in "info" format, first fetch the Texinfo documentation +# sources from the ftp directory and unpack them, which should create files +# with the extension "texinfo" in the doc directory. You may find that the +# version number of the texinfo files is different to your Exim version number, +# because the main documentation isn't updated as often as the code. For +# example, if you have Exim version 4.43, the source tarball upacks into a +# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40. +# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you +# have unpacked them. Then set INFO_DIRECTORY to the location of your info +# directory. This varies from system to system, but is often /usr/share/info. +# Once you have done this, "make install" will build the info files and +# install them in the directory you have defined. + +# INFO_DIRECTORY=/usr/share/info + + +#------------------------------------------------------------------------------ +# Exim log directory and files: Exim creates several log files inside a +# single log directory. You can define the directory and the form of the +# log file name here. If you do not set anything, Exim creates a directory +# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses +# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change +# this, you can set LOG_FILE_PATH to a path name containing one occurrence of +# %s. This will be replaced by one of the strings "main", "panic", or "reject" +# to form the final file names. Some installations may want something like this: + +LOG_FILE_PATH=/var/log/exim/%slog + +# which results in files with names /var/log/exim_mainlog, etc. The directory +# in which the log files are placed must exist; Exim does not try to create +# it for itself. It is also your responsibility to ensure that Exim is capable +# of writing files using this path name. The Exim user (see EXIM_USER above) +# must be able to create and update files in the directory you have specified. + +# You can also configure Exim to use syslog, instead of or as well as log +# files, by settings such as these + +# LOG_FILE_PATH=syslog +# LOG_FILE_PATH=syslog:/var/log/exim_%slog + +# The first of these uses only syslog; the second uses syslog and also writes +# to log files. Do not include white space in such a setting as it messes up +# the building process. + + +#------------------------------------------------------------------------------ +# When logging to syslog, the following option caters for syslog replacements +# that are able to accept log entries longer than the 1024 characters allowed +# by RFC 3164. It is up to you to make sure your syslog daemon can handle this. +# Non-printable characters are usually unacceptable regardless, so log entries +# are still split on newline characters. + +# SYSLOG_LONG_LINES=yes + +# If you are not interested in the process identifier (pid) of the Exim that is +# making the call to syslog, then comment out the following line. + +SYSLOG_LOG_PID=yes + + +#------------------------------------------------------------------------------ +# Cycling log files: this variable specifies the maximum number of old +# log files that are kept by the exicyclog log-cycling script. You don't have +# to use exicyclog. If your operating system has other ways of cycling log +# files, you can use them instead. The exicyclog script isn't run by default; +# you have to set up a cron job for it if you want it. + +EXICYCLOG_MAX=10 + + +#------------------------------------------------------------------------------ +# The compress command is used by the exicyclog script to compress old log +# files. Both the name of the command and the suffix that it adds to files +# need to be defined here. See also the EXICYCLOG_MAX configuration. + +COMPRESS_COMMAND=/bin/gzip +COMPRESS_SUFFIX=gz + + +#------------------------------------------------------------------------------ +# If the exigrep utility is fed compressed log files, it tries to uncompress +# them using this command. + +ZCAT_COMMAND=/bin/zcat + + +#------------------------------------------------------------------------------ +# Compiling in support for embedded Perl: If you want to be able to +# use Perl code in Exim's string manipulation language and you have Perl +# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded +# Perl costs quite a lot of resources. Only do this if you really need it. + +# EXIM_PERL=perl.o + + +#------------------------------------------------------------------------------ +# Support for dynamically-loaded string expansion functions via ${dlfunc. If +# you are using gcc the dynamically-loaded object must be compiled with the +# -shared option, and you will need to add -export-dynamic to EXTRALIBS so +# that the local_scan API is made available by the linker. You may also need +# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. + +# EXPAND_DLFUNC=yes + + +#------------------------------------------------------------------------------ +# Exim has support for PAM (Pluggable Authentication Modules), a facility +# which is available in the latest releases of Solaris and in some GNU/Linux +# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim +# support, which is intended for use in conjunction with the SMTP AUTH +# facilities, is included only when requested by the following setting: + +# SUPPORT_PAM=yes + +# You probably need to add -lpam to EXTRALIBS, and in some releases of +# GNU/Linux -ldl is also needed. + + +#------------------------------------------------------------------------------ +# Support for authentication via Radius is also available. The Exim support, +# which is intended for use in conjunction with the SMTP AUTH facilities, +# is included only when requested by setting the following parameter to the +# location of your Radius configuration file: + +# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf +# RADIUS_CONFIG_FILE=/etc/radius.conf + +# If you have set RADIUS_CONFIG_FILE, you should also set one of these to +# indicate which RADIUS library is used: + +# RADIUS_LIB_TYPE=RADIUSCLIENT +# RADIUS_LIB_TYPE=RADIUSCLIENTNEW +# RADIUS_LIB_TYPE=RADLIB + +# RADIUSCLIENT is the radiusclient library; you probably need to add +# -lradiusclient to EXTRALIBS. +# +# The API for the radiusclient library was changed at release 0.4.0. +# Unfortunately, the header file does not define a version number that clients +# can use to support both the old and new APIs. If you are using version 0.4.0 +# or later of the radiusclient library, you should use RADIUSCLIENTNEW. +# +# RADLIB is the Radius library that comes with FreeBSD (the header file is +# called radlib.h); you probably need to add -lradius to EXTRALIBS. +# +# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library, +# using the original API. + + +#------------------------------------------------------------------------------ +# Support for authentication via the Cyrus SASL pwcheck daemon is available. +# Note, however, that pwcheck is now deprecated in favour of saslauthd (see +# next item). The Exim support for pwcheck, which is intented for use in +# conjunction with the SMTP AUTH facilities, is included only when requested by +# setting the following parameter to the location of the pwcheck daemon's +# socket. +# +# There is no need to install all of SASL on your system. You just need to run +# ./configure --with-pwcheck, cd to the pwcheck directory within the sources, +# make and make install. You must create the socket directory (default +# /var/pwcheck) and chown it to exim's user and group. Once you have installed +# pwcheck, you should arrange for it to be started by root at boot time. + +# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck + + +#------------------------------------------------------------------------------ +# Support for authentication via the Cyrus SASL saslauthd daemon is available. +# The Exim support, which is intented for use in conjunction with the SMTP AUTH +# facilities, is included only when requested by setting the following +# parameter to the location of the saslauthd daemon's socket. +# +# There is no need to install all of SASL on your system. You just need to run +# ./configure --with-saslauthd (and any other options you need, for example, to +# select or deselect authentication mechanisms), cd to the saslauthd directory +# within the sources, make and make install. You must create the socket +# directory (default /var/state/saslauthd) and chown it to exim's user and +# group. Once you have installed saslauthd, you should arrange for it to be +# started by root at boot time. + +# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux + + +#------------------------------------------------------------------------------ +# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment +# this setting. See the manual section entitled "Use of tcpwrappers" in the +# chapter on building and installing Exim. +# +# USE_TCP_WRAPPERS=yes +# +# You may well also have to specify a local "include" file and an additional +# library for TCP wrappers, so you probably need something like this: +# +# USE_TCP_WRAPPERS=yes +# CFLAGS=-O -I/usr/local/include +# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap +# +# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM +# as well. +# +# To use a name other than exim in the tcpwrappers config file, +# e.g. if you're running multiple daemons with different access lists, +# or multiple MTAs with the same access list, define +# TCP_WRAPPERS_DAEMON_NAME accordingly +# +# TCP_WRAPPERS_DAEMON_NAME="exim" + + +#------------------------------------------------------------------------------ +# The default action of the exim_install script (which is run by "make +# install") is to install the Exim binary with a unique name such as +# exim-4.43-1, and then set up a symbolic link called "exim" to reference it, +# moving the symbolic link from any previous version. If you define NO_SYMLINK +# (the value doesn't matter), the symbolic link is not created or moved. You +# will then have to "turn Exim on" by setting up the link manually. + +# NO_SYMLINK=yes + + +#------------------------------------------------------------------------------ +# Another default action of the install script is to install a default runtime +# configuration file if one does not exist. This configuration has a router for +# expanding system aliases. The default assumes that these aliases are kept +# in the traditional file called /etc/aliases. If such a file does not exist, +# the installation script creates one that contains just comments (no actual +# aliases). The following setting can be changed to specify a different +# location for the system alias file. + +SYSTEM_ALIASES_FILE=/etc/mail/aliases + + +#------------------------------------------------------------------------------ +# There are some testing options (-be, -bt, -bv) that read data from the +# standard input when no arguments are supplied. By default, the input lines +# are read using the standard fgets() function. This does not support line +# editing during interactive input (though the terminal's "erase" character +# works as normal). If your operating system has the readline() function, and +# in addition supports dynamic loading of library functions, you can cause +# Exim to use readline() for the -be testing option (only) by uncommenting the +# following setting. Dynamic loading is used so that the library is loaded only +# when the -be testing option is given; by the time the loading occurs, +# Exim has given up its root privilege and is running as the calling user. This +# is the reason why readline() is NOT supported for -bt and -bv, because Exim +# runs as root or as exim, respectively, for those options. When USE_READLINE +# is "yes", as well as supporting line editing, a history of input lines in the +# current run is maintained. + +# USE_READLINE=yes + +# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. +# Note that this option adds to the size of the Exim binary, because the +# dynamic loading library is not otherwise included. + + + +############################################################################### +# THINGS YOU ALMOST NEVER NEED TO MENTION # +############################################################################### + +# The settings in this section are available for use in special circumstances. +# In the vast majority of installations you need not change anything below. + + +#------------------------------------------------------------------------------ +# The following commands live in different places in some OS. Either the +# ultimate default settings, or the OS-specific files should already point to +# the right place, but they can be overridden here if necessary. These settings +# are used when building various scripts to ensure that the correct paths are +# used when the scripts are run. They are not used in the Makefile itself. Perl +# is not necessary for running Exim unless you set EXIM_PERL (see above) to get +# it embedded, but there are some utilities that are Perl scripts. If you +# haven't got Perl, Exim will still build and run; you just won't be able to +# use those utilities. + +# CHOWN_COMMAND=/usr/bin/chown +# CHGRP_COMMAND=/usr/bin/chgrp +# CHMOD_COMMAND=/usr/bin/chmod +# MV_COMMAND=/bin/mv +# RM_COMMAND=/bin/rm +# TOUCH_COMMAND=/usr/bin/touch +# PERL_COMMAND=/usr/bin/perl + + +#------------------------------------------------------------------------------ +# The following macro can be used to change the command for building a library +# of functions. By default the "ar" command is used, with options "cq". +# Only in rare circumstances should you need to change this. + +# AR=ar cq + + +#------------------------------------------------------------------------------ +# In some operating systems, the value of the TMPDIR environment variable +# controls where temporary files are created. Exim does not make use of +# temporary files, except when delivering to MBX mailboxes. However, if Exim +# calls any external libraries (e.g. DBM libraries), they may use temporary +# files, and thus be influenced by the value of TMPDIR. For this reason, when +# Exim starts, it checks the environment for TMPDIR, and if it finds it is set, +# it replaces the value with what is defined here. Commenting this setting +# suppresses the check altogether. + +TMPDIR="/tmp" + + +#------------------------------------------------------------------------------ +# The following macros can be used to change the default modes that are used +# by the appendfile transport. In most installations the defaults are just +# fine, and in any case, you can change particular instances of the transport +# at run time if you want. + +# APPENDFILE_MODE=0600 +# APPENDFILE_DIRECTORY_MODE=0700 +# APPENDFILE_LOCKFILE_MODE=0600 + + +#------------------------------------------------------------------------------ +# In some installations there may be multiple machines sharing file systems, +# where a different configuration file is required for Exim on the different +# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look +# for a configuration file whose name is that defined by CONFIGURE_FILE, +# with the node name obtained by uname() tacked on the end, separated by a +# period (for example, /usr/exim/configure.host.in.some.domain). If this file +# does not exist, then the bare configuration file name is tried. + +# CONFIGURE_FILE_USE_NODE=yes + + +#------------------------------------------------------------------------------ +# In some esoteric configurations two different versions of Exim are run, +# with different setuid values, and different configuration files are required +# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then +# Exim will first look for a configuration file whose name is that defined +# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by +# a period (for eximple, /usr/exim/configure.0). If this file does not exist, +# then the bare configuration file name is tried. In the case when both +# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files +# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. + +# CONFIGURE_FILE_USE_EUID=yes + + +#------------------------------------------------------------------------------ +# The size of the delivery buffers: These specify the sizes (in bytes) of +# the buffers that are used when copying a message from the spool to a +# destination. There is rarely any need to change these values. + +# DELIVER_IN_BUFFER_SIZE=8192 +# DELIVER_OUT_BUFFER_SIZE=8192 + + +#------------------------------------------------------------------------------ +# The mode of the database directory: Exim creates a directory called "db" +# in its spool directory, to hold its databases of hints. This variable +# determines the mode of the created directory. The default value in the +# source is 0750. + +# EXIMDB_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# Database file mode: The mode of files created in the "db" directory defaults +# to 0640 in the source, and can be changed here. + +# EXIMDB_MODE=0640 + + +#------------------------------------------------------------------------------ +# Database lock file mode: The mode of zero-length files created in the "db" +# directory to use for locking purposes defaults to 0640 in the source, and +# can be changed here. + +# EXIMDB_LOCKFILE_MODE=0640 + + +#------------------------------------------------------------------------------ +# This parameter sets the maximum length of the header portion of a message +# that Exim is prepared to process. The default setting is one megabyte. The +# limit exists in order to catch rogue mailers that might connect to your SMTP +# port, start off a header line, and then just pump junk at it for ever. The +# message_size_limit option would also catch this, but it may not be set. +# The value set here is the default; it can be changed at runtime. + +# HEADER_MAXSIZE="(1024*1024)" + + +#------------------------------------------------------------------------------ +# The mode of the input directory: The input directory is where messages are +# kept while awaiting delivery. Exim creates it if necessary, using a mode +# which can be defined here (default 0750). + +# INPUT_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The mode of Exim's log directory, when it is created by Exim inside the spool +# directory, defaults to 0750 but can be changed here. + +# LOG_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The log files themselves are created as required, with a mode that defaults +# to 0640, but which can be changed here. + +# LOG_MODE=0640 + + +#------------------------------------------------------------------------------ +# The TESTDB lookup is for performing tests on the handling of lookup results, +# and is not useful for general running. It should be included only when +# debugging the code of Exim. + +# LOOKUP_TESTDB=yes + + +#------------------------------------------------------------------------------ +# /bin/sh is used by default as the shell in which to run commands that are +# defined in the makefiles. This can be changed if necessary, by uncommenting +# this line and specifying another shell, but note that a Bourne-compatible +# shell is expected. + +# MAKE_SHELL=/bin/sh + + +#------------------------------------------------------------------------------ +# The maximum number of named lists of each type (address, domain, host, and +# local part) can be increased by changing this value. It should be set to +# a multiple of 16. + +MAX_NAMED_LIST=16 + + +#------------------------------------------------------------------------------ +# Network interfaces: Unless you set the local_interfaces option in the runtime +# configuration file to restrict Exim to certain interfaces only, it will run +# code to find all the interfaces there are on your host. Unfortunately, +# the call to the OS that does this requires a buffer large enough to hold +# data for all the interfaces - it was designed in the days when a host rarely +# had more than three or four interfaces. Nowadays hosts can have very many +# virtual interfaces running on the same hardware. If you have more than 250 +# virtual interfaces, you will need to uncomment this setting and increase the +# value. + +# MAXINTERFACES=250 + + +#------------------------------------------------------------------------------ +# Per-message logs: While a message is in the process of being delivered, +# comments on its progress are written to a message log, for the benefit of +# human administrators. These logs are held in a directory called "msglog" +# in the spool directory. Its mode defaults to 0750, but can be changed here. +# The message log directory is also used for storing files that are used by +# transports for returning data to a message's sender (see the "return_output" +# option for transports). + +# MSGLOG_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# There are three options which are used when compiling the Perl interface and +# when linking with Perl. The default values for these are placed automatically +# at the head of the Makefile by the script which builds it. However, if you +# want to override them, you can do so here. + +# PERL_CC= +# PERL_CCOPTS= +# PERL_LIBS= + + +#------------------------------------------------------------------------------ +# Identifying the daemon: When an Exim daemon starts up, it writes its pid +# (process id) to a file so that it can easily be identified. The path of the +# file can be specified here. Some installations may want something like this: + +PID_FILE_PATH=/var/run/exim.pid + +# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory +# using the name "exim-daemon.pid". + +# If you start up a daemon without the -bd option (for example, with just +# the -q15m option), a pid file is not written. Also, if you override the +# configuration file with the -oX option, no pid file is written. In other +# words, the pid file is written only for a "standard" daemon. + + +#------------------------------------------------------------------------------ +# If Exim creates the spool directory, it is given this mode, defaulting in the +# source to 0750. + +# SPOOL_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The mode of files on the input spool which hold the contents of messages can +# be changed here. The default is 0640 so that information from the spool is +# available to anyone who is a member of the Exim group. + +# SPOOL_MODE=0640 + + +#------------------------------------------------------------------------------ +# Moving frozen messages: If the following is uncommented, Exim is compiled +# with support for automatically moving frozen messages out of the main spool +# directory, a facility that is found useful by some large installations. A +# run time option is required to cause the moving actually to occur. Such +# messages become "invisible" to the normal management tools. + +# SUPPORT_MOVE_FROZEN_MESSAGES=yes + + +#------------------------------------------------------------------------------ +# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you +# really, really, really know what you are doing. And even then, think again. +# You should never uncomment this when compiling a binary for distribution. +# Use it only when compiling Exim for your own use. +# +# Uncommenting this line enables the use of a runtime option called +# disable_fsync, which can be used to stop Exim using fsync() to ensure that +# files are written to disc before proceeding. When this is disabled, crashes +# and hardware problems such as power outages can cause data to be lost. This +# feature should only be used in very exceptional circumstances. YOU HAVE BEEN +# WARNED. + +# ENABLE_DISABLE_FSYNC=yes + +HAVE_IPV6=YES +# LOOKUP_LIBS=-lldap +# EXTRALIBS_EXIM=-lpam +# End of EDITME for Exim 4. diff --git a/testing/exim/exim.confd b/testing/exim/exim.confd new file mode 100644 index 00000000000..a3974d33b40 --- /dev/null +++ b/testing/exim/exim.confd @@ -0,0 +1,2 @@ +# Command-line options for running exim +EXIM_OPTS="-bd -q15m" diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd new file mode 100644 index 00000000000..fcd46d4785d --- /dev/null +++ b/testing/exim/exim.initd @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.2 2011/08/16 16:51:36 idl0r Exp $ + +opts="${opts} reload" + +depend() { + need logger + use antivirus net + provide mta +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid --name exim + eend $? +} + +reload() { + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile /var/run/${SVCNAME}.pid --name exim + eend $? +} diff --git a/testing/exim/exim.logrotate b/testing/exim/exim.logrotate new file mode 100644 index 00000000000..7d99b559b7b --- /dev/null +++ b/testing/exim/exim.logrotate @@ -0,0 +1,13 @@ +/var/log/exim/exim*.log { + daily + missingok + rotate 28 + compress + delaycompress + notifempty + create 640 mail mail + sharedscripts + postrotate + /etc/init.d/exim reload > /dev/null + endscript +} diff --git a/testing/gitolite/APKBUILD b/testing/gitolite/APKBUILD new file mode 100644 index 00000000000..673f0d6bd81 --- /dev/null +++ b/testing/gitolite/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: +pkgname=gitolite +pkgver=2.1 +pkgrel=0 +pkgdesc="A centralized git server, with very fine-grained access control and many powerful features." +url="http://github.com/sitaramc/gitolite" +arch="noarch" +license="GPL2" +depends="git perl" +depends_dev="" +makedepends="$depends_dev wget" +install="" +subpackages="$pkgname-doc" +source="saveas-https://github.com/sitaramc/gitolite/tarball/v2.1/gitolite-2.1.tar.gz + configuration.patch" + +_builddir="$srcdir"/sitaramc-gitolite-871ed28 + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/bin \ + "$pkgdir"/etc/gitolite \ + "$pkgdir"/usr/share/gitolite/hooks \ + "$pkgdir"/usr/share/doc/gitolite + mv src/* "$pkgdir"/usr/bin/ + mv conf/* "$pkgdir"/etc/gitolite/ + mv hooks/* "$pkgdir"/usr/share/gitolite/hooks/ + mv doc/* "$pkgdir"/usr/share/doc/gitolite/ +} + +md5sums="33e0f6f384cf0596aed974fa563b50c3 gitolite-2.1.tar.gz +b4603bb37d3a746a1508bd7528464ba4 configuration.patch" diff --git a/testing/gitolite/configuration.patch b/testing/gitolite/configuration.patch new file mode 100644 index 00000000000..403dc4e261c --- /dev/null +++ b/testing/gitolite/configuration.patch @@ -0,0 +1,27 @@ +diff --git a/conf/example.gitolite.rc b/conf/example.gitolite.rc +index d800357..95c5a24 100644 +--- a/conf/example.gitolite.rc ++++ b/conf/example.gitolite.rc +@@ -19,8 +19,8 @@ $GL_CONF_COMPILED="$GL_ADMINDIR/conf/gitolite.conf-compiled.pm"; + # DO NOT CHANGE THE NEXT FOUR LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING. + # These variables are set automatically by the install method you choose. + # (PACKAGE MAINTAINERS: PLEASE READ doc/packaging.mkd) +-# $GL_PACKAGE_CONF = ""; +-# $GL_PACKAGE_HOOKS = ""; ++$GL_PACKAGE_CONF = "/etc/gitolite"; ++$GL_PACKAGE_HOOKS = "/usr/share/gitolite/hooks"; + + # ------------------------------------------------------------------------------ + # most often used/changed variables +diff --git a/src/gl-setup b/src/gl-setup +index fd8357b..59de183 100755 +--- a/src/gl-setup ++++ b/src/gl-setup +@@ -1,6 +1,6 @@ + #!/bin/sh + +-GL_PACKAGE_CONF=/tmp/share/gitolite/conf ++GL_PACKAGE_CONF=/etc/gitolite + # must be the same as the value for the same variable in + # $GL_PACKAGE_CONF/example.gitolite.rc. Sorry about the catch-22 :) + diff --git a/testing/liboping/APKBUILD b/testing/liboping/APKBUILD new file mode 100644 index 00000000000..438b967e71b --- /dev/null +++ b/testing/liboping/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Harry +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=liboping +pkgver=1.6.1 +pkgrel=0 +pkgdesc="A Ping Lib" +url="http://verplant.org/liboping/" +arch="all" +license=GPL +depends= +# make install needs setcap provided by libcap +makedepends="ncurses-dev libcap" +source="http://verplant.org/liboping/files/$pkgname-$pkgver.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc" + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --without-perl-bindings \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install DESTDIR="$pkgdir" || return 1 + rm "$pkgdir"/usr/lib/*.la || return 1 +} + +md5sums="748554a18e1771913f4f402ee9f957c9 liboping-1.6.1.tar.bz2" diff --git a/testing/php-phpmailer/APKBUILD b/testing/php-phpmailer/APKBUILD new file mode 100644 index 00000000000..19a27a3392a --- /dev/null +++ b/testing/php-phpmailer/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Timo Teräs <timo.teras@iki.fi> +# Maintainer: Timo Teräs <timo.teras@iki.fi> +pkgname=php-phpmailer +_pkgname=PHPMailer +pkgver=5.2.0 +pkgrel=0 +pkgdesc="PHP class for SMTP mailing" +url="http://code.google.com/a/apache-extras.org/p/phpmailer/" +arch="noarch" +license="LGPL" +depends="php>=5" +depends_dev= +makedepends="$depends_dev" +install="" +subpackages="" +source="http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_$pkgver.tgz" + +_builddir="$srcdir/${_pkgname}_$pkgver" + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + install -d -m755 "$pkgdir"/usr/share/pear + install -D -m644 "$_builddir"/class.*.php "$pkgdir"/usr/share/pear || return 1 +} + +md5sums="aed567b80e6a3b3175d4ce27f3a9a243 PHPMailer_5.2.0.tgz" diff --git a/testing/poppler-qt4/APKBUILD b/testing/poppler-qt4/APKBUILD index 8f47a07d392..0b23f9df867 100644 --- a/testing/poppler-qt4/APKBUILD +++ b/testing/poppler-qt4/APKBUILD @@ -55,4 +55,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="3afa28e3c8c4f06b0fbca3c91e06394e poppler-0.16.7.tar.gz" +md5sums="4cd3bf2a0a13fa8eaf00d31368915f77 poppler-0.18.0.tar.gz" diff --git a/testing/strongswan/APKBUILD b/testing/strongswan/APKBUILD new file mode 100644 index 00000000000..e89a401886d --- /dev/null +++ b/testing/strongswan/APKBUILD @@ -0,0 +1,74 @@ +# Contributor: Jesse Young <jlyo@jlyo.org> +# Maintainer: +pkgname=strongswan +pkgver=4.5.2 +pkgrel=0 +pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE" +url="http://www.strongswan.org/" +arch="all" +license="GPL-2 RSA-MD5 RSA-PKCS11 DES" +depends="iproute2 openssl" +depends_dev="sqlite-dev openssl-dev curl-dev gmp-dev" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2 adns.patch strongswan.initd" + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + local i + cd "$srcdir/$pkgname-$pkgver" + for i in $source; do + case $i in + *.patch) msg $i; patch -Np1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-ipsecdir=/usr/lib/strongswan \ + --enable-pluto \ + --enable-sqlite \ + --enable-smartcard \ + --enable-cisco-quirks \ + --enable-openssl \ + --enable-curl \ + --enable-sql \ + --enable-attr-sql \ + --enable-farp \ + --enable-dhcp \ + --enable-eap-sim \ + --enable-eap-sim-file \ + --enable-eap-simaka-pseudonym \ + --enable-eap-simaka-reauth \ + --enable-eap-identity \ + --enable-eap-md5 \ + --disable-eap-gtc \ + --enable-eap-aka \ + --enable-eap-aka-3gpp2 \ + --enable-eap-mschapv2 \ + --enable-eap-radius \ + --enable-ha \ + --disable-mysql \ + --disable-ldap \ + --disable-static \ + --enable-shared || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -m755 -D "$srcdir/$pkgname.initd" \ + "$pkgdir/etc/init.d/$pkgname" + rm "$pkgdir"/usr/lib/strongswan/plugins/*.la || return 1 + rm "$pkgdir"/usr/lib/*.la || return 1 +} + +md5sums="ac33b8f849a274127f84df0838cae953 strongswan-4.5.2.tar.bz2 +8f02d0e582ac9ac60c28e465b626481d adns.patch +fb9822512d02f521af8812db22a5175e strongswan.initd" diff --git a/testing/strongswan/adns.patch b/testing/strongswan/adns.patch new file mode 100644 index 00000000000..52c1852d0e1 --- /dev/null +++ b/testing/strongswan/adns.patch @@ -0,0 +1,10 @@ +--- a/src/pluto/adns.c ++++ b/src/pluto/adns.c +@@ -179,7 +179,7 @@ + res_query(dname, class, type, answer, anslen) + # define res_nclose(statp) res_close() + +-static struct __res_state *statp = &_res; ++#define statp (&(_res)) + + #else /* !OLD_RESOLVER */ diff --git a/testing/strongswan/strongswan.initd b/testing/strongswan/strongswan.initd new file mode 100644 index 00000000000..156883f1101 --- /dev/null +++ b/testing/strongswan/strongswan.initd @@ -0,0 +1,31 @@ +#!/sbin/runscript + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting StrongSwan" + ipsec start + eend $? +} + +stop () { + ebegin "Stopping StrongSwan" + ipsec stop + eend $? +} +restart() { + ebegin "Restarting StrongSwan" + svc_stop + sleep 2 + svc_start + eend $? +} + +status() { + ebegin "StrongSwan Status (verbose):" + ipsec statusall + eend $? +} |