diff options
Diffstat (limited to 'main')
216 files changed, 14161 insertions, 10165 deletions
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD index d8055582f..fcbe4f026 100644 --- a/main/acf-opennhrp/APKBUILD +++ b/main/acf-opennhrp/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-opennhrp -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=0 pkgdesc="A web-based system administration interface for opennhrp" url="http://git.alpinelinux.org/cgit/acf-opennhrp" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="09e06a2d9f767811dc9334bc6ca59b4c acf-opennhrp-0.6.0.tar.bz2" +md5sums="c4b876489cc9b75edce7793f9f50af79 acf-opennhrp-0.6.1.tar.bz2" diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 239a9f6ae..64333a38c 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,18 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.3 -pkgrel=1 +pkgver=2.4 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - setup-disk-fix.patch" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" license="GPL-2" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/setup-disk-fix.patch } build() { @@ -27,5 +25,4 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2 -27b009c1193e396ee145f59cd3844a2c setup-disk-fix.patch" +md5sums="4c8db8948a21b0435f577d1e0f8d7c8e alpine-conf-2.4.tar.bz2" diff --git a/main/alpine-conf/setup-disk-fix.patch b/main/alpine-conf/setup-disk-fix.patch deleted file mode 100644 index 2fa7aec46..000000000 --- a/main/alpine-conf/setup-disk-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e149170d4736017c76b09625fa9a4b6a90b5e3a3 -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed May 26 13:59:25 2010 +0000 - - setup-disk: fix typo in the option handling - -diff --git a/setup-disk.in b/setup-disk.in -index 7a485b8..aa4a92f 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -401,7 +401,7 @@ while getopts "hk:o:r" opt; do - *) usage;; - esac - done --shift $(( OPTIND - 1)) -+shift $(( $OPTIND - 1)) - - if [ -d "$1" ]; then - # install to given mounted root diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD new file mode 100644 index 000000000..8894a9cb7 --- /dev/null +++ b/main/alsa-utils/APKBUILD @@ -0,0 +1,39 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=alsa-utils +pkgver=1.0.23 +pkgrel=0 +pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +url="http://www.alsa-project.org" +license="GPL" +makedepends="alsa-lib-dev pciutils-dev ncurses-dev" +depends="dialog" +subpackages="$pkgname-doc" +source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 + alsaconf.patch + alsa.initd + alsa.confd + " + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -Np1 -i ../alsaconf.patch || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-xmlto \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D -m755 ../alsa.initd "$pkgdir"/etc/init.d/alsa + install -D -m644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa +} +md5sums="cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2 +5e65f278b5a77e3ee2821ad955c4cd91 alsaconf.patch +4a66dad46d5366e05098cde97f3d37b5 alsa.initd +85b1f1e759fe5953eca329237f4ac256 alsa.confd" diff --git a/main/alsa-utils/alsa.confd b/main/alsa-utils/alsa.confd new file mode 100644 index 000000000..0a5d58fc1 --- /dev/null +++ b/main/alsa-utils/alsa.confd @@ -0,0 +1,31 @@ +# ENABLE_OSS_EMUL: +# Do you want to enable in-kernel oss emulation? +# no - Do not load oss emul drivers +# yes - Load oss emul drivers if they're found + +ENABLE_OSS_EMUL="yes" + +# RESTORE_ON_START: +# Do you want to restore your mixer settings? If not, your cards will be +# muted. +# no - Do not restore state +# yes - Restore state + +RESTORE_ON_START="yes" + +# SAVE_ON_STOP: +# Do you want to save changes made to your mixer volumes when alsasound +# stops? +# no - Do not save state +# yes - Save state + +SAVE_ON_STOP="yes" + +# LOAD_ON_START: +# Do you want to load sound modules when alsasound starts? +# Note: The Gentoo ALSA developers encourage you to build your sound +# drivers into the kernel unless the device is hotpluggable or +# you need to supply specific options (such as model= to HD-Audio). +# no - Do not load modules +# yes - Load modules +LOAD_ON_START="yes" diff --git a/main/alsa-utils/alsa.initd b/main/alsa-utils/alsa.initd new file mode 100644 index 000000000..c11861896 --- /dev/null +++ b/main/alsa-utils/alsa.initd @@ -0,0 +1,218 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.1 2009/08/02 11:27:26 ssuominen Exp $ +# Copyright 2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d + +opts="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug hwdrivers +} + +load_modules() { + # List of drivers for each card. + local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" + + # Fall back on the automated aliases if we don't have ALSA configured properly... + if [ -z "${DRIVERS}" ] && \ + ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then + ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." + DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" + if [ -z "${DRIVERS}" ] ; then + eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" + fi + fi + + if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + fi + + # We want to ensure snd-seq is loaded as it is needed for things like + # timidity even if we don't use a real sequencer. + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + + # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit + # compatibility + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + + local DRIVER= DMOD= + for DRIVER in ${DRIVERS} ; do + [ "${DRIVER}" = "off" ] && continue + DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${DRIVER}" + modprobe ${DRIVER} + eend $? + fi + done + + if [ -f /proc/asound/seq/drivers ] ; then + local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" + local SEQUENCER + for SEQUENCER in ${SEQUENCERS} ; do + DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${SEQUENCER}" + modprobe ${SEQUENCER} + eend $? + fi + done + fi + + for DRIVER in ${DRIVERS} + do + local TMP=${DRIVER##snd-} + TMP=${TMP##snd_} + if [ -x "${alsascrdir}/${TMP}" ] ; then + ebegin "Running: ${alsascrdir}/${TMP}" + "${alsascrdir}/${TMP}" + eend $? + fi + done + + if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then + eerror "ERROR: Failed to load necessary drivers" + return 1 + fi +} + +unload_modules_24() { + local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" + local MODULE + for MODULE in ${LOADED_MODULES} ; do + rmmod "${MODULE}" + done + rmmod soundcore 2>/dev/null + rmmod gameport 2>/dev/null + + lsmod | grep -vq '^snd' +} + +unload_modules_recursive() { + local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" + + for module in ${revdeps} ; do + unload_modules_recursive "${module}" + done + + vebegin "Unloading: $1" + rmmod --wait "$1" + veend $? +} + +unload_modules_26() { + # First of all, remove the snd module and all the modules depending + # on it, this should remove already most of ALSA modules. + lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd + + # Then find the remaining ones, and handle them too. + for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do + unload_modules_recursive "${module}" + done + + lsmod | grep -vq "^snd" +} + +terminate() { + # + # Kill processes holding open sound devices + # + # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` + local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ + /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ + /dev/patmgr* /dev/sequencer* /dev/sndstat" + local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" + fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null + + # remove all sequencer connections if any + [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall +} + +restore() { + ebegin "Restoring Mixer Levels" + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + mkdir -p "${alsastatedir}" + if ! alsactl -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then + ebegin "Loading ALSA modules" + eindent + load_modules + eoutdent + eend $? || return 1 + fi + + if [ ! -d /proc/asound ]; then + eerror "ALSA failed to load." + eend 1 + return 1 + elif [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ ! -d /proc/asound ] ; then + eerror "ALSA is not loaded" + return 0 + fi + + [ "${SAVE_ON_STOP}" = "yes" ] && save + + return 0 +} diff --git a/main/alsa-utils/alsaconf.patch b/main/alsa-utils/alsaconf.patch new file mode 100644 index 000000000..846cf9848 --- /dev/null +++ b/main/alsa-utils/alsaconf.patch @@ -0,0 +1,12 @@ +diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in +--- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2005-03-24 00:24:52.000000000 -0800 ++++ alsa-utils-1.0.9a/alsaconf/alsaconf.in 2005-07-18 09:25:02.000000000 -0700 +@@ -58,6 +58,8 @@ + distribution="redhat" + elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then + distribution="fedora" ++elif test -f /etc/alpine-release; then ++ distribution="alpine" + elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then + distribution="slackware" + else diff --git a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch deleted file mode 100644 index 4df956bf3..000000000 --- a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 87420aaf295f58847332ba3aa89691a0259baace Mon Sep 17 00:00:00 2001 -From: Timo Teras <timo.teras@iki.fi> -Date: Wed, 5 May 2010 08:56:06 +0300 -Subject: [PATCH 1/5] info: fix querying of removed, but referenced packages - -Check that package name has packages associated with it before -dereferencing the pointer. Fixes #345. ---- - src/info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/info.c b/src/info.c -index 7ca486c..d944fca 100644 ---- a/src/info.c -+++ b/src/info.c -@@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db, - - for (i = 0; i < argc; i++) { - name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); -- if (name == NULL) { -+ if (name == NULL || name->pkgs == NULL) { - apk_error("Not found: %s", argv[i]); - return 1; - } --- -1.7.1 - diff --git a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch deleted file mode 100644 index 2e20152dd..000000000 --- a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 47bac8c29c9a3c3fbebfd20e907170f24f9d677c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 11 May 2010 09:31:20 +0000 -Subject: [PATCH 2/5] upgrade: reset versioned deps in world when doing upgrade -a - -Doing "apk add file.apk" adds a versioned dependency to allow -downgrading, and sticky version. Most often this is to install -single packages from newer repository. So it would make sense -to reset them to non-versioned if doing: - - apk upgrade -a - -fixes #346 ---- - src/upgrade.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/upgrade.c b/src/upgrade.c -index f91e8cc..879e14c 100644 ---- a/src/upgrade.c -+++ b/src/upgrade.c -@@ -41,10 +41,15 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg - goto err; - - for (i = 0; i < db->world->num; i++) { -- r = apk_state_lock_dependency(state, &db->world->item[i]); -+ struct apk_dependency *dep = &db->world->item[i]; -+ if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) { -+ dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER; -+ dep->version = NULL; -+ } -+ r = apk_state_lock_dependency(state, dep); - if (r != 0) { - apk_error("Unable to upgrade '%s'", -- db->world->item[i].name->name); -+ dep->name->name); - goto err; - } - } --- -1.7.1 - diff --git a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch deleted file mode 100644 index f2947c635..000000000 --- a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch +++ /dev/null @@ -1,221 +0,0 @@ -From d9bf4aabff801164b4c54e51b38c5f6eab2da114 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Wed, 19 May 2010 16:48:40 +0300 -Subject: [PATCH 3/5] search: add search for reverse dependencies in index - -So it'll be easier to rebuild affected packages. Fixes #349. ---- - src/search.c | 148 +++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 91 insertions(+), 57 deletions(-) - -diff --git a/src/search.c b/src/search.c -index 91c2913..e5e5d55 100644 ---- a/src/search.c -+++ b/src/search.c -@@ -18,18 +18,14 @@ - #include "apk_state.h" - - struct search_ctx { -- int (*action)(struct apk_database *db, int argc, char **argv); -+ int (*match)(struct apk_package *pkg, const char *str); -+ int (*print)(struct apk_package *pkg); -+ int argc; -+ char **argv; - }; - --struct search_query_ctx { -- struct apk_database *db; -- const char *query; --}; -- --static int search_list_print(apk_hash_item item, void *ctx) -+static int print_match(struct apk_package *pkg) - { -- struct apk_package *pkg = (struct apk_package *) item; -- - printf("%s", pkg->name->name); - if (apk_verbosity > 0) - printf("-%s", pkg->version); -@@ -41,61 +37,50 @@ static int search_list_print(apk_hash_item item, void *ctx) - return 0; - } - --static int search_query_print(apk_hash_item item, void *ctx) -+static int print_rdepends(struct apk_package *pkg) - { -- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; -- struct apk_package *pkg = (struct apk_package *) item; -+ struct apk_name *name, *name0; -+ struct apk_package *pkg0; -+ struct apk_dependency *dep; -+ int i, j, k; - -- if (fnmatch(ictx->query, pkg->name->name, 0) != 0) -+ name = pkg->name; -+ if (name->rdepends == NULL) - return 0; -- search_list_print(item, ictx->db); -- -- return 0; --} -- --static int search_list(struct apk_database *db, int argc, char **argv) --{ -- int i; -- struct search_query_ctx ctx; -- -- ctx.db = db; - -- if (argc == 0) -- apk_hash_foreach(&db->available.packages, search_list_print, db); -- else -- for (i=0; i<argc; i++) { -- ctx.query = argv[i]; -- apk_hash_foreach(&db->available.packages, search_query_print, &ctx); -+ printf("%s-%s:", pkg->name->name, pkg->version); -+ for (i = 0; i < name->rdepends->num; i++) { -+ name0 = name->rdepends->item[i]; -+ if (name0->pkgs == NULL) -+ continue; -+ for (j = 0; j < name0->pkgs->num; j++) { -+ pkg0 = name0->pkgs->item[j]; -+ if (pkg0->depends == NULL) -+ continue; -+ for (k = 0; k < pkg0->depends->num; k++) { -+ dep = &pkg0->depends->item[k]; -+ if (name == dep->name && -+ (apk_version_compare(pkg->version, dep->version) -+ & dep->result_mask)) { -+ printf(" %s-%s", pkg0->name->name, pkg0->version); -+ } -+ } - } -+ } -+ printf("\n"); - - return 0; - } - --static int search_query_desc_print(apk_hash_item item, void *ctx) -+static int search_pkgname(struct apk_package *pkg, const char *str) - { -- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; -- struct apk_package *pkg = (struct apk_package *) item; -- -- if( strstr(pkg->description, ictx->query) == NULL ) -- return 0; -- search_list_print(item, ictx->db); -- -- return 0; -+ return fnmatch(str, pkg->name->name, 0) == 0; - } - --static int search_desc(struct apk_database *db, int argc, char **argv) -+static int search_desc(struct apk_package *pkg, const char *str) - { -- int i; -- struct search_query_ctx ctx; -- -- ctx.db = db; -- -- for (i=0; i<argc; i++) { -- ctx.query = argv[i]; -- apk_hash_foreach(&db->available.packages, search_query_desc_print, &ctx); -- } -- -- return 0; -+ return strstr(pkg->name->name, str) != NULL || -+ strstr(pkg->description, str) != NULL; - } - - static int search_parse(void *ctx, struct apk_db_options *dbopts, -@@ -105,7 +90,10 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, - - switch (optch) { - case 'd': -- ictx->action = search_desc; -+ ictx->match = search_desc; -+ break; -+ case 'r': -+ ictx->print = print_rdepends; - break; - default: - return -1; -@@ -113,23 +101,69 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, - return 0; - } - -+static int match_packages(apk_hash_item item, void *ctx) -+{ -+ struct search_ctx *ictx = (struct search_ctx *) ctx; -+ struct apk_package *pkg = (struct apk_package *) item; -+ int i; -+ -+ for (i = 0; i < ictx->argc; i++) -+ if (ictx->match(pkg, ictx->argv[i])) -+ break; -+ if (ictx->argc == 0 || i < ictx->argc) -+ ictx->print(pkg); -+ -+ return 0; -+} -+ - static int search_main(void *ctx, struct apk_database *db, int argc, char **argv) - { - struct search_ctx *ictx = (struct search_ctx *) ctx; -+ struct apk_name *name; -+ int rc = 0, i, j, slow_search; -+ -+ slow_search = ictx->match != NULL || argc == 0; -+ if (!slow_search) { -+ for (i = 0; i < argc; i++) -+ if (strcspn(argv[i], "*?[") != strlen(argv[i])) { -+ slow_search = 1; -+ break; -+ } -+ } -+ -+ if (ictx->match == NULL) -+ ictx->match = search_pkgname; -+ if (ictx->print == NULL) -+ ictx->print = print_match; -+ else if (argc == 0) -+ return -1; - -- if (ictx->action != NULL) -- return ictx->action(db, argc, argv); -+ if (slow_search) { -+ ictx->argc = argc; -+ ictx->argv = argv; -+ rc = apk_hash_foreach(&db->available.packages, -+ match_packages, ictx); -+ } else { -+ for (i = 0; i < argc; i++) { -+ name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); -+ if (name == NULL || name->pkgs == NULL) -+ continue; -+ for (j = 0; j < name->pkgs->num; j++) -+ ictx->print(name->pkgs->item[j]); -+ } -+ } - -- return search_list(db, argc, argv); -+ return rc; - } - - static struct apk_option search_options[] = { -- { 'd', "description", "Search also package descriptions" }, -+ { 'd', "description", "Search also package descriptions" }, -+ { 'r', "rdepends", "Print reverse dependencies of package" }, - }; - - static struct apk_applet apk_search = { - .name = "search", -- .help = "Search package names (and descriptions) by wildcard PATTERN.", -+ .help = "Search package by PATTERNs or by indexed dependencies.", - .arguments = "PATTERN", - .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE, - .context_size = sizeof(struct search_ctx), --- -1.7.1 - diff --git a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch deleted file mode 100644 index 818eeb1e7..000000000 --- a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fe55da70741621f7bac2cd943b64cc13e25f9427 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Wed, 26 May 2010 14:30:08 +0300 -Subject: [PATCH 4/5] package: don't leak signing key file fd - -openssl BIO does not close the fd unless we explicitly tell it to -do so. ---- - src/package.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/package.c b/src/package.c -index b265468..b97c412 100644 ---- a/src/package.c -+++ b/src/package.c -@@ -441,7 +441,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx, - if (fd < 0) - return 0; - -- bio = BIO_new_fp(fdopen(fd, "r"), 0); -+ bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE); - ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL); - if (ctx->signature.pkey != NULL) { - if (fi->name[6] == 'R') --- -1.7.1 - diff --git a/main/apk-tools/0005-cache-display-more-than-one-error.patch b/main/apk-tools/0005-cache-display-more-than-one-error.patch deleted file mode 100644 index 6e85218b1..000000000 --- a/main/apk-tools/0005-cache-display-more-than-one-error.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d21303960544b5f11b7d69d0335f0903fb93d180 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 13 May 2010 09:26:19 +0000 -Subject: [PATCH 5/5] cache: display more than one error - -Display all packages that are bad in world rather than only first -before exiting. ---- - src/cache.c | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/cache.c b/src/cache.c -index 85d9777..49a71fa 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -30,7 +30,7 @@ static int cache_download(struct apk_database *db) - struct apk_package *pkg; - struct apk_repository *repo; - char item[PATH_MAX], cacheitem[PATH_MAX]; -- int i, r = 0; -+ int i, r = 0, errors = 0; - - if (db->world == NULL) - return 0; -@@ -41,12 +41,13 @@ static int cache_download(struct apk_database *db) - - for (i = 0; i < db->world->num; i++) { - r = apk_state_lock_dependency(state, &db->world->item[i]); -- if (r != 0) { -- apk_error("Unable to select version for '%s': %d", -- db->world->item[i].name->name, r); -- goto err; -- } -+ errors += r; -+ if (r != 0) -+ apk_error("Unable to select version for '%s'", -+ db->world->item[i].name->name); - } -+ if (errors) -+ goto err; - - list_for_each_entry(change, &state->change_list_head, change_list) { - pkg = change->newpkg; -@@ -67,7 +68,7 @@ static int cache_download(struct apk_database *db) - err: - if (state != NULL) - apk_state_unref(state); -- return r; -+ return errors; - } - - static int cache_clean(struct apk_database *db) --- -1.7.1 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 07b602dfa..0fafb0035 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,17 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.0.2 -pkgrel=6 +pkgver=2.0.3 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= makedepends="zlib-dev openssl-dev pkgconfig" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-info-fix-querying-of-removed-but-referenced-packages.patch - 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch - 0003-search-add-search-for-reverse-dependencies-in-index.patch - 0004-package-don-t-leak-signing-key-file-fd.patch - 0005-cache-display-more-than-one-error.patch + triggers.patch " @@ -48,9 +44,5 @@ static() { "$subpkgdir"/sbin/apk.static } -md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2 -c590e894c2580cbb092b150fca9af3cf 0001-info-fix-querying-of-removed-but-referenced-packages.patch -5c53eaa29dd9722c25b6878cde392d05 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch -6baca299fbf00b97f78fa8fbd0e82f5b 0003-search-add-search-for-reverse-dependencies-in-index.patch -175470e6d5b2d20fe02d6fb61f8ec6d1 0004-package-don-t-leak-signing-key-file-fd.patch -0ab64b75b09f37b4d265df3f7b5b7e83 0005-cache-display-more-than-one-error.patch" +md5sums="191938ff9433745a1e24dfab6f8f7249 apk-tools-2.0.3.tar.bz2 +b4679e85ed85914141312fcbd357bb0f triggers.patch" diff --git a/main/apk-tools/triggers.patch b/main/apk-tools/triggers.patch new file mode 100644 index 000000000..4702e0f85 --- /dev/null +++ b/main/apk-tools/triggers.patch @@ -0,0 +1,42 @@ +commit 60b537e356dfcd0ed9a3516152c6a170912efcef +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu Jun 10 17:50:11 2010 +0000 + + db: do not free trigger list after package is unpacked + + The triggers are read during apk_db_unpack_pkg(). If we delete the + triggers list after then unpack we delete the triggers which is not + what we want. + + This fixes bug introduced in ce3cf8bff901e7fcacbca640ffedaeea2b3bdf7f + +diff --git a/src/database.c b/src/database.c +index 7421e1b..11864cb 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -2100,6 +2100,12 @@ int apk_db_install_pkg(struct apk_database *db, + + /* Install the new stuff */ + ipkg = apk_pkg_install(db, newpkg); ++ ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; ++ if (ipkg->triggers->num != 0) { ++ list_del(&ipkg->trigger_pkgs_list); ++ apk_string_array_free(&ipkg->triggers); ++ } ++ + if (newpkg->installed_size != 0) { + r = apk_db_unpack_pkg(db, ipkg, (oldpkg != NULL), + (oldpkg == newpkg), cb, cb_ctx, +@@ -2110,12 +2116,6 @@ int apk_db_install_pkg(struct apk_database *db, + } + } + +- ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; +- if (ipkg->triggers->num != 0) { +- list_del(&ipkg->trigger_pkgs_list); +- apk_string_array_free(&ipkg->triggers); +- } +- + if (oldpkg != NULL && oldpkg != newpkg && oldpkg->ipkg != NULL) { + apk_db_purge_pkg(db, oldpkg->ipkg, NULL); + apk_pkg_uninstall(db, oldpkg); diff --git a/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch b/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch new file mode 100644 index 000000000..115c42fa2 --- /dev/null +++ b/main/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch @@ -0,0 +1,151 @@ +From 2040c4ebe42ed6a222b87f0148c0c08701afc2fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Mon, 7 Jun 2010 14:20:42 +0300 +Subject: [PATCH] add 'n' flag to prevent dynamic create of conference + +--- + konference/Dialplan.txt | 2 ++ + konference/conference.c | 27 ++++++++++++++++++--------- + konference/conference.h | 2 +- + konference/member.c | 12 +++++++----- + konference/member.h | 3 +++ + 5 files changed, 31 insertions(+), 15 deletions(-) + +diff --git a/konference/Dialplan.txt b/konference/Dialplan.txt +index 455703d..17287dd 100644 +--- a/konference/Dialplan.txt ++++ b/konference/Dialplan.txt +@@ -45,6 +45,8 @@ exten => <ext>,<pri>,Konference(<confname>,<flags>,<optional args>,<more optiona + 'r' : record the conference. it will be recorded to KONFERENCE_RECORDINGFILE with the format KONFERENCE_RECORDINGFORMAT + default for KONFERENCE_RECORDINGFILE is: konference-{conference-name}-{member-uniqueid} + default for KONFERENCE_RECORDINGFORMAT is: wav ++ 'n' : do not create new conference, only join existing ones. ++ if conference does not exist KONFERENCE is set to NOTFOUND + + Future development (these are not implemented yet): + ? +diff --git a/konference/conference.c b/konference/conference.c +index 9790d2e..98fed28 100644 +--- a/konference/conference.c ++++ b/konference/conference.c +@@ -620,7 +620,7 @@ void init_conference( void ) + argument_delimiter = ( !strcmp(PACKAGE_VERSION,"1.4") ? "|" : "," ) ; + } + +-struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char *recformat ) ++struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char *recformat ) + { + struct ast_conference* conf = NULL ; + +@@ -634,15 +634,25 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma + // unable to find an existing conference, try to create one + if ( conf == NULL ) + { +- // create a new conference +- DEBUG("attempting to create requested conference\n") ; ++ if ( member->no_create_flag ) ++ { ++ DEBUG("conference not found, and create of new conference not allowed\n") ; ++ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NOTFOUND"); ++ } ++ else ++ { ++ // create a new conference ++ DEBUG("attempting to create requested conference\n") ; + +- // create the new conference with one member +- conf = create_conf( member->conf_name, member ) ; ++ // create the new conference with one member ++ conf = create_conf( member->conf_name, member ) ; + +- // return an error if create_conf() failed +- if ( conf == NULL ) +- ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; ++ // return an error if create_conf() failed ++ if ( conf == NULL ) { ++ ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; ++ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NORESOURCES"); ++ } ++ } + } + else + { +@@ -656,7 +666,6 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma + add_member( member, conf ) ; + } else { + pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "MAXUSERS"); +- *max_users_flag = 1; + conf = NULL; + } + } +diff --git a/konference/conference.h b/konference/conference.h +index 3322f3f..e8da836 100644 +--- a/konference/conference.h ++++ b/konference/conference.h +@@ -157,7 +157,7 @@ int hash( const char *channel_name ) ; + + int count_exec( struct ast_channel* chan, void* data ) ; + +-struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char* recformat ) ; ++struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char* recformat ) ; + + int end_conference( const char *name, int hangup ) ; + +diff --git a/konference/member.c b/konference/member.c +index c18fcdc..ff93b36 100644 +--- a/konference/member.c ++++ b/konference/member.c +@@ -758,14 +758,13 @@ int member_exec( struct ast_channel* chan, void* data ) + // setup a conference for the new member + // + +- char max_users_flag = 0 ; +- conf = join_conference( member, &max_users_flag, recfile, recformat ) ; ++ conf = join_conference( member, recfile, recformat ) ; + + if ( conf == NULL ) + { +- ast_log( LOG_NOTICE, "unable to setup member conference %s: max_users_flag is %d\n", member->conf_name, max_users_flag ) ; ++ ast_log( LOG_NOTICE, "unable to setup member conference %s\n", member->conf_name) ; + delete_member( member) ; +- return (max_users_flag ? 0 : -1 ) ; ++ return -1; + } + + // +@@ -1349,7 +1348,7 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat + else + #endif + { +- // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H ++ // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H, n + // mute/no_recv options + switch ( flags[i] ) + { +@@ -1405,6 +1404,9 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat + case 'M': + member->ismoderator = 1; + break; ++ case 'n': ++ member->no_create_flag = 1; ++ break; + #ifdef VIDEO + case 'N': + member->no_camera = 1; +diff --git a/konference/member.h b/konference/member.h +index 0f9005b..28eff6b 100644 +--- a/konference/member.h ++++ b/konference/member.h +@@ -105,6 +105,9 @@ struct ast_conf_member + // wait option flag + char wait_for_moderator_flag; + ++ // creation of new conference not allowed ++ char no_create_flag; ++ + // temp flag for when star is pressed + char star_pressed; + +-- +1.7.0.4 + diff --git a/main/asterisk-audio-konf/APKBUILD b/main/asterisk-audio-konf/APKBUILD new file mode 100644 index 000000000..cd87e2780 --- /dev/null +++ b/main/asterisk-audio-konf/APKBUILD @@ -0,0 +1,67 @@ +# Contributor: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=asterisk-audio-konf +_basever=0 +_gitver=100607 +pkgver=${_basever}_git${_gitver} +pkgrel=0 +pkgdesc="A fork of AppKonference focused entirely on audio conferencing" +url="http://github.com/jthomerson/AsteriskAudioKonf/" +license="GPL" +depends= +makedepends="asterisk-dev" +install= +subpackages= +_snapfile="$pkgname-$pkgver.tar.bz2" +source="http://build.alpinelinux.org:8010/distfiles/$_snapfile + 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch + " + +_gitver=100607 +_giturl="git://github.com/jthomerson/AsteriskAudioKonf.git" + + +_builddir="$srcdir"/$pkgname/konference + + +snapshot() { + _gitver=$(date +%y%m%d) + pkgver=${_basever}_git$_gitver + _snapfile="$pkgname-$pkgver.tar.bz2" + + if [ -d "$SRCDEST"/$pkgname ]; then + cd "$SRCDEST"/$pkgname + git pull --rebase || return 1 + else + cd "$SRCDEST" + git clone $_giturl $pkgname + fi + cd "$SRCDEST" + tar -jcf $_snapfile $pkgname + + pkgrel=0 + sed -i -e "s/^_gitver=.*/_gitver=${_gitver}/" \ + -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ + "$startdir"/APKBUILD + checksum +} + +prepare() { + cd "$_builddir"/.. + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make INSTALL_PREFIX="$pkgdir" install +} + +md5sums="8a716a2d1daa622f86a485804e403571 asterisk-audio-konf-0_git100607.tar.bz2 +937afbb9fa2ce57615f09919e15ab2d3 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch" diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 1ed4b4108..77b699adf 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.7 -pkgrel=1 +pkgver=1.6.2.8 +pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -110,7 +110,7 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz +md5sums="2ee5bbb91771c7c9b131da473971bc2f asterisk-1.6.2.8.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD new file mode 100644 index 000000000..b3921077e --- /dev/null +++ b/main/bacula-client/APKBUILD @@ -0,0 +1,70 @@ +# Contributor: Leonardo Arena <rnalrd@gmail.com> +# Maintainer: Leonardo Arena <rnalrd@gmail.com> +pkgname="bacula-client" +_realname="bacula" +pkgver=5.0.0 +pkgrel=3 +pkgdesc="Client (File Daemon) of Bacula, a network based backup program" +url="http://www.bacula.org" +license="GPL2" +depends="" +makedepends="openssl-dev autoconf ncurses-dev" +install="$pkgname.pre-install $pkgname.post-install" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/project/$_realname/$_realname/$pkgver/$_realname-$pkgver.tar.gz +bacula-fd-init +bacula-fd-conf +configure.in.patch +os.m4.patch" + +prepare () { + cd "$srcdir/$_realname-$pkgver" + patch -p1 < ../../configure.in.patch + patch -p1 < ../../os.m4.patch +} + +build() { + cd "$srcdir/$_realname-$pkgver" + export LDFLAGS= + # Need to run configure at least once + # in order to do not go into an infinite loop + ./configure + make configure + make distclean + + ./configure --prefix=/usr \ + --sysconfdir=/etc/bacula \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc \ + --infodir=/usr/share/info \ + --with-pid-dir=/var/run \ + --with-subsys-dir=/var/lock/subsys \ + --enable-largefile \ + --enable-client-only \ + --enable-smartalloc \ + --disable-nls \ + --with-openssl=/usr/include/openssl \ + --with-scriptdir=/etc/bacula/scripts \ + --with-working-dir=/var/bacula \ + --with-fd-user=root \ + --with-fd-group=root \ + --with-fd-password=ca4pheexie1aeC1hee3i + make || return 1 +} + +package() { + cd "$srcdir/$_realname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm755 $srcdir/bacula-fd-init \ + $pkgdir/etc/init.d/bacula-fd + install -Dm644 $srcdir/bacula-fd-conf \ + $pkgdir/etc/conf.d/bacula-fd +} + +md5sums="68e008d2578a6d9a50af60439db17dcb bacula-5.0.0.tar.gz +38b0fe78acdc5e65aec3a59578e98a20 bacula-fd-init +4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf +ebc9c2bbc9be95c920723a3f142d8e19 configure.in.patch +cf7a2a4e972697f54364654c4e282b8b os.m4.patch" diff --git a/main/bacula-client/bacula-client.post-install b/main/bacula-client/bacula-client.post-install new file mode 100644 index 000000000..51274b5c3 --- /dev/null +++ b/main/bacula-client/bacula-client.post-install @@ -0,0 +1,2 @@ +#!/bin/sh +chown bacula.bacula /var/bacula diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install new file mode 100644 index 000000000..54f408770 --- /dev/null +++ b/main/bacula-client/bacula-client.pre-install @@ -0,0 +1,3 @@ +#!/bin/sh +addgroup -S bacula 2>/dev/null +exit 0 diff --git a/main/bacula-client/bacula-fd-conf b/main/bacula-client/bacula-fd-conf new file mode 100644 index 000000000..033ef74b4 --- /dev/null +++ b/main/bacula-client/bacula-fd-conf @@ -0,0 +1,4 @@ +# Config file for /etc/init.d/bacula-fd + +# Options for the file daemon. +FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf" diff --git a/main/bacula-client/bacula-fd-init b/main/bacula-client/bacula-fd-init new file mode 100644 index 000000000..618b3508c --- /dev/null +++ b/main/bacula-client/bacula-fd-init @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-fd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ + +depend() { + need net + use dns +} + +start() { + ebegin "Starting bacula file daemon" + start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \ + -- ${FD_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bacula file daemon" + start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid + eend $? +} diff --git a/main/bacula-client/configure.in.patch b/main/bacula-client/configure.in.patch new file mode 100644 index 000000000..cfe2a0b7c --- /dev/null +++ b/main/bacula-client/configure.in.patch @@ -0,0 +1,23 @@ +--- bacula-3.0.3-orig/autoconf/configure.in Sun Oct 18 09:10:16 2009 ++++ bacula-3.0.3/autoconf/configure.in Wed Dec 2 14:13:44 2009 +@@ -2576,6 +2576,20 @@ + fi + TAPEDRIVE="/dev/nrmt0" + ;; ++alpine) ++ dnl Make sure hostname is resolved ++ ping -c 1 $hostname 2>&1 1>/dev/null ++ if test ! $? = 0; then ++ hostname="localhost" ++ fi ++ if `test -f /etc/alpine-release && grep -q alpine /etc/alpine-release`; then ++ DISTNAME="alpine" ++ fi ++ DISTVER=`cat /etc/alpine-release` ++ TAPEDRIVE="/dev/nst0" ++ PSCMD="ps -e -o pid,comm" ++ largefile_support="yes" ++ ;; + bsdi) + DISTVER=`uname -a |awk '{print $3}'` + TAPEDRIVE="/dev/nrmt0" diff --git a/main/bacula-client/os.m4.patch b/main/bacula-client/os.m4.patch new file mode 100644 index 000000000..95dc5666a --- /dev/null +++ b/main/bacula-client/os.m4.patch @@ -0,0 +1,12 @@ +--- bacula-3.0.3-orig/autoconf/bacula-macros/os.m4 Sun Oct 18 09:10:16 2009 ++++ bacula-3.0.3/autoconf/bacula-macros/os.m4 Wed Dec 2 13:48:30 2009 +@@ -201,6 +201,9 @@ + elif test -f /etc/gentoo-release + then + DISTNAME=gentoo ++elif test -f /etc/alpine-release ++then ++ DISTNAME=alpine + elif test -f /etc/debian_version + then + DISTNAME=debian diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD new file mode 100644 index 000000000..ff4161ea1 --- /dev/null +++ b/main/bacula/APKBUILD @@ -0,0 +1,96 @@ +# Contributor: Leonardo Arena <rnalrd@gmail.com> +# Maintainer: Leonardo Arena <rnalrd@gmail.com> +pkgname="bacula" +pkgver=5.0.1 +pkgrel=3 +pkgdesc="Enterprise ready, network based backup program" +url="http://www.bacula.org" +license="GPL2" +depends="postgresql" +makedepends="postgresql-dev openssl-dev ncurses-dev autoconf" +install="$pkgname.pre-install $pkgname.post-install" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz +bacula-dir-init +bacula-dir-conf +bacula-sd-init +bacula-sd-conf +bacula-fd-init +bacula-fd-conf +configure.in.patch +os.m4.patch" + +prepare () { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../../configure.in.patch + patch -p1 < ../../os.m4.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + export LDFLAGS= + # Need to run configure at least once + # in order to do not go into an infinite loop + ./configure + make configure + make distclean + + ./configure --prefix=/usr \ + --sysconfdir=/etc/bacula \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc \ + --infodir=/usr/share/info \ + --with-pid-dir=/var/run \ + --with-subsys-dir=/var/lock/subsys \ + --with-logdir=/var/log \ + --enable-largefile \ + --enable-smartalloc \ + --disable-nls \ + --with-openssl=/usr/include/openssl \ + --with-postgresql \ + --with-scriptdir=/etc/bacula/scripts \ + --with-working-dir=/var/bacula \ + --with-dir-user=bacula \ + --with-dir-group=bacula \ + --with-sd-user=bacula \ + --with-sd-group=bacula \ + --with-fd-user=root \ + --with-fd-group=root \ + --with-dir-password=PuemReTsKKObLe3TTaU73a3dPWwISW \ + --with-fd-password=Mbh1ujsgZ2ogRFVjPWD9TAVMFP6o8E \ + --with-sd-password=icpaksuq0gpDStLT8Uqgk1HIozFnx1 \ + --with-db-password=BQrlfPPfdXdMHlJID0HrGHZde2Lqd9 + + make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + for DAEMON in dir sd fd + do + install -Dm755 "$srcdir"/bacula-${DAEMON}-init \ + "$pkgdir"/etc/init.d/bacula-${DAEMON} + install -Dm644 "$srcdir"/bacula-${DAEMON}-conf \ + "$pkgdir"/etc/conf.d/bacula-${DAEMON} + done + install -Dm644 examples/sample-query.sql "$pkgdir"/etc/bacula/scripts/query.sql + mkdir -p "$pkgdir"/var/run/bacula + # Fix correct log dir + sed -i -e 's%/var/bacula/log%/var/log/bacula%' "$pkgdir"/etc/bacula/bacula-dir.conf + # Install logrotate script + install -Dm644 scripts/logrotate $pkgdir/etc/logrotate.d/bacula + sed -i -e 's%/var/bacula/log%/var/log/bacula%' "$pkgdir"/etc/logrotate.d/bacula +} + +md5sums="beb9f8da196b3c9ffb0356f087dbdb99 bacula-5.0.1.tar.gz +b1b328013634c98119663730e3e2da7e bacula-dir-init +20f28a16f34e3f20ed18ed81b010e765 bacula-dir-conf +5ae1fba6860a320394d65744e5640bdb bacula-sd-init +afe2f9a4d79d7d96eb9372d003d10f86 bacula-sd-conf +6ae93e570f95fa845fa534c2d2efaac0 bacula-fd-init +4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf +ebc9c2bbc9be95c920723a3f142d8e19 configure.in.patch +cf7a2a4e972697f54364654c4e282b8b os.m4.patch" diff --git a/main/bacula/bacula-dir-conf b/main/bacula/bacula-dir-conf new file mode 100644 index 000000000..17a56161f --- /dev/null +++ b/main/bacula/bacula-dir-conf @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/bacula-dir + +# Options for the director daemon. +# The DIR can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf" diff --git a/main/bacula/bacula-dir-init b/main/bacula/bacula-dir-init new file mode 100644 index 000000000..033d72f9a --- /dev/null +++ b/main/bacula/bacula-dir-init @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-dir-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ + +depend() { + need net postgresql + after firewall + use dns bacula-fd bacula-sd +} + +start() { + ebegin "Starting bacula director" + start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \ + -- ${DIR_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bacula director" + start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-dir.*.pid + eend $? +} diff --git a/main/bacula/bacula-fd-conf b/main/bacula/bacula-fd-conf new file mode 100644 index 000000000..033ef74b4 --- /dev/null +++ b/main/bacula/bacula-fd-conf @@ -0,0 +1,4 @@ +# Config file for /etc/init.d/bacula-fd + +# Options for the file daemon. +FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf" diff --git a/main/bacula/bacula-fd-init b/main/bacula/bacula-fd-init new file mode 100644 index 000000000..1e36a1947 --- /dev/null +++ b/main/bacula/bacula-fd-init @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-fd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ + +depend() { + need net + use dns +} + +start() { + ebegin "Starting bacula file daemon" + start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \ + -- ${FD_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bacula file daemon" + start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-fd.*.pid + eend $? +} diff --git a/main/bacula/bacula-sd-conf b/main/bacula/bacula-sd-conf new file mode 100644 index 000000000..88e13aa0e --- /dev/null +++ b/main/bacula/bacula-sd-conf @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/bacula-sd + +# Options for the storage daemon. +# The SD can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +SD_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-sd.conf" diff --git a/main/bacula/bacula-sd-init b/main/bacula/bacula-sd-init new file mode 100644 index 000000000..2375b8e45 --- /dev/null +++ b/main/bacula/bacula-sd-init @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-sd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ + +depend() { + need net + use dns +} + +start() { + ebegin "Starting bacula storage daemon" + start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \ + -- ${SD_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bacula storage daemon" + start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-sd.*.pid + eend $? +} diff --git a/main/bacula/bacula.post-install b/main/bacula/bacula.post-install new file mode 100644 index 000000000..a09295736 --- /dev/null +++ b/main/bacula/bacula.post-install @@ -0,0 +1,10 @@ +#!/bin/sh +for dir in /var/bacula /var/log/bacula /var/run/bacula /var/lib/bacula /etc/bacula/scripts/make_catalog_backup* +do + chown bacula.bacula $dir +done + +for file in create_postgresql_database make_postgresql_tables grant_postgresql_privileges +do + chown postgres /etc/bacula/scripts/$file +done diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install new file mode 100644 index 000000000..bfac8567a --- /dev/null +++ b/main/bacula/bacula.pre-install @@ -0,0 +1,4 @@ +#!/bin/sh +addgroup -S bacula 2>/dev/null +adduser -h /var/bacula/ -s /bin/false -G bacula -S -H -D bacula 2>/dev/null +exit 0 diff --git a/main/bacula/configure.in.patch b/main/bacula/configure.in.patch new file mode 100644 index 000000000..cfe2a0b7c --- /dev/null +++ b/main/bacula/configure.in.patch @@ -0,0 +1,23 @@ +--- bacula-3.0.3-orig/autoconf/configure.in Sun Oct 18 09:10:16 2009 ++++ bacula-3.0.3/autoconf/configure.in Wed Dec 2 14:13:44 2009 +@@ -2576,6 +2576,20 @@ + fi + TAPEDRIVE="/dev/nrmt0" + ;; ++alpine) ++ dnl Make sure hostname is resolved ++ ping -c 1 $hostname 2>&1 1>/dev/null ++ if test ! $? = 0; then ++ hostname="localhost" ++ fi ++ if `test -f /etc/alpine-release && grep -q alpine /etc/alpine-release`; then ++ DISTNAME="alpine" ++ fi ++ DISTVER=`cat /etc/alpine-release` ++ TAPEDRIVE="/dev/nst0" ++ PSCMD="ps -e -o pid,comm" ++ largefile_support="yes" ++ ;; + bsdi) + DISTVER=`uname -a |awk '{print $3}'` + TAPEDRIVE="/dev/nrmt0" diff --git a/main/bacula/os.m4.patch b/main/bacula/os.m4.patch new file mode 100644 index 000000000..95dc5666a --- /dev/null +++ b/main/bacula/os.m4.patch @@ -0,0 +1,12 @@ +--- bacula-3.0.3-orig/autoconf/bacula-macros/os.m4 Sun Oct 18 09:10:16 2009 ++++ bacula-3.0.3/autoconf/bacula-macros/os.m4 Wed Dec 2 13:48:30 2009 +@@ -201,6 +201,9 @@ + elif test -f /etc/gentoo-release + then + DISTNAME=gentoo ++elif test -f /etc/alpine-release ++then ++ DISTNAME=alpine + elif test -f /etc/debian_version + then + DISTNAME=debian diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index b59af1b95..0b4b28ef2 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=clamav -pkgver=0.96 +pkgver=0.96.1 pkgrel=0 pkgusers=clamav pkggroups=clamav @@ -75,7 +75,7 @@ package() { mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav } -md5sums="28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.tar.gz +md5sums="38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz d64432c463850663c5041c3097f3e903 clamd.initd 567bc32b657dd7031b9b7beaa946203a clamd.confd f4d1f415322905128dc27135566ad136 freshclam.initd diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD index ec90644fa..b58927c73 100644 --- a/main/confuse/APKBUILD +++ b/main/confuse/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=confuse -pkgver=2.6 -pkgrel=1 +pkgver=2.7 +pkgrel=0 pkgdesc="C-library for parsing configuration files" url="http://www.nongnu.org/confuse" license="LGPL" depends= makedepends="flex bison pkgconfig" subpackages="$pkgname-dev" -source="http://bzero.se/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://savannah.nongnu.org/download/confuse/confuse-$pkgver.tar.gz" build() { cd "$srcdir"/$pkgname-$pkgver @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc } -md5sums="0e883d66f0f58fc33585b430c652aa30 confuse-2.6.tar.gz" +md5sums="45932fdeeccbb9ef4228f1c1a25e9c8f confuse-2.7.tar.gz" diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD new file mode 100644 index 000000000..671df0d53 --- /dev/null +++ b/main/cryptsetup/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=cryptsetup +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +url="http://code.google.com/p/cryptsetup/" +license="GPL" +depends= +makedepends="lvm2-dev libgcrypt-dev popt-dev util-linux-ng-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} +md5sums="f3928c1f1d49fcee39bb1e8d42fe707a cryptsetup-1.1.2.tar.bz2" diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD index 12f946ea4..a1f798507 100644 --- a/main/dbus/APKBUILD +++ b/main/dbus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus pkgver=1.2.24 -pkgrel=2 +pkgrel=3 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" pkggroups="messagebus" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev" depends_dev="util-linux-ng-dev" -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.post-install" source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd " diff --git a/main/dbus/dbus.post-install b/main/dbus/dbus.post-install new file mode 100644 index 000000000..305297a48 --- /dev/null +++ b/main/dbus/dbus.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +exec dbus-uuidgen --ensure diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD index 66f74eff9..3ccb17245 100644 --- a/main/diffutils/APKBUILD +++ b/main/diffutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=diffutils -pkgver=2.9 -pkgrel=1 +pkgver=3.0 +pkgrel=0 pkgdesc="Show differences among files" subpackages="$pkgname-doc" url="http://www.gnu.org/software/diffutils/" @@ -9,8 +9,7 @@ license="GPL2" depends="" makedepends="" install="$pkgname.post-deinstall" -source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz -$install" +source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" _builddir=$srcdir/$pkgname-$pkgver @@ -28,5 +27,4 @@ package() { make install DESTDIR=$pkgdir } -md5sums="d6bc1bdc874ddb14cfed4d1655a0dbbe diffutils-2.9.tar.gz -e8da9a22c2389fe5e2846b8c0de45767 diffutils.post-deinstall" +md5sums="684aaba1baab743a2a90e52162ff07da diffutils-3.0.tar.gz" diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index a57003380..aa64dda17 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dnsmasq -pkgver=2.52 -pkgrel=1 +pkgver=2.55 +pkgrel=0 pkgdesc="Small forwarding DNS server" url="http://www.thekelleys.org.uk/dnsmasq/" license="GPL-2" @@ -35,6 +35,6 @@ package() { install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf } -md5sums="1bb32fffdb4f977ead607802b5d701d0 dnsmasq-2.52.tar.gz +md5sums="b093d7c6bc7f97ae6fd35d048529232a dnsmasq-2.55.tar.gz db46459322a0c7d9ce4f68251fd265c4 dnsmasq.initd 5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 6dd77003a..c72d0bc39 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -2,17 +2,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=1.2.11 -pkgrel=3 +pkgrel=5 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" -depends= +depends="openssl" +pkgusers="dovecot" +pkggroups="dovecot" +depends="logrotate" makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev mysql-dev sqlite-dev" -install="dovecot.pre-install" +install="dovecot.pre-install dovecot.post-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql $pkgname-sqlite" source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz + dovecot.logrotate dovecot.initd " @@ -20,6 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ + --localstatedir=/var \ --sysconfdir=/etc/dovecot \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ @@ -36,8 +41,27 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -d "$pkgdir"/var/run/dovecot + install -d "$pkgdir"/var/run/dovecot \ + "$pkgdir"/etc/ssl/dovecot install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -D "$srcdir"/dovecot.logrotate "$pkgdir"/etc/logrotate.d/dovecot + install doc/dovecot-openssl.cnf "$pkgdir"/etc/dovecot/ + mv "$pkgdir"/etc/dovecot/dovecot-example.conf \ + "$pkgdir"/etc/dovecot/dovecot.conf || return 1 + + # fix ssl dirs in defautl config and set defautl passdb to passwd + sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \ + -e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \ + -e '/passdb pam {/,/^$/{ + s/passdb pam/\#passdb pam/ + s/}/\#}/ + }' \ + -e '/\#passdb passwd {/,/^$/{ + s/\#passdb passwd/passdb passwd/ + s/\#\}/\}/ + }' \ + -e 's,#log_path =.*,log_path = /var/log/dovecot.log,' \ + "$pkgdir"/etc/dovecot/dovecot.conf } _mv() { @@ -67,4 +91,5 @@ sqlite() { } md5sums="bdac013fd57aa616ea4bdd9ac34557c6 dovecot-1.2.11.tar.gz +aec5cc797ab2acf72ce3b6bb1030345f dovecot.logrotate c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" diff --git a/main/dovecot/dovecot.logrotate b/main/dovecot/dovecot.logrotate new file mode 100644 index 000000000..7bd0003f7 --- /dev/null +++ b/main/dovecot/dovecot.logrotate @@ -0,0 +1,15 @@ +/var/log/dovecot*.log { + daily + missingok + copytruncate + rotate 7 + compress + notifempty + sharedscripts + postrotate + if /etc/init.d/dovecot -q status ; then \ + /etc/init.d/dovecot reload > /dev/null 2>&1 || true ; \ + fi; + endscript +} + diff --git a/main/dovecot/dovecot.post-install b/main/dovecot/dovecot.post-install new file mode 100644 index 000000000..a7cccddfd --- /dev/null +++ b/main/dovecot/dovecot.post-install @@ -0,0 +1,31 @@ +#!/bin/sh + +# based on doc/mkcert.sh + +# Generates a self-signed certificate. +# Edit dovecot-openssl.cnf before running this. + +OPENSSL=${OPENSSL-openssl} +SSLDIR=${SSLDIR-/etc/ssl/dovecot} +OPENSSLCONFIG=${OPENSSLCONFIG-/etc/dovecot/dovecot-openssl.cnf} + +CERTDIR=$SSLDIR +KEYDIR=$SSLDIR + +CERTFILE=$CERTDIR/server.pem +KEYFILE=$KEYDIR/server.key + +if [ -e "$CERTFILE" ]; then + echo "Keeiping existing $CERTFILE" + exit 0 +fi + +if [ -e "$KEYFILE" ]; then + echo "Keeiping existing $KEYFILE" + exit 0 +fi + +$OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2 +chmod 0600 $KEYFILE +echo +$OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2 diff --git a/main/ebtables/0001-link-with-gcc.patch b/main/ebtables/0001-link-with-gcc.patch new file mode 100644 index 000000000..88aba09f3 --- /dev/null +++ b/main/ebtables/0001-link-with-gcc.patch @@ -0,0 +1,25 @@ +--- a/Makefile Sun Jun 21 13:13:25 2009 ++++ b/Makefile Wed Oct 28 02:42:43 2009 +@@ -85,7 +85,7 @@ + + .PHONY: libebtc + libebtc: $(OBJECTS2) +- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) ++ $(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2) + + ebtables: $(OBJECTS) ebtables-standalone.o libebtc + $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ +@@ -153,10 +153,13 @@ + tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g') + .PHONY: scripts + scripts: ebtables-save ebtables.sysv ebtables-config ++ mkdir -p $(DESTDIR)$(BINDIR) + cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ + install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save ++ mkdir -p $(DESTDIR)$(INITDIR) + cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ + install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables ++ mkdir -p $(DESTDIR)$(SYSCONFIGDIR) + cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ + install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config + rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ diff --git a/main/ebtables/APKBUILD b/main/ebtables/APKBUILD new file mode 100644 index 000000000..b92839eb2 --- /dev/null +++ b/main/ebtables/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: Andrew Manison <amanison@anselsystems.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=ebtables +pkgver=2.0.9.1 +_realver=v2.0.9-1 +pkgrel=2 +pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." +url="http://ebtables.sourceforge.net/" +license="GPL" +depends= +makedepends= +install= +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz + 0001-link-with-gcc.patch + ebtables.initd + ebtables.confd" + +prepare() { + cd "$srcdir"/$pkgname-$_realver + # patches + for i in ../*.patch; do + msg "Applying $i" + if ! patch --verbose -p1 -i $i; then + error "$i failed" + return 1 + fi + done + + sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \ + -e "s,^BINDIR:=.*,BINDIR:=/sbin," \ + -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/ebtables," \ + -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/ebtables,"\ + -e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \ + -e "s/^CFLAGS:=/CFLAGS+=/" \ + -e "s,^CC:=,CC?=," Makefile +} + +build() { + cd "$srcdir"/$pkgname-$_realver + + # This package uses _init functions to initialise extensions. With + # --as-needed this will not work. + export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$_realver + make DESTDIR="$pkgdir" install + install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables + install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables +} + +md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz +91a565a5906dc1fd4103f03c6a88e0e1 0001-link-with-gcc.patch +92e13b3bc1d47d7c00636ebb78c905d5 ebtables.initd +285089ba2d846e72e321a12e3da3cc96 ebtables.confd" diff --git a/main/ebtables/ebtables.confd b/main/ebtables/ebtables.confd new file mode 100644 index 000000000..db46ffb58 --- /dev/null +++ b/main/ebtables/ebtables.confd @@ -0,0 +1,15 @@ +# /etc/conf.d/ebtables + +# Location in which ebtables initscript will save set rules on +# service shutdown +EBTABLES_SAVE="/var/lib/ebtables/rules-save" + +# Options to pass to ebtables-save and ebtables-restore +SAVE_RESTORE_OPTIONS="" + +# Save state on stopping ebtables +SAVE_ON_STOP="yes" + +# Tables to be saved and restored. If you have built ebtables as modules, you +# may leave it blank. Otherwise, you MUST define which to control. +TABLE_NAMES="filter nat broute" diff --git a/main/ebtables/ebtables.initd b/main/ebtables/ebtables.initd new file mode 100644 index 000000000..27c743c91 --- /dev/null +++ b/main/ebtables/ebtables.initd @@ -0,0 +1,97 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $ + +opts="save reload panic" + +ebtables_bin="/sbin/ebtables" +ebtables_save=${EBTABLES_SAVE} +ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//) +if [ "$ebtables_tables" == "" ] ; then + ebtables_tables=${TABLE_NAMES} +fi + +depend() { + before net + use logger +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + broute) chains="BROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${ebtables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkconfig() { + if [ ! -f ${ebtables_save} ] ; then + eerror "Not starting ebtables. First create some rules then run:" + eerror "/etc/init.d/ebtables save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ebtables state and starting bridge firewall" + ${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + ebegin "Stopping bridge firewall" + local a + for a in ${ebtables_tables}; do + set_table_policy $a ACCEPT + + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? +} + +reload() { + ebegin "Flushing bridge firewall" + local a + for a in ${ebtables_tables}; do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? + + start +} + +save() { + ebegin "Saving ebtables state" + touch "${ebtables_save}" + chmod 0600 "${ebtables_save}" + ${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}" + eend $? +} + +panic() { + service_started ebtables && svc_stop + + local a + ebegin "Dropping all packets forwarded on bridges" + for a in ${ebtables_tables}; do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + + set_table_policy $a DROP + done + eend $? +} diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD index 897f279f9..427aafd5f 100644 --- a/main/exo/APKBUILD +++ b/main/exo/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # TODO: hal pkgname=exo -pkgver=0.3.106 -pkgrel=2 +pkgver=0.3.107 +pkgrel=0 pkgdesc="Extensions to Xfce by os-cillation" url="http://www.os-cillation.com/article.php?sid=40" license="GPL-2 LGPL-2" @@ -31,4 +31,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="927905f89252fa397e50d7a4fbf3c9a7 exo-0.3.106.tar.bz2" +md5sums="3a92cca0c99ee940db4410891c9e8498 exo-0.3.107.tar.bz2" diff --git a/main/ferm/APKBUILD b/main/ferm/APKBUILD new file mode 100644 index 000000000..b6710399a --- /dev/null +++ b/main/ferm/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=ferm +pkgver=2.0.5 +pkgrel=0 +pkgdesc="firewall configuration tool" +url="http://ferm.foo-projects.org/" +license="GPL" +depends="perl iptables" +makedepends="" +install= +subpackages="" +source="http://ferm.foo-projects.org/download/2.0/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + install -m755 -D "$srcdir"/"$pkgname-$pkgver"/src/ferm "$pkgdir"/usr/sbin/"$pkgname" + install -m755 -D "$srcdir"/"$pkgname-$pkgver"/src/import-ferm "$pkgdir"/usr/sbin/import-ferm +} + +md5sums="e77db05360877299cb6fa8c5b51a5e77 ferm-2.0.5.tar.gz" diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 860ec0ffe..1f9407ecd 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=freeswitch pkgver=1.0.6 -pkgrel=6 +pkgrel=8 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" license="GPL" @@ -14,8 +14,6 @@ source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz modules.conf freeswitch.confd freeswitch.initd - freeswitch.post-install - freeswitch.pre-install " build() { @@ -32,6 +30,8 @@ build() { --with-rundir=/var/run/freeswitch \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --with-devrandom=/dev/urandom \ + || return 1 make all || return 1 } @@ -56,6 +56,4 @@ package(){ md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz c05f2356be159e99b3845f5260a33599 modules.conf c608cca8ad773acebf201f581438c7e7 freeswitch.confd -a15f739b6f4f2c1685ab9f8831d30ca6 freeswitch.initd -107c52398ff88275006b8223ee0b4907 freeswitch.post-install -25945ad43b7dd988f37bf6f2603e22be freeswitch.pre-install" +6973e15d72e5876152b160bd9e8d282b freeswitch.initd" diff --git a/main/freeswitch/freeswitch.initd b/main/freeswitch/freeswitch.initd index 0538fff56..91df7e2ac 100755 --- a/main/freeswitch/freeswitch.initd +++ b/main/freeswitch/freeswitch.initd @@ -4,55 +4,60 @@ # $Header: $ depend() { - need net + need net } opts="reload" +pidfile=/var/run/freeswitch/freeswitch.pid start() { - local OPTS - - [ -n "${FREESWITCH_USER}" ] && \ - OPTS="${OPTS} -u ${FREESWITCH_USER}" - - [ -n "${FREESWITCH_GROUP}" ] && \ - OPTS="${OPTS} -g ${FREESWITCH_GROUP}" - - [ -n "${FREESWITCH_OPTS}" ] && \ - OPTS="${OPTS} ${FREESWITCH_OPTS}" - - ebegin "Starting Freeswitch" - limits - start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \ - -- -nc -conf /etc/freeswitch -log /var/log/freeswitch \ - -run /var/run/freeswitch -db /var/lib/freeswitch/db \ - -htdocs /usr/share/freeswitch/htdocs \ - -scripts /usr/share/freeswitch/scripts ${OPTS} - eend $? + local OPTS + + [ -n "${FREESWITCH_USER}" ] && \ + OPTS="${OPTS} -u ${FREESWITCH_USER}" + + [ -n "${FREESWITCH_GROUP}" ] && \ + OPTS="${OPTS} -g ${FREESWITCH_GROUP}" + + [ -n "${FREESWITCH_OPTS}" ] && \ + OPTS="${OPTS} ${FREESWITCH_OPTS}" + + ebegin "Starting Freeswitch" + limits + start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \ + -- \ + -nc -conf /etc/freeswitch -log /var/log/freeswitch \ + -run /var/run/freeswitch -db /var/lib/freeswitch/db \ + -htdocs /usr/share/freeswitch/htdocs \ + -scripts /usr/share/freeswitch/scripts ${OPTS} + eend $? } # Recomended ULIMIT settings # http://tinyurl.com/2dr467l (i,q,u,x not suppoted) limits() { - ulimit -c unlimited - ulimit -d unlimited - ulimit -f unlimited - ulimit -n 999999 - ulimit -v unlimited - ulimit -s 244 - ulimit -l unlimited + ulimit -c unlimited + ulimit -d unlimited + ulimit -f unlimited + ulimit -n 999999 + ulimit -v unlimited + ulimit -s 244 + ulimit -l unlimited } stop() { - ebegin "Stopping Freeswitch" - /usr/bin/freeswitch -stop - eend $? + ebegin "Stopping Freeswitch" + start-stop-daemon --quiet --stop \ + --pidfile $pidfile \ + --retry 10 \ + --exec /usr/bin/freeswitch + eend $? } reload() { - start-stop-daemon --stop --signal 1 --quiet --pidfile \ - /var/run/freeswitch.pid --name freeswitch - return 0 + start-stop-daemon --stop --signal 1 --quiet \ + --pidfile $pidfile --name freeswitch + return 0 } diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 4668a0685..da3bdc129 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gcc -pkgver=4.4.3 +pkgver=4.4.4 _pv=4.4.2 _specsver=0.1.7 _espfver=0.3.6 _uclibc_abiver=0.9.32 -pkgrel=3 +pkgrel=0 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" license="GPL LGPL" @@ -126,8 +126,8 @@ libgomp() { mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/ } -md5sums="054b66f315b3d04ad06544ce26e72365 gcc-core-4.4.3.tar.bz2 -cd179ec4f05ee17ce76464da25a2674c gcc-g++-4.4.3.tar.bz2 +md5sums="eb68755f64b9a4e37751992abb41c4fc gcc-core-4.4.4.tar.bz2 +d51a6ec3eac1a90e7fc280d976ce7f80 gcc-g++-4.4.4.tar.bz2 72643cf4f9751d6cbfdbce483b92461d gcc-4.4.2-espf-0.3.6.tar.bz2 528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2 c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch diff --git a/main/geh/APKBUILD b/main/geh/APKBUILD new file mode 100644 index 000000000..4f768bdaa --- /dev/null +++ b/main/geh/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: +# Maintainer: +pkgname=geh +pkgver=0.2.0 +pkgrel=0 +pkgdesc="a simple commandline image viewer written in C/Gtk+" +url="https://projects.pekdon.net/projects/geh" +license="GPL" +depends= +makedepends="gtk+-dev intltool" +install= +subpackages="$pkgname-doc" +source="http://projects.pekdon.net/projects/geh/files/geh-$pkgver.tar.gz" + +# append extra dependencies to -dev subpackage +# remove if not used. +# depends_dev="somepackage-dev" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + # 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="2349b774e7f0c288061fcfc8c296f20d geh-0.2.0.tar.gz" diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD new file mode 100644 index 000000000..8fbcb018d --- /dev/null +++ b/main/gnumeric/APKBUILD @@ -0,0 +1,30 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gnumeric +pkgver=1.10.5 +pkgrel=0 +pkgdesc="A GNOME Spreadsheet Program" +url="http://www.gnome.org/projects/gnumeric/" +license="GPL" +makedepends="gtk+-dev intltool desktop-file-utils libglade-dev goffice-dev + rarian" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.10/$pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-schemas-install \ + --disable-static \ + --enable-ssindex || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 +} +md5sums="157b0bde46435566122327696a44d4cb gnumeric-1.10.5.tar.bz2" diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD index ebbefb1c4..a27d4607c 100644 --- a/main/gobject-introspection/APKBUILD +++ b/main/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gobject-introspection -pkgver=0.6.10 +pkgver=0.6.14 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" @@ -33,4 +33,4 @@ libgirepository() { mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ } -md5sums="cdf7af644a0407c3fd2d57ba2bb3549f gobject-introspection-0.6.10.tar.bz2" +md5sums="7ea9be9a347b5c408fd3c3907803de9b gobject-introspection-0.6.14.tar.bz2" diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD index 51c0be8d7..513f25f04 100644 --- a/main/goffice/APKBUILD +++ b/main/goffice/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=goffice -pkgver=0.8.3 +pkgver=0.8.5 pkgrel=0 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" url="http://www.gnome.org" @@ -26,4 +26,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="f8c4fd47e1ef9d2512126d1074952201 goffice-0.8.3.tar.bz2" +md5sums="3dda09fa540c947d45384b53713e49d5 goffice-0.8.5.tar.bz2" diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD index 1f5e44377..07fba13cc 100644 --- a/main/gtk+/APKBUILD +++ b/main/gtk+/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+ pkgver=2.20.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" @@ -34,7 +34,7 @@ makedepends="pkgconfig zlib-dev" source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" -depends_dev="atk-dev pango-dev cairo-dev glib-dev" +depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool" build() { cd "$srcdir"/gtk+-$pkgver ./configure --prefix=/usr \ diff --git a/main/gtkspell/APKBUILD b/main/gtkspell/APKBUILD new file mode 100644 index 000000000..7e8d2a1dc --- /dev/null +++ b/main/gtkspell/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gtkspell +pkgver=2.0.16 +pkgrel=0 +pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" +url="http://gtkspell.sourceforge.net/" +license="GPL" +makedepends="gtk+-dev enchant-dev intltool" +subpackages="$pkgname-dev $pkgname-doc" +source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz" + +depends_dev="gtk+-dev" +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="f75dcc9338f182c571b321d37c606a94 gtkspell-2.0.16.tar.gz" diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index deab8f868..1bf4d91fc 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal -pkgver=1.3.1 -pkgrel=5 +pkgver=1.3.3 +pkgrel=0 pkgdesc="An implementation of Kerberos 5" url="http://www.h5l.org/" license="BSD" @@ -20,9 +20,7 @@ source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz 013_all_heimdal-pthread-lib.patch 014_all_heimdal-path.patch 100-check-com_err-pthread.patch -heimdal-c++-safe-krb5_cccol_cursor.patch heimdal-locate_plugin-header.patch -return-invalid-enctype-for-weak-crypto.patch " # krb5.h needs com_err.h @@ -40,9 +38,7 @@ prepare() { patch -Np1 -i ../013_all_heimdal-pthread-lib.patch || return 1 patch -Np0 -i ../014_all_heimdal-path.patch || return 1 patch -Np1 -i ../100-check-com_err-pthread.patch || return 1 - patch -Np1 -i ../heimdal-c++-safe-krb5_cccol_cursor.patch || return 1 patch -Np1 -i ../heimdal-locate_plugin-header.patch || return 1 - patch -Np1 -i ../return-invalid-enctype-for-weak-crypto.patch || return 1 # name clash with ruserpass in netdb.h sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1 @@ -169,7 +165,7 @@ kf() { mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf } -md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz +md5sums="963c09f1b14c41660be70b55fae9f163 heimdal-1.3.3.tar.gz 98e28f11f906c967aac22d6184102c9e 001_all_heimdal-no_libedit.patch 6d5571bdedba2e2423b90bccdbac2c0a 002_all_heimdal-fPIC.patch 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch @@ -177,6 +173,4 @@ md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz 1b8665b771c4eb6b56ea8582c96e56e3 013_all_heimdal-pthread-lib.patch 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch e73205200f9641b5d969427ffb04282a 100-check-com_err-pthread.patch -7ebff9a320f18ed62f5fcb68c8fc18b8 heimdal-c++-safe-krb5_cccol_cursor.patch -248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch -a8342f77a1aedb4f332983bcbf141827 return-invalid-enctype-for-weak-crypto.patch" +248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch" diff --git a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch b/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch deleted file mode 100644 index c68879453..000000000 --- a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- heimdal-1.3.1-old/lib/krb5/cache.c Sat Nov 21 15:41:51 2009 -+++ heimdal-1.3.1/lib/krb5/cache.c Thu Jan 21 09:12:13 2010 -@@ -1347,10 +1347,11 @@ - * - */ - --struct krb5_cccol_cursor { -+struct krb5_cccol_cursor_data { - int idx; - krb5_cc_cache_cursor cursor; - }; -+/* typedef of krb5_cccol_cursor is in krb5.h */ - - /** - * Get a new cache interation cursor that will interate over all ---- heimdal-1.3.1-old/lib/krb5/krb5.h Sat Nov 21 15:41:51 2009 -+++ heimdal-1.3.1/lib/krb5/krb5.h Thu Jan 21 09:12:54 2010 -@@ -311,7 +311,7 @@ - NULL) - - typedef void *krb5_cc_cursor; --typedef struct krb5_cccol_cursor *krb5_cccol_cursor; -+typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor; - - typedef struct krb5_ccache_data { - const struct krb5_cc_ops *ops; diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 3778adc96..60ecebbec 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.6.1.5 +pkgver=6.6.2.0 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -47,4 +47,4 @@ dev() { "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ } -md5sums="ab2468747f3960bdc8d779e89b052860 ImageMagick-6.6.1-5.tar.gz" +md5sums="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz" diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD index bb0b27a6f..cb5ef0920 100644 --- a/main/iproute2-qos/APKBUILD +++ b/main/iproute2-qos/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ilya Strelkin <iilluzion@gmail.com> # Maintainer: Ilya Strelkin <iilluzion@gmail.com> pkgname=iproute2-qos -pkgver=0.3 +pkgver=0.4 pkgrel=0 pkgdesc="Scripts to set up quality of service with iproute2" url="http://git.alpinelinux.org/cgit/aports" @@ -19,7 +19,7 @@ build() { "$pkgdir"/etc/conf.d/qos.ifb0.sample } -md5sums="dda96b445c6e4fe377e918f860825fb1 qos.initd +md5sums="13d9c58253905f349b953593036b8134 qos.initd 79cecb47b3d1f623d2f6790044b3afee qos.eth0.sample 9f8d3514081624ea2ad2606c1564c759 qos.ifb0.sample 785aff5d4284c47038a009797c576e34 setup-qos" diff --git a/main/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd index 9986a8cce..09677353a 100644 --- a/main/iproute2-qos/qos.initd +++ b/main/iproute2-qos/qos.initd @@ -225,11 +225,11 @@ set_filters() set_htb() { $ECHO tc qdisc add dev $DEV root handle 1 htb default 60 - $ECHO tc class add dev $DEV parent 1: classid 1:2 htb rate $DEV_RATE - $ECHO tc class add dev $DEV parent 1:2 classid 1:30 htb rate $WAN_SUB_RATE - $ECHO tc class add dev $DEV parent 1:30 classid 1:40 htb rate $INTERACTIVE_RATE prio 1 - $ECHO tc class add dev $DEV parent 1:30 classid 1:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 - $ECHO tc class add dev $DEV parent 1:30 classid 1:60 htb rate $BESTEFFORT_RATE ceil $WAN_SUB_RATE prio 6 + $ECHO tc class add dev $DEV parent 1: classid 1:2 htb rate $DEV_RATE burst $(($DEV_RATE*5/4)) + $ECHO tc class add dev $DEV parent 1:2 classid 1:30 htb rate $WAN_SUB_RATE burst $(($WAN_SUB_RATE*5/4)) + $ECHO tc class add dev $DEV parent 1:30 classid 1:40 htb rate $INTERACTIVE_RATE ceil $WAN_SUB_RATE prio 1 + $ECHO tc class add dev $DEV parent 1:30 classid 1:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 burst $(($WAN_SUB_RATE*5/4)) + $ECHO tc class add dev $DEV parent 1:30 classid 1:60 htb rate $BESTEFFORT_RATE ceil $WAN_SUB_RATE prio 6 burst $(($WAN_SUB_RATE*5/4)) if [ $OUT_OF_WAN_RATE -gt 0 ]; then $ECHO tc class add dev $DEV parent 1:2 classid 1:70 htb rate $OUT_OF_WAN_RATE prio 7 @@ -250,7 +250,7 @@ set_hfsc() $ECHO tc qdisc add dev $DEV root handle 1 hfsc default 60 $ECHO tc class add dev $DEV parent 1: classid 1:2 hfsc sc rate $DEV_RATE ul rate $DEV_RATE $ECHO tc class add dev $DEV parent 1:2 classid 1:30 hfsc sc rate $WAN_SUB_RATE ul rate $WAN_SUB_RATE - $ECHO tc class add dev $DEV parent 1:30 classid 1:40 hfsc sc umax $INTERACTIVE_HFSC_UMAX dmax $INTERACTIVE_HFSC_DMAX rate $INTERACTIVE_RATE ul rate $INTERACTIVE_RATE + $ECHO tc class add dev $DEV parent 1:30 classid 1:40 hfsc sc umax $INTERACTIVE_HFSC_UMAX dmax $INTERACTIVE_HFSC_DMAX rate $INTERACTIVE_RATE ul rate $WAN_SUB_RATE $ECHO tc class add dev $DEV parent 1:30 classid 1:50 hfsc sc umax $PRIVILEGED_HFSC_UMAX dmax $PRIVILEGED_HFSC_DMAX rate $PRIVILEGED_RATE ul rate $WAN_SUB_RATE $ECHO tc class add dev $DEV parent 1:30 classid 1:60 hfsc sc rate $BESTEFFORT_RATE ul rate $WAN_SUB_RATE @@ -272,7 +272,7 @@ set_prio() { PARENT_CLASSID=10 $ECHO tc qdisc add dev $DEV root handle 1 prio bands 2 priomap 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 # by default unclassified traffic goes to flowid 1:2 - $ECHO tc qdisc add dev $DEV parent 1:1 handle 40: tbf rate $INTERACTIVE_RATE burst $INTERACTIVE_PRIO_BURST latency $INTERACTIVE_PRIO_LATENCY + $ECHO tc qdisc add dev $DEV parent 1:1 handle 40: tbf rate $INTERACTIVE_RATE burst $WAN_SUB_RATE latency $INTERACTIVE_PRIO_LATENCY $ECHO tc qdisc add dev $DEV parent 1:2 handle $PARENT_CLASSID: htb default 60 $ECHO tc class add dev $DEV parent $PARENT_CLASSID: classid $PARENT_CLASSID:30 htb rate $WAN_SUB_RATE $ECHO tc class add dev $DEV parent $PARENT_CLASSID:30 classid $PARENT_CLASSID:50 htb rate $PRIVILEGED_RATE ceil $WAN_SUB_RATE prio 3 @@ -309,7 +309,7 @@ set_police() # burst = rate / 17 (taken basing on experemental results) POLICE_BURST_SCALE=17 - WAN_POLICE_BURST=$((WAN_RATE / POLICE_BURST_SCALE)) + WAN_POLICE_BURST=$((WAN_RATE / POLICE_BURST_SCALE)) WAN_POLICE_FLOWID=1 @@ -329,9 +329,9 @@ set_cpolice() # burst = rate / 17 (taken basing on experemental results) POLICE_BURST_SCALE=17 - INTERACTIVE_POLICE_BURST=$((INTERACTIVE_RATE / POLICE_BURST_SCALE)) - PRIVILEGED_POLICE_BURST=$((PRIVILEGED_RATE / POLICE_BURST_SCALE)) - BESTEFFORT_POLICE_BURST=$((BESTEFFORT_RATE / POLICE_BURST_SCALE)) + INTERACTIVE_POLICE_BURST=$((INTERACTIVE_RATE / POLICE_BURST_SCALE)) + PRIVILEGED_POLICE_BURST=$((PRIVILEGED_RATE / POLICE_BURST_SCALE)) + BESTEFFORT_POLICE_BURST=$((BESTEFFORT_RATE / POLICE_BURST_SCALE)) CLASS_TYPES="INTERACTIVE PRIVILEGED" INTERACTIVE_POLICE_FLOWID=1 diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 01cdcee6e..6ca299910 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 pkgver=2.6.33 -_realver=2.6.31 -pkgrel=0 +_realver=2.6.33 +pkgrel=1 pkgdesc="IP Routing Utilities" url="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL2" @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="230f35282a95451622f3e8394f9cd80a iproute2-2.6.31.tar.bz2" +md5sums="b371fca3fcb5e436e69a7c2111d84a3c iproute2-2.6.33.tar.bz2" diff --git a/main/ipsec-tools/90-openssl-oneshot.patch b/main/ipsec-tools/90-openssl-oneshot.patch new file mode 100644 index 000000000..ece12a52d --- /dev/null +++ b/main/ipsec-tools/90-openssl-oneshot.patch @@ -0,0 +1,210 @@ +Index: src/racoon/crypto_openssl.c +=================================================================== +RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c,v +retrieving revision 1.19 +diff -u -r1.19 crypto_openssl.c +--- a/src/racoon/crypto_openssl.c 29 Apr 2009 10:50:01 -0000 1.19 ++++ b/src/racoon/crypto_openssl.c 4 Jun 2010 09:13:18 -0000 +@@ -1800,6 +1800,42 @@ + return (caddr_t)c; + } + ++static vchar_t *eay_hmac_one(key, data, type) ++ vchar_t *key, *data; ++ const EVP_MD *type; ++{ ++ vchar_t *res; ++ ++ if ((res = vmalloc(EVP_MD_size(type))) == 0) ++ return NULL; ++ ++ if (!HMAC(type, (void *) key->v, key->l, ++ (void *) data->v, data->l, (void *) res->v, NULL)) { ++ vfree(res); ++ return NULL; ++ } ++ ++ return res; ++} ++ ++static vchar_t *eay_digest_one(data, type) ++ vchar_t *data; ++ const EVP_MD *type; ++{ ++ vchar_t *res; ++ ++ if ((res = vmalloc(EVP_MD_size(type))) == 0) ++ return NULL; ++ ++ if (!EVP_Digest((void *) data->v, data->l, ++ (void *) res->v, NULL, type, NULL)) { ++ vfree(res); ++ return NULL; ++ } ++ ++ return res; ++} ++ + #ifdef WITH_SHA2 + /* + * HMAC SHA2-512 +@@ -1808,14 +1844,7 @@ + eay_hmacsha2_512_one(key, data) + vchar_t *key, *data; + { +- vchar_t *res; +- caddr_t ctx; +- +- ctx = eay_hmacsha2_512_init(key); +- eay_hmacsha2_512_update(ctx, data); +- res = eay_hmacsha2_512_final(ctx); +- +- return(res); ++ return eay_hmac_one(key, data, EVP_sha2_512()); + } + + caddr_t +@@ -1865,14 +1894,7 @@ + eay_hmacsha2_384_one(key, data) + vchar_t *key, *data; + { +- vchar_t *res; +- caddr_t ctx; +- +- ctx = eay_hmacsha2_384_init(key); +- eay_hmacsha2_384_update(ctx, data); +- res = eay_hmacsha2_384_final(ctx); +- +- return(res); ++ return eay_hmac_one(key, data, EVP_sha2_384()); + } + + caddr_t +@@ -1922,14 +1944,7 @@ + eay_hmacsha2_256_one(key, data) + vchar_t *key, *data; + { +- vchar_t *res; +- caddr_t ctx; +- +- ctx = eay_hmacsha2_256_init(key); +- eay_hmacsha2_256_update(ctx, data); +- res = eay_hmacsha2_256_final(ctx); +- +- return(res); ++ return eay_hmac_one(key, data, EVP_sha2_256()); + } + + caddr_t +@@ -1980,14 +1995,7 @@ + eay_hmacsha1_one(key, data) + vchar_t *key, *data; + { +- vchar_t *res; +- caddr_t ctx; +- +- ctx = eay_hmacsha1_init(key); +- eay_hmacsha1_update(ctx, data); +- res = eay_hmacsha1_final(ctx); +- +- return(res); ++ return eay_hmac_one(key, data, EVP_sha1()); + } + + caddr_t +@@ -2037,14 +2045,7 @@ + eay_hmacmd5_one(key, data) + vchar_t *key, *data; + { +- vchar_t *res; +- caddr_t ctx; +- +- ctx = eay_hmacmd5_init(key); +- eay_hmacmd5_update(ctx, data); +- res = eay_hmacmd5_final(ctx); +- +- return(res); ++ return eay_hmac_one(key, data, EVP_md5()); + } + + caddr_t +@@ -2130,14 +2131,7 @@ + eay_sha2_512_one(data) + vchar_t *data; + { +- caddr_t ctx; +- vchar_t *res; +- +- ctx = eay_sha2_512_init(); +- eay_sha2_512_update(ctx, data); +- res = eay_sha2_512_final(ctx); +- +- return(res); ++ return eay_digest_one(data, EVP_sha512()); + } + + int +@@ -2190,14 +2184,7 @@ + eay_sha2_384_one(data) + vchar_t *data; + { +- caddr_t ctx; +- vchar_t *res; +- +- ctx = eay_sha2_384_init(); +- eay_sha2_384_update(ctx, data); +- res = eay_sha2_384_final(ctx); +- +- return(res); ++ return eay_digest_one(data, EVP_sha2_384()); + } + + int +@@ -2250,14 +2237,7 @@ + eay_sha2_256_one(data) + vchar_t *data; + { +- caddr_t ctx; +- vchar_t *res; +- +- ctx = eay_sha2_256_init(); +- eay_sha2_256_update(ctx, data); +- res = eay_sha2_256_final(ctx); +- +- return(res); ++ return eay_digest_one(data, EVP_sha2_256()); + } + + int +@@ -2309,14 +2289,7 @@ + eay_sha1_one(data) + vchar_t *data; + { +- caddr_t ctx; +- vchar_t *res; +- +- ctx = eay_sha1_init(); +- eay_sha1_update(ctx, data); +- res = eay_sha1_final(ctx); +- +- return(res); ++ return eay_digest_one(data, EVP_sha1()); + } + + int +@@ -2367,14 +2340,7 @@ + eay_md5_one(data) + vchar_t *data; + { +- caddr_t ctx; +- vchar_t *res; +- +- ctx = eay_md5_init(); +- eay_md5_update(ctx, data); +- res = eay_md5_final(ctx); +- +- return(res); ++ return eay_digest_one(data, EVP_md5()); + } + + int diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index 4d8ef0d0c..5534d78b7 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD @@ -2,7 +2,7 @@ pkgname=ipsec-tools pkgver=0.8_alpha20090903 _myver=0.8-alpha20090903 -pkgrel=8 +pkgrel=9 pkgdesc="User-space IPsec tools for various IPsec implementations" url="http://ipsec-tools.sourceforge.net/" license="BSD" @@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_myver.tar.gz 60-debug-quick.patch initial-contact-fix.diff fd-priorities.patch + 90-openssl-oneshot.patch " _builddir="$srcdir"/$pkgname-$_myver @@ -62,4 +63,5 @@ md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd ipsec-tools-0.8-alpha20090903.tar.gz 13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch 69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff -c1e8b8dc80ef4b5d79fece52a4865e68 fd-priorities.patch" +c1e8b8dc80ef4b5d79fece52a4865e68 fd-priorities.patch +11e2c21e443edab17725f74ffeaddb76 90-openssl-oneshot.patch" diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD index 85a151c62..9ebd4ed69 100644 --- a/main/lame/APKBUILD +++ b/main/lame/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lame -pkgver=3.98.3 +pkgver=3.98.4 _ver=398-2 -pkgrel=1 +pkgrel=0 pkgdesc="An MP3 encoder and graphical frame analyzer" url="http://lame.sourceforge.net/" license="LGPL" diff --git a/main/libc0.9.32/0001-ldd-segfault-fix.patch b/main/libc0.9.32/0001-ldd-segfault-fix.patch deleted file mode 100644 index 4384fa548..000000000 --- a/main/libc0.9.32/0001-ldd-segfault-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f29b6882327573ec4e694c1c852307c957d544b9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 5 May 2009 14:10:42 +0000 -Subject: [PATCH] ldd segfault fix - -Fixes ldd segfault on this testcase: - -extern void _dl_getenv(void); -void foo(void) -{ - printf("foo: %x\n", &_dl_getenv); -} - -linked as -shared ---- - utils/ldd.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/utils/ldd.c b/utils/ldd.c -index 1f1dc25..2cd173c 100644 ---- a/utils/ldd.c -+++ b/utils/ldd.c -@@ -576,18 +576,20 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr) - } - newlib->name = NULL; - newlib->path = NULL; -- return NULL; -+ break; - } - } -- if (newlib == NULL) -+ if (newlib == NULL) { - newlib = malloc(sizeof(struct library)); -+ if (newlib) -+ newlib->next = NULL; -+ } - if (!newlib) - return NULL; - newlib->name = malloc(strlen(s) + 1); - strcpy(newlib->name, s); - newlib->path = strdup(newlib->name); - newlib->resolved = 1; -- newlib->next = NULL; - - #if 0 - /*printf("find_elf_interpreter is adding '%s' to '%s'\n", newlib->name, newlib->path); */ --- -1.6.2.3 - diff --git a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch deleted file mode 100644 index 2898a0d02..000000000 --- a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 67403d1d692c3b8022b0adca127a2c14ef8e3237 Mon Sep 17 00:00:00 2001 -From: Timo Teras <timo.teras@iki.fi> -Date: Fri, 7 May 2010 11:28:27 +0300 -Subject: [PATCH 1/2] static build: fix internal locking weaks to get pulled in always - -Linker is smart and does not pull in weaks.os, ever. This happens -because that compilation unit does not get strong references and -ld eliminates dead code. We really need the weaks for static build -in a compilation unit that is always there, otherwise it won't work. - -Signed-off-by: Timo Teras <timo.teras@iki.fi> ---- - libc/misc/internals/__uClibc_main.c | 35 ++++++++++++++++++++++++++++++ - libc/misc/pthread/Makefile.in | 1 - - libc/misc/pthread/weaks.c | 40 ----------------------------------- - 3 files changed, 35 insertions(+), 41 deletions(-) - delete mode 100644 libc/misc/pthread/weaks.c - -diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index f7e45c6..f9e1244 100644 ---- a/libc/misc/internals/__uClibc_main.c -+++ b/libc/misc/internals/__uClibc_main.c -@@ -68,6 +68,41 @@ uintptr_t __guard attribute_relro; - */ - - void internal_function _dl_aux_init (ElfW(auxv_t) *av); -+ -+/* -+ * uClibc internal locking requires that we have weak aliases -+ * for dummy functions in case libpthread.a is not linked in. -+ * This needs to be in compilation unit that is pulled always -+ * in or linker will disregard these weaks. -+ */ -+ -+static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } -+weak_alias (__pthread_return_0, __pthread_mutex_lock) -+weak_alias (__pthread_return_0, __pthread_mutex_trylock) -+weak_alias (__pthread_return_0, __pthread_mutex_unlock) -+ -+int weak_function -+__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) -+{ -+ return 0; -+} -+ -+void weak_function -+_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, -+ void (*__routine) (void *), void *__arg) -+{ -+ __buffer->__routine = __routine; -+ __buffer->__arg = __arg; -+} -+ -+void weak_function -+_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, -+ int __execute) -+{ -+ if (__execute) -+ __buffer->__routine(__buffer->__arg); -+} -+ - #endif /* !SHARED */ - - /* -diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in -index 69cdf10..2f436ac 100644 ---- a/libc/misc/pthread/Makefile.in -+++ b/libc/misc/pthread/Makefile.in -@@ -11,7 +11,6 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread - MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread - - libc-shared-$(UCLIBC_HAS_TLS) += $(MISC_PTHREAD_OUT)/tsd.os --libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o - - objclean-y += CLEAN_libc/misc/pthread - -diff --git a/libc/misc/pthread/weaks.c b/libc/misc/pthread/weaks.c -deleted file mode 100644 -index fb1d85f..0000000 ---- a/libc/misc/pthread/weaks.c -+++ /dev/null -@@ -1,40 +0,0 @@ --/* The weak pthread functions for Linux. -- Copyright (C) 1996, 1997, 1998 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 Library General Public License as -- published by the Free Software Foundation; either version 2 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 -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with the GNU C Library; see the file COPYING.LIB. If not, -- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- Boston, MA 02111-1307, USA. */ -- --#include <libc-internal.h> -- --/* Weaks for internal library use only. -- * -- * We need to define weaks here to cover all the pthread functions that -- * libc itself will use so that we aren't forced to link libc against -- * libpthread. This file is only used in libc.a and since we have -- * weaks here, they will be automatically overridden by libpthread.a -- * if it gets linked in. -- */ -- --static int __pthread_return_0 (void) { return 0; } --static void __pthread_return_void (void) { return; } -- --weak_alias (__pthread_return_0, __pthread_mutex_init) --weak_alias (__pthread_return_0, __pthread_mutex_lock) --weak_alias (__pthread_return_0, __pthread_mutex_trylock) --weak_alias (__pthread_return_0, __pthread_mutex_unlock) --weak_alias (__pthread_return_void, _pthread_cleanup_push_defer) --weak_alias (__pthread_return_void, _pthread_cleanup_pop_restore) -- --- -1.6.3.3 - diff --git a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch deleted file mode 100644 index 562d648a6..000000000 --- a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch +++ /dev/null @@ -1,69 +0,0 @@ -From bfe9a589a402d4b6265e32b1b5ca0942efdcff3b Mon Sep 17 00:00:00 2001 -From: Timo Teras <timo.teras@iki.fi> -Date: Fri, 7 May 2010 11:30:04 +0300 -Subject: [PATCH 2/2] resolv: various memory corruption and off by one fixes - -Fixes resolution of names with AAAA entries and gethostbyaddr issues. - -Signed-off-by: Timo Teras <timo.teras@iki.fi> ---- - libc/inet/resolv.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index 84289a6..320aec4 100644 ---- a/libc/inet/resolv.c -+++ b/libc/inet/resolv.c -@@ -689,7 +689,7 @@ int attribute_hidden __decode_dotted(const unsigned char *packet, - - if (used + b + 1 >= dest_len) - return -1; -- if (offset + b + 1 >= packet_len) -+ if (offset + b >= packet_len) - return -1; - memcpy(dest + used, packet + offset, b); - offset += b; -@@ -2417,7 +2417,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, - /* Layout in buf: - * char *alias[ALIAS_DIM]; - * struct in[6]_addr* addr_list[2]; -- * struct in[6]_addr* in; -+ * struct in[6]_addr in; - * char scratch_buffer[256+]; - */ - #define in6 ((struct in6_addr *)in) -@@ -2431,9 +2431,13 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, - #ifndef __UCLIBC_HAS_IPV6__ - buf += sizeof(*in); - buflen -= sizeof(*in); -+ if (addrlen > sizeof(*in)) -+ return ERANGE; - #else - buf += sizeof(*in6); - buflen -= sizeof(*in6); -+ if (addrlen > sizeof(*in6)) -+ return ERANGE; - #endif - if ((ssize_t)buflen < 256) - return ERANGE; -@@ -2441,7 +2445,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, - alias[1] = NULL; - addr_list[0] = in; - addr_list[1] = NULL; -- memcpy(&in, addr, addrlen); -+ memcpy(in, addr, addrlen); - - if (0) /* nothing */; - #ifdef __UCLIBC_HAS_IPV4__ -@@ -2456,7 +2460,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, - char *dst = buf; - unsigned char *tp = (unsigned char *)addr + addrlen - 1; - do { -- dst += sprintf(dst, "%x.%x.", tp[i] & 0xf, tp[i] >> 4); -+ dst += sprintf(dst, "%x.%x.", tp[0] & 0xf, tp[0] >> 4); - tp--; - } while (tp >= (unsigned char *)addr); - strcpy(dst, "ip6.arpa"); --- -1.6.3.3 - diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 0b7751f3e..accdcaf3a 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _abiver=0.9.32 pkgname=libc$_abiver -_gitver=100507 +_gitver=1006041126 pkgver=${_abiver}_alpha0_git$_gitver -pkgrel=3 +pkgrel=1 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -17,10 +17,8 @@ _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" _snapfile="$pkgname-$pkgver.tar.bz2" source="http://build.alpinelinux.org:8010/distfiles/$_snapfile compat-stack-guard.patch - 0001-ldd-segfault-fix.patch - 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch - 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch uclibc-libm-pic.patch + uclibc-lutimes.patch uclibc-resolv-tls.patch uclibcconfig.x86 uclibcconfig.i486 @@ -31,12 +29,15 @@ _builddir="$srcdir"/master snapshot() { local _date=$(date +%y%m%d%H%M) + _gitver=$_date pkgver=${_abiver}_alpha0_git$_gitver + _snapfile="$pkgname-$pkgver.tar.bz2" rm -f "$SRCDEST"/$_snapfile + msg "snapfile=$_snapfile" wget -O "$SRCDEST"/$_snapfile $_snapurl pkgrel=0 - sed -i -e "s/^_gitver=.*/_gitver=$(date +%y%m%d)/" \ + sed -i -e "s/^_gitver=.*/_gitver=$_gitver/" \ -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ APKBUILD checksum @@ -95,12 +96,10 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.tar.bz2 +md5sums="048f92606460621d9402c43417392992 libc0.9.32-0.9.32_alpha0_git1006041126.tar.bz2 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch -4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch -826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch -0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch 2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch +4d0b8170e6580b47bf5775e65a6f081e uclibc-lutimes.patch d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" diff --git a/main/libc0.9.32/uclibc-lutimes.patch b/main/libc0.9.32/uclibc-lutimes.patch new file mode 100644 index 000000000..c9ec2aa47 --- /dev/null +++ b/main/libc0.9.32/uclibc-lutimes.patch @@ -0,0 +1,105 @@ +From: Vladimir Zapolskiy <vzapolskiy@gmail.com> +To: uclibc@uclibc.org +Subject: [PATCH v2] lutimes: add lutimes support +Date: Wed, 2 Jun 2010 10:27:16 +0400 +Message-Id: <1275460036-3289-1-git-send-email-vzapolskiy@gmail.com> +X-Mailer: git-send-email 1.7.0.3 +In-Reply-To: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> +References: <1275420197-32262-1-git-send-email-vzapolskiy@gmail.com> +Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com> +X-BeenThere: uclibc@uclibc.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Discussion and development of uClibc \(the embedded C library\)" + <uclibc.uclibc.org> +List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, + <mailto:uclibc-request@uclibc.org?subject=unsubscribe> +List-Archive: <http://lists.busybox.net/pipermail/uclibc> +List-Post: <mailto:uclibc@uclibc.org> +List-Help: <mailto:uclibc-request@uclibc.org?subject=help> +List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, + <mailto:uclibc-request@uclibc.org?subject=subscribe> +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: uclibc-bounces@uclibc.org +Errors-To: uclibc-bounces@uclibc.org + +This patch adds lutimes library call support. + +Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> +--- + include/sys/time.h | 4 ++- + libc/sysdeps/linux/common/lutimes.c | 38 +++++++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+), 1 deletions(-) + create mode 100644 libc/sysdeps/linux/common/lutimes.c + +diff --git a/include/sys/time.h b/include/sys/time.h +index 33f5873..952e95a 100644 +--- a/include/sys/time.h ++++ b/include/sys/time.h +@@ -144,14 +144,16 @@ extern int utimes (__const char *__file, __const struct timeval __tvp[2]) + __THROW __nonnull ((1)); + libc_hidden_proto(utimes) + +-#if 0 /*def __USE_BSD*/ ++#ifdef __USE_BSD + /* Same as `utimes', but does not follow symbolic links. */ + extern int lutimes (__const char *__file, __const struct timeval __tvp[2]) + __THROW __nonnull ((1)); + ++#if 0 + /* Same as `utimes', but takes an open file descriptor instead of a name. */ + extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; + #endif ++#endif + + #ifdef __USE_GNU + /* Change the access time of FILE relative to FD to TVP[0] and the +diff --git a/libc/sysdeps/linux/common/lutimes.c b/libc/sysdeps/linux/common/lutimes.c +new file mode 100644 +index 0000000..0b4a8ea +--- /dev/null ++++ b/libc/sysdeps/linux/common/lutimes.c +@@ -0,0 +1,38 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * lutimes() implementation for uClibc ++ * ++ * Copyright (C) 2010 Vladimir Zapolskiy <vzapolskiy@gmail.com> ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include <sys/syscall.h> ++#include <time.h> ++ ++#ifdef __NR_lutimes ++_syscall2(int, lutimes, const char *, file, const struct timeval *, tvp) ++#else ++#include <sys/time.h> ++#include <fcntl.h> ++ ++int lutimes(const char *file, const struct timeval tvp[2]) ++{ ++ struct timespec ts[2]; ++ ++ if (tvp != NULL) ++ { ++ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 ++ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) ++ { ++ __set_errno(EINVAL); ++ return -1; ++ } ++ ++ TIMEVAL_TO_TIMESPEC(&tvp[0], &ts[0]); ++ TIMEVAL_TO_TIMESPEC(&tvp[1], &ts[1]); ++ } ++ ++ return utimensat(AT_FDCWD, file, tvp ? ts : NULL, AT_SYMLINK_NOFOLLOW); ++} ++#endif +-- +1.7.0.3 + diff --git a/main/libelf/APKBUILD b/main/libelf/APKBUILD new file mode 100644 index 000000000..88a52258b --- /dev/null +++ b/main/libelf/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libelf +pkgver=0.8.13 +pkgrel=0 +pkgdesc="libelf is a free ELF object file access library" +url="http://www.mr511.de/software/" +license="GPL" +depends= +makedepends= +subpackages="$pkgname-dev" +source="http://www.mr511.de/software/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-shared \ + --enable-gnu-names \ + --enable-compat || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make install prefix="$pkgdir"/usr || return 1 +} +md5sums="4136d7b4c04df68b686570afa26988ac libelf-0.8.13.tar.gz" diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD new file mode 100644 index 000000000..22ef96784 --- /dev/null +++ b/main/libical/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libical +pkgver=0.44 +pkgrel=0 +pkgdesc="An open source reference implementation of the icalendar data type and serialization format" +url="http://sourceforge.net/projects/freeassociation/" +license="LGPL MPL" +depends= +makedepends="perl" +subpackages="$pkgname-dev" +source="http://downloads.sourceforge.net/freeassociation/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-shared \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} +md5sums="e0403c31e1ed82569325685f8c15959c libical-0.44.tar.gz" diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD index 81f413e2d..fd70fd1c6 100644 --- a/main/libmpdclient/APKBUILD +++ b/main/libmpdclient/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmpdclient -pkgver=2.1 -pkgrel=1 +pkgver=2.2 +pkgrel=0 pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages" url="http://mpd.wikia.com/wiki/Client:libmpdclient" license="GPL2" @@ -20,4 +20,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="67efa0c3d107c090ef277dfb3442d1e3 libmpdclient-2.1.tar.bz2" +md5sums="8b9dff75d6c820b781ce066417df4078 libmpdclient-2.2.tar.bz2" diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD index 072f0216e..5d5c37196 100644 --- a/main/libogg/APKBUILD +++ b/main/libogg/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libogg -pkgver=1.1.4 -pkgrel=1 +pkgver=1.2.0 +pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="http://xiph.org/ogg/" license="as-is" @@ -17,9 +17,12 @@ build() { ./configure --prefix=/usr make || return 1 - make -j1 DESTDIR="$pkgdir" install +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz" +md5sums="c95b73759acfc30712beef6ce4e88efa libogg-1.2.0.tar.gz" diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD index 4094083a5..231787c4f 100644 --- a/main/libpri/APKBUILD +++ b/main/libpri/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=libpri -pkgver=1.4.11_alpha1 -_pkgver=1.4.10.2 -pkgrel=1 +pkgver=1.4.11.2 +pkgrel=0 pkgdesc="Primary Rate ISDN (PRI) library" url="http://www.asterisk.orig" license="GPL" @@ -11,22 +10,22 @@ depends="" makedepends="" install= subpackages="$pkgname-dev" -source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$_pkgver.tar.gz - libpri-1.4-r1357.patch" +source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$pkgver.tar.gz" build() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/$pkgname-$pkgver" for i in ../*.patch; do + [ -r "$i" ] || continue msg "Applying $i" patch -p1 < $i || return 1; done make LDCONFIG="echo" || return 1 - make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install +} - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +package() { + cd "$srcdir/$pkgname-$pkgver" + make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install } -md5sums="dc1523d8ee027cd62f20fc6cc9727489 libpri-1.4.10.2.tar.gz -61a245689a40e456643ed654441a280d libpri-1.4-r1357.patch" +md5sums="320d55151e180b2fc13abfee8e2e73d8 libpri-1.4.11.2.tar.gz" diff --git a/main/libunique/APKBUILD b/main/libunique/APKBUILD new file mode 100644 index 000000000..59bd45083 --- /dev/null +++ b/main/libunique/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libunique +pkgver=1.1.6 +pkgrel=1 +pkgdesc="Library for writing single instance applications" +url="http://live.gnome.org/LibUnique" +license="LGPL" +depends= +makedepends="pkgconfig gtk+-dev dbus-glib-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.1/$pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2" diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD index 93dd4442b..20b59466b 100644 --- a/main/libx11/APKBUILD +++ b/main/libx11/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libx11 -pkgver=1.3.3 -pkgrel=1 +pkgver=1.3.4 +pkgrel=0 pkgdesc="X11 client-side library" url="http://xorg.freedesktop.org/" license="custom:XFREE86" @@ -28,4 +28,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="5d74971360f194ce33d2bd2e4d9b066c libX11-1.3.3.tar.bz2" +md5sums="f65c9c7ecbfb64c19dbd7927160d63fd libX11-1.3.4.tar.bz2" diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD index 87d7d248e..fe56fd7a3 100644 --- a/main/libxext/APKBUILD +++ b/main/libxext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxext -pkgver=1.1.1 -pkgrel=1 +pkgver=1.1.2 +pkgrel=0 pkgdesc="X11 miscellaneous extensions library" url="http://xorg.freedesktop.org/" license="custom" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/libXext-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="c417c0e8df39a067f90a2a2e7133637d libXext-1.1.1.tar.bz2" +md5sums="9e51f9cb7e0a38c7099ac1c0de1a1add libXext-1.1.2.tar.bz2" diff --git a/main/libxfce4menu/APKBUILD b/main/libxfce4menu/APKBUILD index ad6a5fd14..52a0b32e9 100644 --- a/main/libxfce4menu/APKBUILD +++ b/main/libxfce4menu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4menu -pkgver=4.6.1 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="a freedesktop.org compliant menu implementation for Xfce" url="http://www.xfce.org/" license="GPL-2" @@ -11,8 +11,7 @@ makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev libiconv-dev" source="http://i386.miwibox.org/distfiles/xfce4/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -20,6 +19,10 @@ build () --localstatedir=/var \ --disable-static make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="5dc9343885c2c6f931318b2a1cdcc9db libxfce4menu-4.6.1.tar.bz2" +md5sums="ff10cacb76803ee37159e3a43345f0d1 libxfce4menu-4.6.2.tar.bz2" diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD index 401698b6b..884378e57 100644 --- a/main/libxfce4util/APKBUILD +++ b/main/libxfce4util/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4util -pkgver=4.6.1 -pkgrel=2 +pkgver=4.6.2 +pkgrel=0 pkgdesc="Basic utility non-GUI functions for Xfce" url="http://www.xfce.org/" license="GPL-2" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig glib-dev gettext-dev libiconv-dev" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +makedepends="pkgconfig glib-dev gettext-dev libiconv-dev intltool" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" depends_dev="glib-dev" build() { @@ -25,4 +25,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="eac51d58179cbcadc3f802450a8ec9cd libxfce4util-4.6.1.tar.bz2" +md5sums="9c3129d827d480f0906c575e7a13f1e9 libxfce4util-4.6.2.tar.bz2" diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index 620ee6cd2..db84c1953 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfcegui4 -pkgver=4.6.3 +pkgver=4.6.4 pkgrel=1 pkgdesc="Basic GUI functions for Xfce" url="http://www.xfce.org/" @@ -12,7 +12,7 @@ makedepends="pkgconfig intltool glib-dev gettext-dev libiconv-dev gtk+-dev libxfce4util-dev expat-dev" source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2" -depends_dev="gtk+-dev libxfce4util-dev xfconf-dev" +depends_dev="gtk+-dev libxfce4util-dev xfconf-dev libsm-dev" build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="a647411a0b95d45bb701beff83636307 libxfcegui4-4.6.3.tar.bz2" +md5sums="88de59b222cb9977f93a4c61011c1e1f libxfcegui4-4.6.4.tar.bz2" diff --git a/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch b/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch new file mode 100644 index 000000000..e1e9a655e --- /dev/null +++ b/main/linux-grsec/0019-ipv4-check-rt_genid-in-dst_check.patch @@ -0,0 +1,96 @@ +From d11a4dc18bf41719c9f0d7ed494d295dd2973b92 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 18 Mar 2010 23:20:20 +0000 +Subject: [PATCH] ipv4: check rt_genid in dst_check + +Xfrm_dst keeps a reference to ipv4 rtable entries on each +cached bundle. The only way to renew xfrm_dst when the underlying +route has changed, is to implement dst_check for this. This is +what ipv6 side does too. + +The problems started after 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 +("ipsec: Fix bogus bundle flowi") which fixed a bug causing xfrm_dst +to not get reused, until that all lookups always generated new +xfrm_dst with new route reference and path mtu worked. But after the +fix, the old routes started to get reused even after they were expired +causing pmtu to break (well it would occationally work if the rtable +gc had run recently and marked the route obsolete causing dst_check to +get called). + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/ipv4/route.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index a770df2..32d3961 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -1441,7 +1441,7 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, + dev_hold(rt->u.dst.dev); + if (rt->idev) + in_dev_hold(rt->idev); +- rt->u.dst.obsolete = 0; ++ rt->u.dst.obsolete = -1; + rt->u.dst.lastuse = jiffies; + rt->u.dst.path = &rt->u.dst; + rt->u.dst.neighbour = NULL; +@@ -1506,7 +1506,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst) + struct dst_entry *ret = dst; + + if (rt) { +- if (dst->obsolete) { ++ if (dst->obsolete > 0) { + ip_rt_put(rt); + ret = NULL; + } else if ((rt->rt_flags & RTCF_REDIRECTED) || +@@ -1726,7 +1726,9 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu) + + static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie) + { +- return NULL; ++ if (rt_is_expired((struct rtable *)dst)) ++ return NULL; ++ return dst; + } + + static void ipv4_dst_destroy(struct dst_entry *dst) +@@ -1888,7 +1890,8 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, + if (!rth) + goto e_nobufs; + +- rth->u.dst.output= ip_rt_bug; ++ rth->u.dst.output = ip_rt_bug; ++ rth->u.dst.obsolete = -1; + + atomic_set(&rth->u.dst.__refcnt, 1); + rth->u.dst.flags= DST_HOST; +@@ -2054,6 +2057,7 @@ static int __mkroute_input(struct sk_buff *skb, + rth->fl.oif = 0; + rth->rt_spec_dst= spec_dst; + ++ rth->u.dst.obsolete = -1; + rth->u.dst.input = ip_forward; + rth->u.dst.output = ip_output; + rth->rt_genid = rt_genid(dev_net(rth->u.dst.dev)); +@@ -2218,6 +2222,7 @@ local_input: + goto e_nobufs; + + rth->u.dst.output= ip_rt_bug; ++ rth->u.dst.obsolete = -1; + rth->rt_genid = rt_genid(net); + + atomic_set(&rth->u.dst.__refcnt, 1); +@@ -2444,6 +2449,7 @@ static int __mkroute_output(struct rtable **result, + rth->rt_spec_dst= fl->fl4_src; + + rth->u.dst.output=ip_output; ++ rth->u.dst.obsolete = -1; + rth->rt_genid = rt_genid(dev_net(dev_out)); + + RT_CACHE_STAT_INC(out_slow_tot); +-- +1.7.1 + diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 02edf0be3..471b3efb8 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.32.13 +pkgver=2.6.32.15 _kernver=2.6.32 -pkgrel=0 +pkgrel=6 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.1.14-2.6.32.13-201005151340.patch + grsecurity-2.1.14-2.6.32.15-201006011506.patch 0001-grsec-revert-conflicting-flow-cache-changes.patch 0002-gre-fix-hard-header-destination-address-checking.patch 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -30,7 +30,12 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 0016-xfrm-remove-policy-garbage-collection.patch 0017-flow-delayed-deletion-of-flow-cache-entries.patch 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch + 0019-ipv4-check-rt_genid-in-dst_check.patch xfrm-fix-policy-unreferencing-on-larval-drop.patch + r8169-fix-random-mdio_write-failures.patch + r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch + x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch + hv-grsec.patch kernelconfig.x86 " subpackages="$pkgname-dev linux-firmware:firmware" @@ -44,12 +49,14 @@ prepare() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 fi - # first apply the grsecurity patch and then the rest - for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch \ - "$srcdir"/xfrm*; do - [ -f $i ] || continue - msg "Applying $i..." - patch -s -p1 -N < $i || return 1 + # first apply patches in specified order + for i in $source; do + case $i in + *.patch) + msg "Applying $i..." + patch -s -p1 -N < "$srcdir"/$i || return 1 + ;; + esac done mkdir -p "$srcdir"/build @@ -67,7 +74,9 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="${CC:--gcc}" || return 1 + make CC="${CC:--gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + || return 1 } package() { @@ -137,8 +146,8 @@ firmware() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -ba6abb1ffee513a1d4f831599ddae490 patch-2.6.32.13.bz2 -00a61e28da8869669171ab12480513e1 grsecurity-2.1.14-2.6.32.13-201005151340.patch +5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 +7f61d0de3d703c465bff03a20b2dbd30 grsecurity-2.1.14-2.6.32.15-201006011506.patch 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -154,5 +163,10 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch +74e511f12854972db08d3fddc4df0f52 0019-ipv4-check-rt_genid-in-dst_check.patch c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch -7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" +ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch +b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch +a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch +bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch +442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch index 84b90626b..215c62b4e 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alpha/include/asm/elf.h ---- linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/alpha/include/asm/elf.h linux-2.6.32.15/arch/alpha/include/asm/elf.h +--- linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alp /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha/kernel/module.c ---- linux-2.6.32.13/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/alpha/kernel/module.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/alpha/kernel/module.c linux-2.6.32.15/arch/alpha/kernel/module.c +--- linux-2.6.32.15/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alph if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/fault.c ---- linux-2.6.32.13/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/alpha/mm/fault.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/alpha/mm/fault.c linux-2.6.32.15/arch/alpha/mm/fault.c +--- linux-2.6.32.15/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/f } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/include/asm/elf.h ---- linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/include/asm/elf.h linux-2.6.32.15/arch/arm/include/asm/elf.h +--- linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/i /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/include/asm/kmap_types.h linux-2.6.32.15/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/include/asm/uaccess.h linux-2.6.32.15/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) @@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/a if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kernel/kgdb.c ---- linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/arch/arm/kernel/kgdb.c +--- linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kerne #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach-at91/pm.c ---- linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/arch/arm/mach-at91/pm.c +--- linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mac .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/m .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-05-15 13:21:13.518878295 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach- .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-15 13:21:13.531870735 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/a .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-05-15 13:21:13.531870735 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/ma .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault.c ---- linux-2.6.32.13/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mm/fault.c 2010-05-15 13:21:13.542880278 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mm/fault.c linux-2.6.32.15/arch/arm/mm/fault.c +--- linux-2.6.32.15/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c ---- linux-2.6.32.13/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/mm/mmap.c 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/arm/mm/mmap.c linux-2.6.32.15/arch/arm/mm/mmap.c +--- linux-2.6.32.15/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat- .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr32/include/asm/elf.h ---- linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/arch/avr32/include/asm/elf.h +--- linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/a }; #undef D -diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr3 .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/fault.c ---- linux-2.6.32.13/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/avr32/mm/fault.c 2010-05-15 13:21:13.546915063 -0400 +diff -urNp linux-2.6.32.15/arch/avr32/mm/fault.c linux-2.6.32.15/arch/avr32/mm/fault.c +--- linux-2.6.32.15/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/f if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-05-15 13:21:13.568389913 -0400 +diff -urNp linux-2.6.32.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler */ } @@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blac .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-05-15 13:21:13.568389913 -0400 +diff -urNp linux-2.6.32.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/b .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-05-15 13:21:13.568389913 -0400 +diff -urNp linux-2.6.32.15/arch/frv/include/asm/kmap_types.h linux-2.6.32.15/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-05-15 13:21:13.584352190 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-05-15 13:21:13.614291139 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-05-15 13:21:13.614854679 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-05-15 13:21:13.614854679 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/i #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-05-15 13:21:13.614854679 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/a return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64/include/asm/elf.h ---- linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-05-15 13:21:13.614854679 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/arch/ia64/include/asm/elf.h +--- linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64 #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-05-15 13:21:13.614854679 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-05-15 13:21:13.618628456 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/i { return dma_ops; } -diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/kernel/module.c ---- linux-2.6.32.13/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/module.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/module.c linux-2.6.32.15/arch/ia64/kernel/module.c +--- linux-2.6.32.15/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/k mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/ static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/i .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64 goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64/kernel/topology.c ---- linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64/kernel/topology.c +--- linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64 .show = cache_show }; -diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/i . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fault.c ---- linux-2.6.32.13/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/mm/fault.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fault.c +--- linux-2.6.32.15/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fau survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init.c ---- linux-2.6.32.13/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/mm/init.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init.c +--- linux-2.6.32.15/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-05-15 13:21:13.626873619 -0400 +diff -urNp linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/ .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/lib/usercopy.c ---- linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/lib/usercopy.c +--- linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/li prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips/include/asm/elf.h ---- linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/include/asm/elf.h linux-2.6.32.15/arch/mips/include/asm/elf.h +--- linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mips/include/asm/page.h ---- linux-2.6.32.13/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/include/asm/page.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/include/asm/page.h linux-2.6.32.15/arch/mips/include/asm/page.h +--- linux-2.6.32.15/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mip #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/mips/include/asm/system.h ---- linux-2.6.32.13/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/include/asm/system.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/include/asm/system.h linux-2.6.32.15/arch/mips/include/asm/system.h +--- linux-2.6.32.15/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/m +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch #include <asm/processor.h> /* -diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/kernel/kgdb.c ---- linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/kernel/kgdb.c +--- linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/ker struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/kernel/process.c ---- linux-2.6.32.13/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/kernel/process.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/kernel/process.c +--- linux-2.6.32.15/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/kernel/syscall.c ---- linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/kernel/syscall.c +--- linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/ if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fault.c ---- linux-2.6.32.13/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/mips/mm/fault.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fault.c +--- linux-2.6.32.15/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fau /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/parisc/include/asm/elf.h ---- linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/include/asm/elf.h linux-2.6.32.15/arch/parisc/include/asm/elf.h +--- linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/pa /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/include/asm/pgtable.h linux-2.6.32.15/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/parisc/kernel/module.c ---- linux-2.6.32.13/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/kernel/module.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/parisc/kernel/module.c +--- linux-2.6.32.15/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/pari DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/ if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/parisc/kernel/traps.c ---- linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/parisc/kernel/traps.c +--- linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/paris fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm/fault.c ---- linux-2.6.32.13/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/parisc/mm/fault.c 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm/fault.c +--- linux-2.6.32.15/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arch/powerpc/include/asm/device.h ---- linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arch/powerpc/include/asm/device.h +--- linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arc /* * When an iommu is in use, dma_data is used as a ptr to the base of the -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-05-15 13:21:13.630645180 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/elf.h linux-2.6.32.15/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/p #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/iommu.h linux-2.6.32.15/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13 KM_TYPE_NR }; -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page_64.h linux-2.6.32.15/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/ar #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/powerpc/include/asm/page.h ---- linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page.h linux-2.6.32.15/arch/powerpc/include/asm/page.h +--- linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/reg.h linux-2.6.32.15/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/p #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/ar static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 @@ -327,52 +327,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/ar extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/ .show = cache_index_show, }; -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerpc/kernel/dma.c ---- linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerpc/kernel/dma.c +--- linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerp .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-05-15 13:21:13.643322255 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/ { struct iommu_table *tbl = get_iommu_table_base(dev); -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-05-15 13:21:13.646883281 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arc .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-05-15 13:21:13.646883281 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-05-15 13:21:13.646883281 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-05-15 13:21:13.646883281 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/po .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-05-15 13:21:13.658890137 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/power .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-05-15 13:21:13.658890137 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/powerpc/kernel/module.c ---- linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-05-15 13:21:13.658890137 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/powerpc/kernel/module.c +--- linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/pow static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-05-15 13:21:13.678895652 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/powerpc/kernel/process.c ---- linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-05-15 13:21:13.678895652 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/powerpc/kernel/process.c +--- linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; @@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/po - - return ret; -} -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-05-15 13:21:13.686885851 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_32.c linux-2.6.32.15/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-05-15 13:21:13.686885851 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-05-15 13:21:13.686885851 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/ } return error; } -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-05-15 13:21:13.686885851 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/power if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerpc/kernel/vio.c ---- linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-05-15 13:21:13.690884467 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerpc/kernel/vio.c +--- linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerp viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-05-15 13:21:13.690884467 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/p -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/mm/fault.c ---- linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-05-15 13:21:13.690884467 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/mm/fault.c +--- linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-05-15 13:21:13.694737832 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/mm/mmap_64.c linux-2.6.32.15/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerp mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/mm/slice.c ---- linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-05-15 13:21:13.702894969 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/mm/slice.c +--- linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/ /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-15 13:21:13.702894969 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 .valid = lite5200_pm_valid, .begin = lite5200_pm_begin, .prepare = lite5200_pm_prepare, -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-15 13:21:13.706882202 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 .valid = mpc52xx_pm_valid, .prepare = mpc52xx_pm_prepare, .enter = mpc52xx_pm_enter, -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-05-15 13:21:13.714896740 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13 .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-05-15 13:21:13.726905139 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/a .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-05-15 13:21:13.726905139 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-05-15 13:21:13.726905139 -0400 +diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390/include/asm/elf.h ---- linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-05-15 13:21:13.745465180 -0400 +diff -urNp linux-2.6.32.15/arch/s390/include/asm/elf.h linux-2.6.32.15/arch/s390/include/asm/elf.h +--- linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; that it will "exec", and that there is sufficient room for the brk. */ #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) @@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ -diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s390/include/asm/setup.h ---- linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-05-15 13:21:13.746887701 -0400 +diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s390/include/asm/setup.h +--- linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-05-15 13:21:13.746887701 -0400 +diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig ---- linux-2.6.32.13/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/Kconfig 2010-05-15 13:21:13.754899687 -0400 +diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig +--- linux-2.6.32.15/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 @@ -194,28 +194,26 @@ config AUDIT_ARCH config S390_SWITCH_AMODE @@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig comment "Code generation options" -diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/kernel/module.c ---- linux-2.6.32.13/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/kernel/module.c 2010-05-15 13:21:13.754899687 -0400 +diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/kernel/module.c +--- linux-2.6.32.15/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/k rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/kernel/setup.c ---- linux-2.6.32.13/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/kernel/setup.c 2010-05-15 13:21:13.754899687 -0400 +diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/kernel/setup.c +--- linux-2.6.32.15/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap.c ---- linux-2.6.32.13/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/s390/mm/mmap.c 2010-05-15 13:21:13.770895237 -0400 +diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap.c +--- linux-2.6.32.15/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-05-15 13:21:13.770895237 -0400 +diff -urNp linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/s .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/k .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/kgdb.c ---- linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/kgdb.c +--- linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -14,18 +14,38 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/ar } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) #define dma_is_consistent(d, h) (1) @@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/ debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-05-15 13:21:13.782909212 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_32.h linux-2.6.32.15/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-05-15 13:21:13.788083684 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_64.h linux-2.6.32.15/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-05-15 13:21:13.788083684 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/a extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-05-15 13:21:13.788083684 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arc #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-05-15 13:21:13.798894063 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/ " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-05-15 13:21:13.798894063 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) @@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/a return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-05-15 13:21:13.798894063 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/a if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/kernel/iommu.c ---- linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-05-15 13:21:13.798894063 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/kernel/iommu.c +--- linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/ EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc/kernel/ioport.c ---- linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-05-15 13:21:13.798894063 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc/kernel/ioport.c +--- linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc/kernel/Makefile ---- linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc/kernel/Makefile +--- linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 @@ -3,7 +3,7 @@ # @@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sp .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-05-15 13:21:13.810880669 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/kernel/traps_64.c linux-2.6.32.15/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/spa dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib/ksyms.c ---- linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib/ksyms.c +--- linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/lib/rwsem_64.S linux-2.6.32.15/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefile ---- linux-2.6.32.13/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/Makefile 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefile +--- linux-2.6.32.15/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefi VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/mm/fault_32.c ---- linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-05-15 13:21:13.836227385 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_32.c linux-2.6.32.15/arch/sparc/mm/fault_32.c +--- linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/m /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/mm/fault_64.c ---- linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-05-15 13:21:13.842890995 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_64.c linux-2.6.32.15/arch/sparc/mm/fault_64.c +--- linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/m /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm/init_32.c ---- linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-05-15 13:21:13.842890995 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/mm/init_32.c linux-2.6.32.15/arch/sparc/mm/init_32.c +--- linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/Makefile ---- linux-2.6.32.13/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/mm/Makefile 2010-05-15 13:21:13.842890995 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/Makefile +--- linux-2.6.32.15/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 @@ -2,7 +2,7 @@ # @@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/srmmu.c ---- linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-05-15 13:21:13.854885513 -0400 +diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/srmmu.c +--- linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/s BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-05-15 13:21:13.854885513 -0400 +diff -urNp linux-2.6.32.15/arch/um/include/asm/kmap_types.h linux-2.6.32.15/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch KM_TYPE_NR }; -diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/include/asm/page.h ---- linux-2.6.32.13/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/um/include/asm/page.h 2010-05-15 13:21:13.854885513 -0400 +diff -urNp linux-2.6.32.15/arch/um/include/asm/page.h linux-2.6.32.15/arch/um/include/asm/page.h +--- linux-2.6.32.15/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/in #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-05-15 13:21:13.862896966 -0400 +diff -urNp linux-2.6.32.15/arch/um/sys-i386/syscalls.c linux-2.6.32.15/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/s /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/bitops.h ---- linux-2.6.32.13/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/bitops.h 2010-05-15 13:21:13.862896966 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/bitops.h +--- linux-2.6.32.15/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/ } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/boot.h ---- linux-2.6.32.13/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/boot.h 2010-05-15 13:21:13.862896966 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/boot.h +--- linux-2.6.32.15/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/bo : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-05-15 13:21:13.862896966 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_32.S linux-2.6.32.15/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/ar addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-05-15 13:21:13.862896966 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_64.S linux-2.6.32.15/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/ar #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-05-15 13:21:13.866567010 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/misc.c linux-2.6.32.15/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/ error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-05-15 13:21:13.866567010 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/ar offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-05-15 13:21:13.866567010 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boot/cpucheck.c ---- linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boot/cpucheck.c +--- linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boo err = check_flags(); } -diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/header.S ---- linux-2.6.32.13/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/header.S 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/header.S +--- linux-2.6.32.15/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5316,9 +5316,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/ #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/memory.c ---- linux-2.6.32.13/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/memory.c 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/memory.c +--- linux-2.6.32.15/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -5328,9 +5328,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/ struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/video.c ---- linux-2.6.32.13/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/video.c 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/video.c +--- linux-2.6.32.15/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -5340,9 +5340,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/v int key; unsigned int v; -diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/boot/video-vesa.c ---- linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/boot/video-vesa.c linux-2.6.32.15/arch/x86/boot/video-vesa.c +--- linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5351,9 +5351,9 @@ diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/b } /* -diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia32/ia32entry.S ---- linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia32/ia32entry.S +--- linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -5448,9 +5448,9 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32_signal.c linux-2.6.32.15/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5469,9 +5469,9 @@ diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/arch/x86/include/asm/alternative.h ---- linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/alternative.h linux-2.6.32.15/arch/x86/include/asm/alternative.h +--- linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5481,9 +5481,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/ar "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/include/asm/apm.h ---- linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/apm.h linux-2.6.32.15/arch/x86/include/asm/apm.h +--- linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5502,9 +5502,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/i "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5835,9 +5835,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch #define ATOMIC64_INIT(val) { (val) } extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -6415,9 +6415,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch } /** -diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/include/asm/boot.h ---- linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/include/asm/boot.h +--- linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6435,9 +6435,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arch/x86/include/asm/cacheflush.h ---- linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -6456,9 +6456,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arc ClearPageUncached(pg); ClearPageWC(pg); break; -diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86/include/asm/cache.h ---- linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86/include/asm/cache.h +--- linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6467,9 +6467,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-05-15 13:21:13.878594921 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/checksum_32.h linux-2.6.32.15/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6503,9 +6503,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/ar len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/include/asm/desc.h ---- linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/desc.h linux-2.6.32.15/arch/x86/include/asm/desc.h +--- linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -6675,9 +6675,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x86/include/asm/device.h ---- linux-2.6.32.13/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/device.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/device.h linux-2.6.32.15/arch/x86/include/asm/device.h +--- linux-2.6.32.15/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6687,9 +6687,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x8 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6729,9 +6729,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/ar WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/include/asm/e820.h ---- linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/e820.h linux-2.6.32.15/arch/x86/include/asm/e820.h +--- linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -6741,9 +6741,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/ #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/include/asm/elf.h ---- linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/elf.h linux-2.6.32.15/arch/x86/include/asm/elf.h +--- linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 @@ -257,7 +257,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -6797,9 +6797,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86/include/asm/futex.h ---- linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-05-15 13:21:13.882891085 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/futex.h linux-2.6.32.15/arch/x86/include/asm/futex.h +--- linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 @@ -11,17 +11,54 @@ #include <asm/processor.h> #include <asm/system.h> @@ -6936,9 +6936,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86 : "memory" ); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/include/asm/i387.h ---- linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/i387.h linux-2.6.32.15/arch/x86/include/asm/i387.h +--- linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -6979,9 +6979,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/ /* * These must be called with preempt disabled -diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86/include/asm/io_64.h ---- linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/io_64.h linux-2.6.32.15/arch/x86/include/asm/io_64.h +--- linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -7000,9 +7000,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86 #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86/include/asm/iommu.h ---- linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/iommu.h linux-2.6.32.15/arch/x86/include/asm/iommu.h +--- linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -7012,9 +7012,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -7027,9 +7027,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/kvm_host.h linux-2.6.32.15/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 @@ -532,7 +532,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -7039,9 +7039,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/ int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86/include/asm/local.h ---- linux-2.6.32.13/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/local.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/local.h linux-2.6.32.15/arch/x86/include/asm/local.h +--- linux-2.6.32.15/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7266,9 +7266,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h ---- linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h +--- linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 @@ -81,8 +81,8 @@ static inline unsigned char current_lock #else #define lock_cmos_prefix(reg) do {} while (0) @@ -7280,9 +7280,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/ar #define do_i_have_lock_cmos() 0 #define current_lock_cmos_reg() 0 #endif -diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch/x86/include/asm/microcode.h ---- linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch/x86/include/asm/microcode.h +--- linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -7323,9 +7323,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch { return NULL; } -diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/include/asm/mman.h ---- linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/mman.h linux-2.6.32.15/arch/x86/include/asm/mman.h +--- linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -7341,9 +7341,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu_context.h linux-2.6.32.15/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -7468,9 +7468,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/ar } #define activate_mm(prev, next) \ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/include/asm/mmu.h ---- linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu.h linux-2.6.32.15/arch/x86/include/asm/mmu.h +--- linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -7497,9 +7497,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/i } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x86/include/asm/module.h ---- linux-2.6.32.13/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/module.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/module.h linux-2.6.32.15/arch/x86/include/asm/module.h +--- linux-2.6.32.15/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 @@ -59,13 +59,31 @@ #error unknown processor family #endif @@ -7533,9 +7533,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x8 #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/arch/x86/include/asm/page_32_types.h ---- linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_32_types.h linux-2.6.32.15/arch/x86/include/asm/page_32_types.h +--- linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -7547,9 +7547,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/ #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_64_types.h linux-2.6.32.15/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -7560,9 +7560,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/ /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-05-15 13:21:13.886644440 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-05-28 21:27:14.915041226 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -7616,9 +7616,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/ #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -7632,9 +7632,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13 }; struct raw_spinlock; -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pci_x86.h linux-2.6.32.15/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -7657,9 +7657,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7674,9 +7674,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7687,9 +7687,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -7731,9 +7731,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arc /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -7763,9 +7763,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-05-15 13:21:13.902905019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-05-28 21:27:14.915041226 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7783,9 +7783,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13 } /* -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-05-28 21:27:14.915041226 -0400 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -7831,9 +7831,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arc } /* -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-05-15 13:23:38.946686210 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -7842,9 +7842,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. +#define MODULES_EXEC_END MODULES_END #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-05-28 21:27:14.918896182 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -8009,9 +8009,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -8096,9 +8096,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/ #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch/x86/include/asm/processor.h ---- linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch/x86/include/asm/processor.h +--- linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -8183,9 +8183,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -8222,9 +8222,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x8 #endif } -diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x86/include/asm/reboot.h ---- linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x86/include/asm/reboot.h +--- linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -8234,9 +8234,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x8 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 @@ -118,10 +118,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -8472,9 +8472,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86 : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x86/include/asm/segment.h ---- linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x86/include/asm/segment.h +--- linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -8543,9 +8543,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) -diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -8649,9 +8649,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x86/include/asm/system.h ---- linux-2.6.32.13/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/system.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x86/include/asm/system.h +--- linux-2.6.32.15/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -8670,9 +8670,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x8 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) @@ -8802,9 +8802,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arc long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #include <linux/lockdep.h> @@ -8996,10 +8996,10 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arc copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-05-15 13:21:13.906812769 -0400 -@@ -8,8 +8,11 @@ +diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 +@@ -8,6 +8,8 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> #include <linux/string.h> @@ -9007,11 +9007,8 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x +#include <linux/slab.h> #include <asm/asm.h> #include <asm/page.h> -+#include <asm/segment.h> - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -29,7 +32,12 @@ +@@ -29,7 +31,12 @@ #define get_ds() (KERNEL_DS) #define get_fs() (current_thread_info()->addr_limit) @@ -9024,7 +9021,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x #define segment_eq(a, b) ((a).seg == (b).seg) -@@ -77,7 +85,33 @@ +@@ -77,7 +84,33 @@ * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ @@ -9059,7 +9056,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x /* * The exception table consists of pairs of addresses: the first is the -@@ -183,13 +217,21 @@ extern int __get_user_bad(void); +@@ -183,13 +216,21 @@ extern int __get_user_bad(void); asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") @@ -9084,7 +9081,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ " jmp 3b\n" \ -@@ -197,15 +239,18 @@ extern int __get_user_bad(void); +@@ -197,15 +238,18 @@ extern int __get_user_bad(void); _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=r" (err) \ @@ -9107,7 +9104,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x #define __put_user_x8(x, ptr, __ret_pu) \ asm volatile("call __put_user_8" : "=a" (__ret_pu) \ -@@ -374,16 +419,18 @@ do { \ +@@ -374,16 +418,18 @@ do { \ } while (0) #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -9129,7 +9126,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x #define __get_user_size_ex(x, ptr, size) \ do { \ -@@ -407,10 +454,12 @@ do { \ +@@ -407,10 +453,12 @@ do { \ } while (0) #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ @@ -9144,7 +9141,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x #define __put_user_nocheck(x, ptr, size) \ ({ \ -@@ -424,13 +473,24 @@ do { \ +@@ -424,13 +472,24 @@ do { \ int __gu_err; \ unsigned long __gu_val; \ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ @@ -9171,7 +9168,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x /* * Tell gcc we read from memory instead of writing: this is because -@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu +@@ -438,21 +497,26 @@ struct __large_struct { unsigned long bu * aliasing issues. */ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -9202,7 +9199,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x /* * uaccess_try and catch -@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu +@@ -530,7 +594,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)))); \ @@ -9211,7 +9208,7 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x } while (0) #ifdef CONFIG_X86_WP_WORKS_OK -@@ -567,6 +632,7 @@ extern struct movsl_mask { +@@ -567,6 +631,7 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 @@ -9219,9 +9216,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-05-15 13:21:13.906812769 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -9230,9 +9227,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/include/asm/vmi.h ---- linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-05-15 13:21:13.928275178 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/include/asm/vmi.h +--- linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -9241,9 +9238,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/i } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-05-15 13:21:13.928275178 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -9274,9 +9271,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/ #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86/include/asm/xsave.h ---- linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-05-15 13:21:13.928275178 -0400 +diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86/include/asm/xsave.h +--- linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -9302,9 +9299,9 @@ diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig ---- linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 -+++ linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:40:23.896554812 -0400 +diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig +--- linux-2.6.32.15/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 ++++ linux-2.6.32.15/arch/x86/Kconfig 2010-05-28 21:27:14.922894828 -0400 @@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig" config PARAVIRT @@ -9359,9 +9356,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig.cpu ---- linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 -+++ linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-05-15 13:21:13.930870481 -0400 +diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig.cpu +--- linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 ++++ linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -9389,9 +9386,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconfig.debug ---- linux-2.6.32.13/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/Kconfig.debug 2010-05-15 13:21:13.942893840 -0400 +diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconfig.debug +--- linux-2.6.32.15/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -9401,9 +9398,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconf ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/kernel/acpi/boot.c ---- linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-05-15 13:21:13.954911113 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -9413,9 +9410,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/ }; /* -diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-15 13:21:13.954911113 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -9425,9 +9422,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1 wrmsr 1: -diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:21:13.954911113 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -9472,9 +9469,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86 } -diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-05-15 13:21:13.954911113 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -9491,9 +9488,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x86/kernel/alternative.c ---- linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-05-15 13:21:13.962912884 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x86/kernel/alternative.c +--- linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -9566,9 +9563,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x8 + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-05-15 13:21:13.968009761 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -9578,9 +9575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/ .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-05-15 13:21:13.979712258 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -9617,9 +9614,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/kernel/apm_32.c ---- linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-05-15 13:21:14.011066799 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/kernel/apm_32.c +--- linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -9721,9 +9718,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/ker proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-05-15 13:21:14.011066799 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 @@ -115,6 +115,11 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); @@ -9736,9 +9733,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-05-15 13:21:14.011066799 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); @@ -9766,9 +9763,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-05-15 13:21:14.011066799 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -9877,9 +9874,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86 struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -9889,9 +9886,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. }; static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -9901,9 +9898,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -9913,10 +9910,10 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/ load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:20:18.427075180 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:21:14.043267946 -0400 -@@ -917,7 +917,7 @@ static ssize_t store(struct kobject *kob +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 +@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9925,9 +9922,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13 .show = show, .store = store, }; -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -9939,9 +9936,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86 obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9951,9 +9948,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/ .show = show, .store = store, }; -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -10006,9 +10003,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch }; /* -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -10018,9 +10015,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -10030,9 +10027,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/ar .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -10042,9 +10039,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ @@ -10063,9 +10060,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/ar .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -10084,9 +10081,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -10137,9 +10134,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/ #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-15 13:21:14.043267946 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -10173,9 +10170,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1 static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-05-15 13:21:14.046723916 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 @@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs break; @@ -10185,9 +10182,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch } } -diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kernel/crash.c ---- linux-2.6.32.13/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/crash.c 2010-05-15 13:21:14.046723916 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kernel/crash.c +--- linux-2.6.32.15/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -10197,9 +10194,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-05-15 13:21:14.046723916 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -10231,9 +10228,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -10278,9 +10275,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -10308,9 +10305,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/ report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kernel/e820.c ---- linux-2.6.32.13/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/e820.c 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kernel/e820.c +--- linux-2.6.32.15/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -10320,9 +10317,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kerne }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/kernel/efi_32.c ---- linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/kernel/efi_32.c +--- linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 @@ -38,70 +38,38 @@ */ @@ -10403,9 +10400,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/ker /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 @@ -6,6 +6,7 @@ */ @@ -10504,9 +10501,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/kernel/entry_32.S ---- linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-05-15 13:21:14.068544431 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/kernel/entry_32.S +--- linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-05-28 21:27:15.031137412 -0400 @@ -191,7 +191,67 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -10820,9 +10817,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/k RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/kernel/entry_64.S ---- linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/kernel/entry_64.S +--- linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -11280,9 +11277,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/k RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/kernel/ftrace.c ---- linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/kernel/ftrace.c +--- linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -11348,9 +11345,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/ker if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/kernel/head32.c ---- linux-2.6.32.13/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/head32.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/kernel/head32.c +--- linux-2.6.32.15/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -11368,9 +11365,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/ker #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/kernel/head_32.S ---- linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/kernel/head_32.S +--- linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-05-28 21:27:15.039159907 -0400 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -11812,9 +11809,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/ke + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/kernel/head64.c ---- linux-2.6.32.13/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/head64.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/head64.c linux-2.6.32.15/arch/x86/kernel/head64.c +--- linux-2.6.32.15/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/head64.c 2010-05-28 21:27:15.039159907 -0400 @@ -29,7 +29,13 @@ static void __init zap_identity_mappings(void) { @@ -11829,9 +11826,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/ker __flush_tlb_all(); } -diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/kernel/head_64.S ---- linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/kernel/head_64.S +--- linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -12102,9 +12099,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/ke __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -12126,9 +12123,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/kernel/init_task.c ---- linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/kernel/init_task.c +--- linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. @@ -12137,9 +12134,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/ - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/kernel/ioport.c ---- linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/kernel/ioport.c +--- linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-05-28 21:27:15.039159907 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -12184,9 +12181,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/ker } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/kernel/irq_32.c ---- linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/kernel/irq_32.c +--- linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -12205,9 +12202,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/ker call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kernel/kgdb.c ---- linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-05-15 13:21:14.070771689 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kernel/kgdb.c +--- linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -12217,9 +12214,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/kernel/kprobes.c ---- linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/kernel/kprobes.c +--- linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -12312,9 +12309,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/ke return ret; switch (val) { -diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel/ldt.c ---- linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-05-15 13:21:14.074681352 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel/ldt.c +--- linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -12379,9 +12376,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -12409,9 +12406,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/ar relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c ---- linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c +--- linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-05-28 21:27:15.043064911 -0400 @@ -126,7 +126,13 @@ static int init_level4_page(struct kimag } /* clear the unused entries */ @@ -12426,9 +12423,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/ar addr += PGDIR_SIZE; } out: -diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -12447,9 +12444,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -12459,9 +12456,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch /* * Synchronization. -diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -12496,9 +12493,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arc { return µcode_intel_ops; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/kernel/module.c ---- linux-2.6.32.13/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/module.c 2010-05-15 13:21:14.082777933 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/kernel/module.c +--- linux-2.6.32.15/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -12639,9 +12636,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/ker #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/kernel/paravirt.c ---- linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-05-15 13:21:14.088032889 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/kernel/paravirt.c +--- linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -12745,9 +12742,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/k }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-05-15 13:21:14.088032889 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -12757,9 +12754,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/ #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -12769,9 +12766,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -12790,9 +12787,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/ke #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -12802,9 +12799,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x8 .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -12814,9 +12811,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/ .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -12826,9 +12823,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x8 .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86/kernel/process_32.c ---- linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86/kernel/process_32.c +--- linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -12923,9 +12920,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86 + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86/kernel/process_64.c ---- linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86/kernel/process_64.c +--- linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -12968,9 +12965,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86 return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/kernel/process.c ---- linux-2.6.32.13/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/process.c 2010-05-15 13:21:14.095776197 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/kernel/process.c +--- linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -12990,7 +12987,7 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/ke tsk->thread.debugreg0 = 0; tsk->thread.debugreg1 = 0; tsk->thread.debugreg2 = 0; -@@ -600,17 +603,3 @@ static int __init idle_setup(char *str) +@@ -602,17 +605,3 @@ static int __init idle_setup(char *str) return 0; } early_param("idle", idle_setup); @@ -13008,9 +13005,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/ke - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/kernel/ptrace.c ---- linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-05-15 13:21:14.110913724 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/kernel/ptrace.c +--- linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { @@ -13079,9 +13076,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/ker /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/kernel/reboot.c ---- linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-05-15 13:21:14.110913724 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/kernel/reboot.c +--- linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -13158,9 +13155,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/ker /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kernel/setup.c ---- linux-2.6.32.13/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/setup.c 2010-05-15 13:21:14.110913724 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kernel/setup.c +--- linux-2.6.32.15/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 @@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -13181,9 +13178,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kern data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-05-15 13:21:14.119542394 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -13246,9 +13243,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/kernel/signal.c ---- linux-2.6.32.13/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/signal.c 2010-05-15 13:21:14.119542394 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/kernel/signal.c +--- linux-2.6.32.15/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. @@ -13320,9 +13317,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/ker return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/kernel/smpboot.c ---- linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/kernel/smpboot.c +--- linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 @@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; @@ -13348,9 +13345,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/ke #ifdef CONFIG_X86_32 /* init low mem mapping */ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, -diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kernel/step.c ---- linux-2.6.32.13/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/step.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kernel/step.c +--- linux-2.6.32.15/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -13383,17 +13380,17 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kerne /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -13640,9 +13637,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x8 } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -13724,9 +13721,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86 mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kernel/time.c ---- linux-2.6.32.13/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/time.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kernel/time.c +--- linux-2.6.32.15/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -13765,9 +13762,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kerne } return pc; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel/tls.c ---- linux-2.6.32.13/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/tls.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel/tls.c +--- linux-2.6.32.15/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 @@ -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; @@ -13780,9 +13777,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -13805,9 +13802,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/ # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kernel/traps.c ---- linux-2.6.32.13/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/traps.c 2010-05-15 13:21:14.130650342 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kernel/traps.c +--- linux-2.6.32.15/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -13957,9 +13954,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kern handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel/tsc.c ---- linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-05-15 13:21:14.134912019 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel/tsc.c +--- linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -13969,9 +13966,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-05-15 13:21:14.142909281 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -14036,9 +14033,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/ke if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-05-15 13:21:14.150906044 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -14198,9 +14195,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/ker return; local_irq_save(flags); -diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-05-15 13:21:14.162641857 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -14488,9 +14485,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x8 "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-05-15 13:21:14.162641857 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -14524,9 +14521,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x8 }; #endif -diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-05-15 13:21:14.162641857 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -14536,9 +14533,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kernel/xsave.c ---- linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-05-15 13:21:14.162641857 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kernel/xsave.c +--- linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -14566,9 +14563,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kern buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/emulate.c ---- linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 -+++ linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-05-15 13:21:14.178920275 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/emulate.c +--- linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 ++++ linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #define Src2ImmByte (2<<29) @@ -14605,9 +14602,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/e switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lapic.c ---- linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-05-15 13:21:14.186649754 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lapic.c +--- linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -14617,9 +14614,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lap #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c ---- linux-2.6.32.13/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 -+++ linux-2.6.32.13/arch/x86/kvm/svm.c 2010-05-15 13:21:14.206681110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c +--- linux-2.6.32.15/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 ++++ linux-2.6.32.15/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 @@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -14643,9 +14640,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c ---- linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 -+++ linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c +--- linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 ++++ linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 @@ -568,7 +568,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -14727,9 +14724,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c ---- linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 -+++ linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:21:14.230911822 -0400 +diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c +--- linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 ++++ linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -14831,9 +14828,9 @@ diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/lib/checksum_32.S ---- linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-05-15 13:21:14.230911822 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/lib/checksum_32.S +--- linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -15079,9 +15076,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/l #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86/lib/clear_page_64.S ---- linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-05-15 13:21:14.230911822 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/clear_page_64.S linux-2.6.32.15/arch/x86/lib/clear_page_64.S +--- linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -15091,9 +15088,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/lib/copy_page_64.S ---- linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-05-15 13:21:14.230911822 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/copy_page_64.S linux-2.6.32.15/arch/x86/lib/copy_page_64.S +--- linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -15103,9 +15100,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/ 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/lib/copy_user_64.S ---- linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_64.S linux-2.6.32.15/arch/x86/lib/copy_user_64.S +--- linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15180,9 +15177,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/ movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -14,6 +14,7 @@ #include <asm/current.h> #include <asm/asm-offsets.h> @@ -15207,9 +15204,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/a cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -15228,9 +15225,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/ return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/getuser.S ---- linux-2.6.32.13/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/getuser.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/getuser.S +--- linux-2.6.32.15/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 @@ -33,14 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15367,9 +15364,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/g xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -15379,9 +15376,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib/memset_64.S ---- linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib/memset_64.S +--- linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -15391,9 +15388,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mmx_32.c ---- linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mmx_32.c +--- linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -15709,9 +15706,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mm from += 64; to += 64; -diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/putuser.S ---- linux-2.6.32.13/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/putuser.S 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/putuser.S +--- linux-2.6.32.15/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -15881,9 +15878,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/p movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -16852,9 +16849,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/l +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/lib/usercopy_64.c ---- linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/lib/usercopy_64.c +--- linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -16891,9 +16888,9 @@ diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/l } EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile ---- linux-2.6.32.13/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/Makefile 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile +--- linux-2.6.32.15/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -16907,9 +16904,9 @@ diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/extable.c ---- linux-2.6.32.13/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/extable.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/extable.c +--- linux-2.6.32.15/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -16983,9 +16980,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/ext extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault.c ---- linux-2.6.32.13/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/fault.c 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault.c +--- linux-2.6.32.15/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/fault.c 2010-05-28 21:27:15.107152206 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -17651,9 +17648,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c ---- linux-2.6.32.13/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/gup.c 2010-05-15 13:21:14.234766826 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c +--- linux-2.6.32.15/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -17663,9 +17660,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/highmem_32.c ---- linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/highmem_32.c +--- linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -17677,9 +17674,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/ return (void *)vaddr; } -diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -17814,9 +17811,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/init_32.c ---- linux-2.6.32.13/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/init_32.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/init_32.c +--- linux-2.6.32.15/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -18120,9 +18117,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/ini set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/init_64.c ---- linux-2.6.32.13/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/init_64.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/init_64.c +--- linux-2.6.32.15/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -18183,9 +18180,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/ini return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c ---- linux-2.6.32.13/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/init.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c +--- linux-2.6.32.15/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/init.c 2010-05-28 21:27:15.114903294 -0400 @@ -69,11 +69,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. @@ -18302,9 +18299,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/iomap_32.c ---- linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/iomap_32.c +--- linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -18317,9 +18314,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/io arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ioremap.c ---- linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ioremap.c +--- linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. @@ -18366,9 +18363,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ior /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 @@ -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. @@ -18381,9 +18378,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arc return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c ---- linux-2.6.32.13/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/mmap.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c +--- linux-2.6.32.15/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -18465,9 +18462,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/numa_32.c ---- linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/numa_32.c +--- linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -18476,9 +18473,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/num extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pageattr.c ---- linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pageattr.c +--- linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-05-28 21:27:15.118897735 -0400 @@ -268,9 +268,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping @@ -18510,9 +18507,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pa #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-05-15 13:21:14.238617110 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -18522,9 +18519,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/ } struct split_state { -diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c ---- linux-2.6.32.13/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/pat.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c +--- linux-2.6.32.15/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -18561,9 +18558,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -18578,9 +18575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/ /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgtable.c ---- linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgtable.c +--- linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-05-28 21:27:15.118897735 -0400 @@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * #if PAGETABLE_LEVELS > 3 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) @@ -18850,9 +18847,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgt pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/setup_nx.c ---- linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/setup_nx.c +--- linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -18918,9 +18915,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/se __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c ---- linux-2.6.32.13/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/mm/tlb.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c +--- linux-2.6.32.15/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -18942,9 +18939,9 @@ diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-05-15 13:21:14.258921790 -0400 +diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -18963,9 +18960,9 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x8 unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -18975,9 +18972,9 @@ diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/ { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/common.c ---- linux-2.6.32.13/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/common.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/common.c +--- linux-2.6.32.15/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -18998,9 +18995,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/co }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/direct.c ---- linux-2.6.32.13/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/direct.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/direct.c +--- linux-2.6.32.15/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -19028,9 +19025,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/di { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fixup.c ---- linux-2.6.32.13/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/fixup.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fixup.c +--- linux-2.6.32.15/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -19049,9 +19046,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fix }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c ---- linux-2.6.32.13/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 -+++ linux-2.6.32.13/arch/x86/pci/irq.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c +--- linux-2.6.32.15/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 ++++ linux-2.6.32.15/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, @@ -19070,9 +19067,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19082,9 +19079,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19094,9 +19091,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/numaq_32.c ---- linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/numaq_32.c +--- linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -19106,9 +19103,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/ .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc.c ---- linux-2.6.32.13/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/olpc.c 2010-05-15 13:21:14.270940782 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc.c +--- linux-2.6.32.15/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -19118,9 +19115,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pcbios.c ---- linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pcbios.c +--- linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -19443,9 +19440,9 @@ diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pc return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/cpu.c ---- linux-2.6.32.13/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/power/cpu.c 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/cpu.c +--- linux-2.6.32.15/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -19465,9 +19462,9 @@ diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/Makefile ---- linux-2.6.32.13/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/Makefile 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/Makefile +--- linux-2.6.32.15/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -19477,9 +19474,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/ GCOV_PROFILE := n # -diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -19578,9 +19575,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -19681,9 +19678,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -19694,9 +19691,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vds +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso/vextern.h ---- linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso/vextern.h +--- linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -19704,9 +19701,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma.c ---- linux-2.6.32.13/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/vdso/vma.c 2010-05-15 13:21:14.274578804 -0400 +diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma.c +--- linux-2.6.32.15/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -19753,9 +19750,9 @@ diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen/enlighten.c ---- linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen/enlighten.c +--- linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -19774,15 +19771,21 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen end = start + __get_cpu_var(idt_desc).size + 1; xen_mc_flush(); -@@ -1102,6 +1100,16 @@ asmlinkage void __init xen_start_kernel( - #ifdef CONFIG_X86_64 +@@ -1099,9 +1097,20 @@ asmlinkage void __init xen_start_kernel( + */ + __userpte_alloc_gfp &= ~__GFP_HIGHMEM; + +-#ifdef CONFIG_X86_64 /* Work out if we support NX */ - check_efer(); -+#elif defined(CONFIG_X86_PAE) -+ if (cpu_has_nx) { +- check_efer(); ++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) ++ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 && ++ (cpuid_edx(0x80000001) & (1 << (X86_FEATURE_NX & 31)))) { + unsigned l, h; + ++#if defined(CONFIG_X86_32) + nx_enabled = 1; ++#endif + __supported_pte_mask |= _PAGE_NX; + rdmsr(MSR_EFER, l, h); + l |= EFER_NX; @@ -19791,7 +19794,7 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen #endif xen_setup_features(); -@@ -1133,13 +1141,6 @@ asmlinkage void __init xen_start_kernel( +@@ -1133,13 +1142,6 @@ asmlinkage void __init xen_start_kernel( machine_ops = xen_machine_ops; @@ -19805,9 +19808,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c ---- linux-2.6.32.13/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/xen/mmu.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c +--- linux-2.6.32.15/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -19828,9 +19831,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c ---- linux-2.6.32.13/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/xen/smp.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c +--- linux-2.6.32.15/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -19854,9 +19857,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/xen-head.S ---- linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/xen-head.S +--- linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -19875,9 +19878,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/ #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/xen-ops.h ---- linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/xen-ops.h +--- linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -19887,9 +19890,9 @@ diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/x struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integrity.c ---- linux-2.6.32.13/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/blk-integrity.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integrity.c +--- linux-2.6.32.15/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -19899,9 +19902,9 @@ diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integ .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c ---- linux-2.6.32.13/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/blk-iopoll.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c +--- linux-2.6.32.15/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -19911,9 +19914,9 @@ diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c ---- linux-2.6.32.13/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/blk-map.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c +--- linux-2.6.32.15/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -19932,9 +19935,9 @@ diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq.c ---- linux-2.6.32.13/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/blk-softirq.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq.c +--- linux-2.6.32.15/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 @@ -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. @@ -19944,9 +19947,9 @@ diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c ---- linux-2.6.32.13/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/blk-sysfs.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c +--- linux-2.6.32.15/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -19956,9 +19959,9 @@ diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c ---- linux-2.6.32.13/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/block/elevator.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c +--- linux-2.6.32.15/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -19968,9 +19971,9 @@ diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c ---- linux-2.6.32.13/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/crypto/lrw.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c +--- linux-2.6.32.15/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -19980,9 +19983,9 @@ diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/dontdiff ---- linux-2.6.32.13/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/Documentation/dontdiff 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/dontdiff +--- linux-2.6.32.15/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -20090,9 +20093,9 @@ diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/Documentation/kernel-parameters.txt ---- linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 -+++ linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/Documentation/kernel-parameters.txt +--- linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 ++++ linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -20106,9 +20109,9 @@ diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/D pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/battery.c ---- linux-2.6.32.13/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/battery.c 2010-05-15 13:21:14.282910849 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/battery.c +--- linux-2.6.32.15/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -20118,9 +20121,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi/blacklist.c ---- linux-2.6.32.13/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/blacklist.c 2010-05-15 13:21:14.295422110 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi/blacklist.c +--- linux-2.6.32.15/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -20130,9 +20133,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock.c ---- linux-2.6.32.13/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/dock.c 2010-05-15 13:21:14.298962418 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock.c +--- linux-2.6.32.15/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -20151,9 +20154,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c ---- linux-2.6.32.13/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/osl.c 2010-05-15 13:21:14.298962418 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c +--- linux-2.6.32.15/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -20172,9 +20175,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/acpi/power_meter.c ---- linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 -+++ linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:21:14.298962418 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/acpi/power_meter.c +--- linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 ++++ linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; @@ -20184,9 +20187,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/ac mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc.c ---- linux-2.6.32.13/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/proc.c 2010-05-15 13:21:14.307002164 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc.c +--- linux-2.6.32.15/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -20222,9 +20225,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1; found_dev = dev; -diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers/acpi/processor_core.c ---- linux-2.6.32.13/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/processor_core.c 2010-05-15 13:21:14.307002164 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers/acpi/processor_core.c +--- linux-2.6.32.15/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -20234,9 +20237,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers/acpi/processor_idle.c ---- linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-05-15 13:21:14.330926828 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers/acpi/processor_idle.c +--- linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, @@ -20246,9 +20249,21 @@ diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers }; -diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sleep.c ---- linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:20:18.454567530 -0400 -+++ linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:21:14.330926828 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbshc.c +--- linux-2.6.32.15/drivers/acpi/sbshc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/sbshc.c 2010-05-31 11:26:43.164958464 -0400 +@@ -17,7 +17,7 @@ + + #define PREFIX "ACPI: " + +-#define ACPI_SMB_HC_CLASS "smbus_host_controller" ++#define ACPI_SMB_HC_CLASS "smbus_host_ctl" + #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" + + struct acpi_smb_hc { +diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sleep.c +--- linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 ++++ linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp } } @@ -20267,7 +20282,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_disable_gpes, -@@ -701,7 +701,7 @@ static void acpi_pm_enable_gpes(void) +@@ -613,7 +613,7 @@ static void acpi_pm_enable_gpes(void) acpi_enable_all_runtime_gpes(); } @@ -20276,7 +20291,7 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle .begin = acpi_hibernation_begin, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot, -@@ -754,7 +754,7 @@ static int acpi_hibernation_pre_snapshot +@@ -666,7 +666,7 @@ static int acpi_hibernation_pre_snapshot * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -20285,9 +20300,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sle .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/video.c ---- linux-2.6.32.13/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/acpi/video.c 2010-05-15 13:21:14.330926828 -0400 +diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/video.c +--- linux-2.6.32.15/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -20297,9 +20312,9 @@ diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/vid .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c ---- linux-2.6.32.13/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 -+++ linux-2.6.32.13/drivers/ata/ahci.c 2010-05-15 13:21:14.374114367 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c +--- linux-2.6.32.15/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 ++++ linux-2.6.32.15/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -20339,9 +20354,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c }; -diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata/ata_generic.c ---- linux-2.6.32.13/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/ata_generic.c 2010-05-15 13:21:14.387424242 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata/ata_generic.c +--- linux-2.6.32.15/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -20351,9 +20366,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/ata_piix.c ---- linux-2.6.32.13/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 -+++ linux-2.6.32.13/drivers/ata/ata_piix.c 2010-05-15 13:21:14.387424242 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/ata_piix.c +--- linux-2.6.32.15/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 ++++ linux-2.6.32.15/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 @@ -299,7 +299,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (CPT) */ @@ -20417,9 +20432,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/at }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata/libata-acpi.c ---- linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-05-15 13:21:14.387424242 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata/libata-acpi.c +--- linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -20435,9 +20450,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata/libata-core.c ---- linux-2.6.32.13/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 -+++ linux-2.6.32.13/drivers/ata/libata-core.c 2010-05-15 13:21:14.390775531 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata/libata-core.c +--- linux-2.6.32.15/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 ++++ linux-2.6.32.15/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, @@ -20511,9 +20526,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/libata-eh.c ---- linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 -+++ linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:21:14.390775531 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/libata-eh.c +--- linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 ++++ linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 @@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) @@ -20523,9 +20538,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/l ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/libata-pmp.c ---- linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-05-15 13:21:14.390775531 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/libata-pmp.c +--- linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -20535,9 +20550,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/ int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/pata_acpi.c ---- linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-05-15 13:21:14.390775531 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/pata_acpi.c +--- linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20547,9 +20562,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pata_ali.c ---- linux-2.6.32.13/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_ali.c 2010-05-15 13:21:14.402931362 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pata_ali.c +--- linux-2.6.32.15/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -20595,9 +20610,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pa .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pata_amd.c ---- linux-2.6.32.13/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_amd.c 2010-05-15 13:21:14.402931362 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pata_amd.c +--- linux-2.6.32.15/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -20647,9 +20662,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pa .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/pata_artop.c ---- linux-2.6.32.13/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_artop.c 2010-05-15 13:21:14.402931362 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/pata_artop.c +--- linux-2.6.32.15/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20668,9 +20683,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/pata_at32.c ---- linux-2.6.32.13/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_at32.c 2010-05-15 13:21:14.402931362 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/pata_at32.c +--- linux-2.6.32.15/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -20680,9 +20695,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/pata_at91.c ---- linux-2.6.32.13/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_at91.c 2010-05-15 13:21:14.402931362 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/pata_at91.c +--- linux-2.6.32.15/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -20692,9 +20707,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata/pata_atiixp.c ---- linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-05-15 13:21:14.444201793 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata/pata_atiixp.c +--- linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20704,9 +20719,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/ata/pata_atp867x.c ---- linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-05-15 13:21:14.451300458 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/ata/pata_atp867x.c +--- linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -20716,9 +20731,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/pata_bf54x.c ---- linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-05-15 13:21:14.451300458 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/pata_bf54x.c +--- linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -20728,9 +20743,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/ .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata/pata_cmd640.c ---- linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-05-15 13:21:14.451300458 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata/pata_cmd640.c +--- linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20740,9 +20755,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-05-15 13:21:14.451300458 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -20765,9 +20780,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata/pata_cs5520.c ---- linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-05-15 13:21:14.475033843 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata/pata_cs5520.c +--- linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20777,9 +20792,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata/pata_cs5530.c ---- linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata/pata_cs5530.c +--- linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20789,9 +20804,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata/pata_cs5535.c ---- linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata/pata_cs5535.c +--- linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20801,9 +20816,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata/pata_cs5536.c ---- linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata/pata_cs5536.c +--- linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20813,9 +20828,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/ata/pata_cypress.c ---- linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/ata/pata_cypress.c +--- linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -20825,9 +20840,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/pata_efar.c ---- linux-2.6.32.13/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_efar.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/pata_efar.c +--- linux-2.6.32.15/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -20837,9 +20852,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata/pata_hpt366.c ---- linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-05-15 13:21:14.487977689 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata/pata_hpt366.c +--- linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -20849,9 +20864,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-05-15 13:21:14.490951596 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -20888,9 +20903,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -20900,9 +20915,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20912,9 +20927,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata/pata_icside.c ---- linux-2.6.32.13/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_icside.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata/pata_icside.c +--- linux-2.6.32.15/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -20924,9 +20939,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata .inherits = &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata/pata_isapnp.c ---- linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata/pata_isapnp.c +--- linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -20942,9 +20957,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata/pata_it8213.c ---- linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata/pata_it8213.c +--- linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -20954,9 +20969,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata/pata_it821x.c ---- linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata/pata_it821x.c +--- linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20984,9 +20999,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-05-15 13:21:14.498954899 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -20996,9 +21011,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/ata/pata_jmicron.c ---- linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-05-15 13:21:14.502920623 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/ata/pata_jmicron.c +--- linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -21008,9 +21023,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata/pata_legacy.c ---- linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-05-15 13:21:14.502920623 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata/pata_legacy.c +--- linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -21122,9 +21137,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/ata/pata_marvell.c ---- linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-05-15 13:21:14.502920623 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/ata/pata_marvell.c +--- linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21134,9 +21149,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -21146,9 +21161,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/at .inherits = &ata_sff_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/pata_mpiix.c ---- linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/pata_mpiix.c +--- linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -21158,9 +21173,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/ata/pata_netcell.c ---- linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/ata/pata_netcell.c +--- linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21170,9 +21185,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/ata/pata_ninja32.c ---- linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/ata/pata_ninja32.c +--- linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21182,9 +21197,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/ata/pata_ns87410.c ---- linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/ata/pata_ns87410.c +--- linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -21194,9 +21209,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/at .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/ata/pata_ns87415.c ---- linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/ata/pata_ns87415.c +--- linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -21215,9 +21230,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/at .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -21226,9 +21241,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ static struct ata_port_operations octeon_cf_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -21238,9 +21253,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/pata_opti.c ---- linux-2.6.32.13/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_opti.c 2010-05-15 13:21:14.515739682 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/pata_opti.c +--- linux-2.6.32.15/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21250,9 +21265,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/ata/pata_optidma.c ---- linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-05-15 13:21:14.518593102 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/ata/pata_optidma.c +--- linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -21271,9 +21286,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/at .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata/pata_palmld.c ---- linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-05-15 13:21:14.518593102 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata/pata_palmld.c +--- linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -21283,9 +21298,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-05-15 13:21:14.522920519 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -21312,9 +21327,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-05-15 13:21:14.522920519 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21332,9 +21347,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/a .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-05-15 13:21:14.522920519 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -21353,9 +21368,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drive .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/ata/pata_platform.c ---- linux-2.6.32.13/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_platform.c 2010-05-15 13:21:14.522920519 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/ata/pata_platform.c +--- linux-2.6.32.15/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -21365,9 +21380,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pata_qdi.c ---- linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-05-15 13:21:14.526754945 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pata_qdi.c +--- linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -21386,9 +21401,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pa .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/ata/pata_radisys.c ---- linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-05-15 13:21:14.526754945 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/ata/pata_radisys.c +--- linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -21398,9 +21413,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-05-15 13:21:14.526754945 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -21410,9 +21425,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pata_rdc.c ---- linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-05-15 13:21:14.530928469 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pata_rdc.c +--- linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -21422,9 +21437,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pa .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata/pata_rz1000.c ---- linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-05-15 13:21:14.530928469 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata/pata_rz1000.c +--- linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -21434,9 +21449,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata/pata_sc1200.c ---- linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-05-15 13:21:14.530928469 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata/pata_sc1200.c +--- linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21446,9 +21461,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pata_scc.c ---- linux-2.6.32.13/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_scc.c 2010-05-15 13:21:14.530928469 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pata_scc.c +--- linux-2.6.32.15/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21458,9 +21473,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pata_sch.c ---- linux-2.6.32.13/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_sch.c 2010-05-15 13:21:14.534836180 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pata_sch.c +--- linux-2.6.32.15/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21470,9 +21485,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/drivers/ata/pata_serverworks.c ---- linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-05-15 13:21:14.534836180 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/drivers/ata/pata_serverworks.c +--- linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -21491,9 +21506,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/driver .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata/pata_sil680.c ---- linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata/pata_sil680.c +--- linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21503,9 +21518,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pata_sis.c ---- linux-2.6.32.13/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_sis.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pata_sis.c +--- linux-2.6.32.15/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21561,9 +21576,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pa .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21573,9 +21588,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/a .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/ata/pata_triflex.c ---- linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/ata/pata_triflex.c +--- linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -21585,9 +21600,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pata_via.c ---- linux-2.6.32.13/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_via.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pata_via.c +--- linux-2.6.32.15/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21606,9 +21621,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pa .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/ata/pata_winbond.c ---- linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/ata/pata_winbond.c +--- linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -21618,9 +21633,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pdc_adma.c ---- linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-05-15 13:21:14.538682329 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pdc_adma.c +--- linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -21630,9 +21645,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pd .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sata_fsl.c ---- linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-05-15 13:21:14.542941562 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sata_fsl.c +--- linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21642,9 +21657,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/ata/sata_inic162x.c ---- linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-05-15 13:21:14.542941562 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/ata/sata_inic162x.c +--- linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -21654,9 +21669,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/a .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sata_mv.c ---- linux-2.6.32.13/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_mv.c 2010-05-15 13:21:14.567430978 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sata_mv.c +--- linux-2.6.32.15/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -21684,9 +21699,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sat .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sata_nv.c ---- linux-2.6.32.13/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_nv.c 2010-05-15 13:21:14.570612236 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sata_nv.c +--- linux-2.6.32.15/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -21729,9 +21744,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sat .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/ata/sata_promise.c ---- linux-2.6.32.13/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_promise.c 2010-05-15 13:21:14.570612236 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/ata/sata_promise.c +--- linux-2.6.32.15/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -21758,9 +21773,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/at .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/sata_qstor.c ---- linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-05-15 13:21:14.570612236 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/sata_qstor.c +--- linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -21770,9 +21785,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/ .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/sata_sil24.c ---- linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-05-15 13:21:14.570612236 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/sata_sil24.c +--- linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21782,9 +21797,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/ .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sata_sil.c ---- linux-2.6.32.13/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_sil.c 2010-05-15 13:21:14.570612236 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sata_sil.c +--- linux-2.6.32.15/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -21794,9 +21809,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sata_sis.c ---- linux-2.6.32.13/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_sis.c 2010-05-15 13:21:14.578938263 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sata_sis.c +--- linux-2.6.32.15/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21806,9 +21821,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sata_svw.c ---- linux-2.6.32.13/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_svw.c 2010-05-15 13:21:14.578938263 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sata_svw.c +--- linux-2.6.32.15/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -21818,9 +21833,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sata_sx4.c ---- linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-05-15 13:21:14.594941059 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sata_sx4.c +--- linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -21830,9 +21845,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sata_uli.c ---- linux-2.6.32.13/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_uli.c 2010-05-15 13:21:14.594941059 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sata_uli.c +--- linux-2.6.32.15/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21842,9 +21857,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sata_via.c ---- linux-2.6.32.13/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_via.c 2010-05-15 13:21:14.599908388 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sata_via.c +--- linux-2.6.32.15/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21882,9 +21897,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sa .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sata_vsc.c ---- linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-05-15 13:21:14.606569540 -0400 +diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sata_vsc.c +--- linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -21894,9 +21909,9 @@ diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sa .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adummy.c ---- linux-2.6.32.13/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/adummy.c 2010-05-15 13:21:14.606569540 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adummy.c +--- linux-2.6.32.15/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -21906,9 +21921,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adum return 0; } -diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ambassador.c ---- linux-2.6.32.13/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/ambassador.c 2010-05-15 13:21:14.622930740 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ambassador.c +--- linux-2.6.32.15/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -21945,9 +21960,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ return -ENOMEM; // ? } -diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmtcp.c ---- linux-2.6.32.13/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/atmtcp.c 2010-05-15 13:21:14.626657707 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmtcp.c +--- linux-2.6.32.15/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -21997,9 +22012,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmt done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c ---- linux-2.6.32.13/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/eni.c 2010-05-15 13:21:14.634928336 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c +--- linux-2.6.32.15/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -22045,9 +22060,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/firestream.c ---- linux-2.6.32.13/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/firestream.c 2010-05-15 13:21:14.647057643 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/firestream.c +--- linux-2.6.32.15/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -22081,9 +22096,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/ break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fore200e.c ---- linux-2.6.32.13/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/fore200e.c 2010-05-15 13:21:14.676169638 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fore200e.c +--- linux-2.6.32.15/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -22140,9 +22155,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fo fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c ---- linux-2.6.32.13/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/he.c 2010-05-15 13:21:14.691446990 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c +--- linux-2.6.32.15/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -22224,9 +22239,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/horizon.c ---- linux-2.6.32.13/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/horizon.c 2010-05-15 13:21:14.706969618 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/horizon.c +--- linux-2.6.32.15/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -22245,9 +22260,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/hor // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/idt77252.c ---- linux-2.6.32.13/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/idt77252.c 2010-05-15 13:21:14.706969618 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/idt77252.c +--- linux-2.6.32.15/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -22402,9 +22417,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/id return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/iphase.c ---- linux-2.6.32.13/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/iphase.c 2010-05-15 13:21:14.750617431 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/iphase.c +--- linux-2.6.32.15/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) status = (u_short) (buf_desc_ptr->desc_mode); if (status & (RX_CER | RX_PTE | RX_OFL)) @@ -22501,9 +22516,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/ipha if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai.c ---- linux-2.6.32.13/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/lanai.c 2010-05-15 13:21:14.750617431 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai.c +--- linux-2.6.32.15/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -22558,9 +22573,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nicstar.c ---- linux-2.6.32.13/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/nicstar.c 2010-05-15 13:21:14.787751803 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nicstar.c +--- linux-2.6.32.15/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -22763,9 +22778,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nic } } -diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/solos-pci.c ---- linux-2.6.32.13/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/solos-pci.c 2010-05-15 13:21:14.815606670 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/solos-pci.c +--- linux-2.6.32.15/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -22784,9 +22799,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/s solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c ---- linux-2.6.32.13/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/suni.c 2010-05-15 13:21:14.815606670 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c +--- linux-2.6.32.15/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -22798,9 +22813,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uPD98402.c ---- linux-2.6.32.13/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/uPD98402.c 2010-05-15 13:21:14.815606670 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uPD98402.c +--- linux-2.6.32.15/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -22845,9 +22860,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uP return 0; } -diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c ---- linux-2.6.32.13/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/atm/zatm.c 2010-05-15 13:21:14.815606670 -0400 +diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c +--- linux-2.6.32.15/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -22875,9 +22890,9 @@ diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c ---- linux-2.6.32.13/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/base/bus.c 2010-05-15 13:21:14.831148567 -0400 +diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c +--- linux-2.6.32.15/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -22905,9 +22920,9 @@ diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/class.c ---- linux-2.6.32.13/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/base/class.c 2010-05-15 13:21:14.874164060 -0400 +diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/class.c +--- linux-2.6.32.15/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -22917,9 +22932,9 @@ diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/cla .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core.c ---- linux-2.6.32.13/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/base/core.c 2010-05-15 13:21:14.878954723 -0400 +diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core.c +--- linux-2.6.32.15/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -22938,9 +22953,9 @@ diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/memory.c ---- linux-2.6.32.13/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/base/memory.c 2010-05-15 13:21:14.882954278 -0400 +diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/memory.c +--- linux-2.6.32.15/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -22950,9 +22965,9 @@ diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/me .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c ---- linux-2.6.32.13/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/base/sys.c 2010-05-15 13:21:14.890945998 -0400 +diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c +--- linux-2.6.32.15/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -22971,9 +22986,9 @@ diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block/pktcdvd.c ---- linux-2.6.32.13/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/block/pktcdvd.c 2010-05-15 13:21:14.919938646 -0400 +diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block/pktcdvd.c +--- linux-2.6.32.15/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -22983,9 +22998,9 @@ diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/char/agp/frontend.c ---- linux-2.6.32.13/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/agp/frontend.c 2010-05-15 13:21:14.919938646 -0400 +diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/char/agp/frontend.c +--- linux-2.6.32.15/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -22995,9 +23010,9 @@ diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/c return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/char/agp/intel-agp.c ---- linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 -+++ linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-05-15 13:21:14.919938646 -0400 +diff -urNp linux-2.6.32.15/drivers/char/agp/intel-agp.c linux-2.6.32.15/drivers/char/agp/intel-agp.c +--- linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 ++++ linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), @@ -23007,9 +23022,9 @@ diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/ }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet.c ---- linux-2.6.32.13/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hpet.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet.c +--- linux-2.6.32.15/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -23037,9 +23052,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet static int __init hpet_init(void) { -diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/hvc_beat.c ---- linux-2.6.32.13/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_beat.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/hvc_beat.c +--- linux-2.6.32.15/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -23049,9 +23064,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/ .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/char/hvc_console.c ---- linux-2.6.32.13/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_console.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/char/hvc_console.c +--- linux-2.6.32.15/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has to be * static because kmalloc will not work during early console init. @@ -23079,9 +23094,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/ch { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/char/hvc_console.h ---- linux-2.6.32.13/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_console.h 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/char/hvc_console.h +--- linux-2.6.32.15/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -23105,9 +23120,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/ch /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/char/hvc_iseries.c ---- linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/char/hvc_iseries.c +--- linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -23117,9 +23132,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/ch .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/hvc_iucv.c ---- linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/hvc_iucv.c +--- linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -23129,9 +23144,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/ .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/hvc_rtas.c ---- linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-05-15 13:21:14.922737516 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/hvc_rtas.c +--- linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -23141,9 +23156,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/ .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs.c ---- linux-2.6.32.13/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvcs.c 2010-05-15 13:21:14.967285135 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs.c +--- linux-2.6.32.15/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -23238,9 +23253,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/hvc_udbg.c ---- linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-05-15 13:21:14.967285135 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/hvc_udbg.c +--- linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -23250,9 +23265,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/ .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/hvc_vio.c ---- linux-2.6.32.13/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_vio.c 2010-05-15 13:21:14.967285135 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/hvc_vio.c +--- linux-2.6.32.15/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -23262,9 +23277,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/h .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/hvc_xen.c ---- linux-2.6.32.13/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/hvc_xen.c 2010-05-15 13:21:14.967285135 -0400 +diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/hvc_xen.c +--- linux-2.6.32.15/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -23274,9 +23289,9 @@ diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/h .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-05-15 13:21:15.002974818 -0400 +diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -23307,9 +23322,9 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/d intf->proc_dir = NULL; -diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-05-15 13:21:15.014624441 -0400 +diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -23340,9 +23355,9 @@ diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/driv new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/keyboard.c ---- linux-2.6.32.13/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/keyboard.c 2010-05-15 13:21:15.018564312 -0400 +diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/keyboard.c +--- linux-2.6.32.15/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -23369,9 +23384,9 @@ diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/ }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c ---- linux-2.6.32.13/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/mem.c 2010-05-15 13:21:15.018564312 -0400 +diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c +--- linux-2.6.32.15/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -23462,9 +23477,9 @@ diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvram.c ---- linux-2.6.32.13/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/nvram.c 2010-05-15 13:21:15.018564312 -0400 +diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvram.c +--- linux-2.6.32.15/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -23477,9 +23492,9 @@ diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvr }; static int __init nvram_init(void) -diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-05-15 13:21:15.018564312 -0400 +diff -urNp linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -23594,9 +23609,9 @@ diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c ---- linux-2.6.32.13/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/pty.c 2010-05-15 13:21:15.035728941 -0400 +diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c +--- linux-2.6.32.15/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -23627,9 +23642,9 @@ diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) -diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/random.c ---- linux-2.6.32.13/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/random.c 2010-05-15 13:21:15.038954680 -0400 +diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/random.c +--- linux-2.6.32.15/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -23671,9 +23686,9 @@ diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/ra static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/sonypi.c ---- linux-2.6.32.13/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/sonypi.c 2010-05-15 13:21:15.038954680 -0400 +diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/sonypi.c +--- linux-2.6.32.15/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -23704,9 +23719,9 @@ diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/so mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-05-15 13:21:15.042644897 -0400 +diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -23747,9 +23762,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/c memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tty_io.c ---- linux-2.6.32.13/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 -+++ linux-2.6.32.13/drivers/char/tty_io.c 2010-05-15 13:21:15.058626500 -0400 +diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tty_io.c +--- linux-2.6.32.15/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 ++++ linux-2.6.32.15/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -23888,9 +23903,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tt /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char/tty_ldisc.c ---- linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-05-15 13:21:15.058626500 -0400 +diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char/tty_ldisc.c +--- linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; @@ -23936,9 +23951,9 @@ diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers/char/virtio_console.c ---- linux-2.6.32.13/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/virtio_console.c 2010-05-15 13:21:15.058626500 -0400 +diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers/char/virtio_console.c +--- linux-2.6.32.15/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -23947,9 +23962,9 @@ diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers static struct hv_ops virtio_cons; /* The hvc device */ -diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/vt_ioctl.c ---- linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-05-15 13:21:15.062960555 -0400 +diff -urNp linux-2.6.32.15/drivers/char/vt_ioctl.c linux-2.6.32.15/drivers/char/vt_ioctl.c +--- linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -23977,9 +23992,9 @@ diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/ q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-05-15 13:21:15.062960555 -0400 +diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -23989,9 +24004,9 @@ diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpu .show = show, .store = store, }; -diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuidle/sysfs.c ---- linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-05-15 13:21:15.062960555 -0400 +diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuidle/sysfs.c +--- linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -24019,9 +24034,9 @@ diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuid { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/ioat/dma.c ---- linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-05-15 13:21:15.074651091 -0400 +diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/ioat/dma.c +--- linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -24031,9 +24046,9 @@ diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/io .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/ioat/dma.h ---- linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-05-15 13:21:15.090639890 -0400 +diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/ioat/dma.h +--- linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c unsigned long *phys_complete); void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); @@ -24043,9 +24058,9 @@ diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/io extern struct ioat_sysfs_entry ioat_version_attr; extern struct ioat_sysfs_entry ioat_cap_attr; #endif /* IOATDMA_H */ -diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac/edac_core.h ---- linux-2.6.32.13/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/edac/edac_core.h 2010-05-15 13:21:15.090639890 -0400 +diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac/edac_core.h +--- linux-2.6.32.15/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -24063,9 +24078,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-05-15 13:21:15.090639890 -0400 +diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -24093,9 +24108,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/driv .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-05-15 13:21:15.090639890 -0400 +diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -24114,9 +24129,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/ .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-05-15 13:21:15.090639890 -0400 +diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -24135,9 +24150,9 @@ diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/firewire/core-cdev.c ---- linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-05-15 13:21:15.094957471 -0400 +diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/firewire/core-cdev.c +--- linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; @@ -24148,9 +24163,9 @@ diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/ return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/firmware/dmi_scan.c ---- linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-05-15 13:21:15.094957471 -0400 +diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/firmware/dmi_scan.c +--- linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -24163,9 +24178,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/f p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmware/edd.c ---- linux-2.6.32.13/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firmware/edd.c 2010-05-15 13:21:15.094957471 -0400 +diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmware/edd.c +--- linux-2.6.32.15/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -24175,9 +24190,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmwa .show = edd_attr_show, }; -diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/firmware/efivars.c ---- linux-2.6.32.13/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firmware/efivars.c 2010-05-15 13:21:15.102953838 -0400 +diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/firmware/efivars.c +--- linux-2.6.32.15/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -24187,9 +24202,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/fi .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-05-15 13:21:15.102953838 -0400 +diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -24199,9 +24214,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/firmware/memmap.c ---- linux-2.6.32.13/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/firmware/memmap.c 2010-05-15 13:21:15.102953838 -0400 +diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/firmware/memmap.c +--- linux-2.6.32.15/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -24211,9 +24226,9 @@ diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/fir .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-05-15 13:21:15.118645498 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -24223,9 +24238,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-05-15 13:21:15.130631389 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -24277,9 +24292,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gp if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-05-15 13:21:15.138734335 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); @@ -24289,9 +24304,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/g stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-05-15 13:21:15.138734335 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_lock.c linux-2.6.32.15/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -24310,9 +24325,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gp /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-05-15 13:21:15.158669145 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -24335,9 +24350,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drive sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-15 13:21:15.175041309 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -24347,9 +24362,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/dri .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-15 13:21:15.175041309 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -24359,9 +24374,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/dri .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-05-15 13:21:15.175041309 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -24394,9 +24409,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gp +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-15 13:21:15.175041309 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -24406,9 +24421,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drive .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-15 13:21:15.175041309 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -24418,9 +24433,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/dri .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-15 13:21:15.178966455 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -24430,9 +24445,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/dri .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-05-15 13:21:15.178966455 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -24442,9 +24457,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drive .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-05-15 13:21:15.190982657 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -24462,9 +24477,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/d if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-15 13:21:15.194751236 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o } } @@ -24489,9 +24504,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-05-15 13:21:15.198961996 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { @@ -24501,9 +24516,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. } else error = abs(current_freq - freq); vco_diff = abs(vco - best_vco); -diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -24513,9 +24528,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -24567,9 +24582,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/d } -diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 @@ -39,7 +39,7 @@ #include <linux/module.h> @@ -24588,9 +24603,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/ .show = &ttm_bo_global_show }; -diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -24611,9 +24626,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drive /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -24671,9 +24686,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/driv ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -24683,9 +24698,9 @@ diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/driv .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/hid/usbhid/hiddev.c ---- linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/hid/usbhid/hiddev.c +--- linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); @@ -24695,9 +24710,9 @@ diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/h return -EINVAL; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/k8temp.c ---- linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-05-15 13:21:15.206905040 -0400 +diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/k8temp.c +--- linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -24707,9 +24722,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon/sis5595.c ---- linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-05-15 13:21:15.222963784 -0400 +diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon/sis5595.c +--- linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -24719,9 +24734,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon/via686a.c ---- linux-2.6.32.13/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hwmon/via686a.c 2010-05-15 13:21:15.230602217 -0400 +diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon/via686a.c +--- linux-2.6.32.15/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -24731,9 +24746,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/vt8231.c ---- linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-05-15 13:21:15.230602217 -0400 +diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/vt8231.c +--- linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -24743,9 +24758,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon/w83791d.c ---- linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon/w83791d.c +--- linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -24757,9 +24772,9 @@ diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 -+++ linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 ++++ linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, @@ -24769,9 +24784,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -24790,9 +24805,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/driver }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -24802,9 +24817,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drive }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -24814,9 +24829,9 @@ diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drive }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide-cd.c ---- linux-2.6.32.13/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ide/ide-cd.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide-cd.c +--- linux-2.6.32.15/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -24826,9 +24841,9 @@ diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide- drive->dma = 0; } } -diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/ieee1394/dv1394.c ---- linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-05-15 13:21:15.234719424 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/ieee1394/dv1394.c +--- linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -24847,9 +24862,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/iee }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ieee1394/eth1394.c ---- linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-05-15 13:21:15.250965621 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ieee1394/eth1394.c +--- linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -24859,9 +24874,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee1394/hosts.c ---- linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-05-15 13:21:15.250965621 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee1394/hosts.c +--- linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -24870,9 +24885,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-05-15 13:21:15.283282671 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -24894,9 +24909,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/i }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ieee1394/raw1394.c ---- linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-05-15 13:21:15.340016183 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ieee1394/raw1394.c +--- linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -24906,9 +24921,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1394/sbp2.c ---- linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-05-15 13:21:15.374974502 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1394/sbp2.c +--- linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -24927,9 +24942,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1 { int ret; -diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ieee1394/video1394.c ---- linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-05-15 13:21:15.379405032 -0400 +diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ieee1394/video1394.c +--- linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -24939,9 +24954,9 @@ diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/infiniband/core/cm.c ---- linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-05-15 13:21:15.390974340 -0400 +diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/infiniband/core/cm.c +--- linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -25085,9 +25100,9 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/ .show = cm_show_counter }; -diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-05-15 13:21:15.420653417 -0400 +diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -25097,9 +25112,9 @@ diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drive .show = port_attr_show }; -diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-05-15 13:21:15.420653417 -0400 +diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/drivers/input/keyboard/atkbd.c +--- linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25109,9 +25124,9 @@ diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/driver }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/drivers/input/mouse/lifebook.c ---- linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-05-15 13:21:15.420653417 -0400 +diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/drivers/input/mouse/lifebook.c +--- linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -25121,9 +25136,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/driver }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-05-15 13:21:15.430620618 -0400 +diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25133,9 +25148,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/dr }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drivers/input/mouse/synaptics.c ---- linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-05-15 13:21:15.430620618 -0400 +diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drivers/input/mouse/synaptics.c +--- linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -25164,9 +25179,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drive }; #endif -diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/input/mousedev.c ---- linux-2.6.32.13/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/mousedev.c 2010-05-15 13:21:15.435182881 -0400 +diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/input/mousedev.c +--- linux-2.6.32.15/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -25176,9 +25191,9 @@ diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/inpu }; static int psaux_registered; #endif -diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-05-15 13:21:15.435182881 -0400 +diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 @@ -172,7 +172,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -25233,9 +25248,9 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13 }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drivers/input/serio/serio_raw.c ---- linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-05-15 13:21:15.435182881 -0400 +diff -urNp linux-2.6.32.15/drivers/input/serio/serio_raw.c linux-2.6.32.15/drivers/input/serio/serio_raw.c +--- linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -25245,9 +25260,9 @@ diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drive }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers/isdn/gigaset/common.c ---- linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-05-15 13:21:15.435182881 -0400 +diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers/isdn/gigaset/common.c +--- linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -25257,9 +25272,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-05-15 13:21:15.435182881 -0400 +diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -25269,9 +25284,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/driver struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-05-15 13:21:15.462977265 -0400 +diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -25359,9 +25374,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/driv dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-05-15 13:21:15.462977265 -0400 +diff -urNp linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -25380,9 +25395,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/driver return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/icn/icn.c ---- linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-05-15 13:21:15.462977265 -0400 +diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/icn/icn.c +--- linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -25392,9 +25407,9 @@ diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/i return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/core.c ---- linux-2.6.32.13/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/lguest/core.c 2010-05-15 13:21:15.466573931 -0400 +diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/core.c +--- linux-2.6.32.15/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 @@ -91,9 +91,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -25413,9 +25428,9 @@ diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/ if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-05-15 13:21:15.466573931 -0400 +diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -25434,9 +25449,9 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13 .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/macintosh/via-pmu.c ---- linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-05-15 13:21:15.488292870 -0400 +diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/macintosh/via-pmu.c +--- linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -25446,9 +25461,9 @@ diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/m .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap.c ---- linux-2.6.32.13/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/md/bitmap.c 2010-05-15 13:21:15.498921900 -0400 +diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap.c +--- linux-2.6.32.15/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -25458,9 +25473,9 @@ diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap # endif #endif -diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-sysfs.c ---- linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-05-15 13:21:15.498921900 -0400 +diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-sysfs.c +--- linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -25470,9 +25485,9 @@ diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-s .show = dm_attr_show, }; -diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-table.c ---- linux-2.6.32.13/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/md/dm-table.c 2010-05-15 13:21:15.498921900 -0400 +diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-table.c +--- linux-2.6.32.15/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -25482,9 +25497,9 @@ diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-t DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c ---- linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 -+++ linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:21:15.498921900 -0400 +diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c +--- linux-2.6.32.15/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 ++++ linux-2.6.32.15/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); @@ -25521,9 +25536,9 @@ diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h ---- linux-2.6.32.13/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/md/md.h 2010-05-15 13:21:15.507356136 -0400 +diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h +--- linux-2.6.32.15/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -25533,9 +25548,9 @@ diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-15 13:21:15.510998118 -0400 +diff -urNp linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -25544,9 +25559,9 @@ diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/d struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-05-15 13:21:15.510998118 -0400 +diff -urNp linux-2.6.32.15/drivers/media/radio/radio-cadet.c linux-2.6.32.15/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f while (i < count && dev->rdsin != dev->rdsout) readbuf[i++] = dev->rdsbuf[dev->rdsout++]; @@ -25556,9 +25571,9 @@ diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/dri return -EFAULT; return i; } -diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-05-15 13:21:15.526921305 -0400 +diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -25568,9 +25583,9 @@ diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-15 13:21:15.526921305 -0400 +diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -25580,9 +25595,9 @@ diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/drivers/message/fusion/mptdebug.h ---- linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-05-15 13:21:15.526921305 -0400 +diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/drivers/message/fusion/mptdebug.h +--- linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 @@ -71,7 +71,7 @@ CMD; \ } @@ -25592,9 +25607,9 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/dri #endif -diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drivers/message/fusion/mptsas.c ---- linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-05-15 13:21:15.526921305 -0400 +diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drivers/message/fusion/mptsas.c +--- linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -25643,9 +25658,9 @@ diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-05-15 13:21:15.526921305 -0400 +diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -25732,9 +25747,9 @@ diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/driver return 0; } -diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kgdbts.c ---- linux-2.6.32.13/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/misc/kgdbts.c 2010-05-15 13:21:15.554995461 -0400 +diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kgdbts.c +--- linux-2.6.32.15/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -25753,9 +25768,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kg .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-05-15 13:21:15.554995461 -0400 +diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -25767,9 +25782,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/dri if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-05-15 13:21:15.554995461 -0400 +diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -25793,9 +25808,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/driv max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-05-15 13:21:15.554995461 -0400 +diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -25979,9 +25994,9 @@ diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/driv } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-05-15 13:21:15.563050037 -0400 +diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 @@ -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 */ @@ -25991,9 +26006,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-05-15 13:21:15.563050037 -0400 +diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -26003,9 +26018,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/ubi/build.c ---- linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-05-15 13:21:15.566632432 -0400 +diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/ubi/build.c +--- linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -26045,9 +26060,9 @@ diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/u } /** -diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/net/e1000e/82571.c ---- linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-05-15 13:21:15.586662276 -0400 +diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/net/e1000e/82571.c +--- linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -26101,9 +26116,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/ne .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/net/e1000e/e1000.h ---- linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-05-15 13:21:15.586662276 -0400 +diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/net/e1000e/e1000.h +--- linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -26117,9 +26132,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/ne }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-05-15 13:21:15.611440944 -0400 +diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -26155,9 +26170,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/n .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e1000e/hw.h ---- linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-05-15 13:21:15.627454440 -0400 +diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e1000e/hw.h +--- linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { /* Function pointers for the PHY. */ @@ -26217,9 +26232,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e }; struct e1000_mac_info { -diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 -+++ linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-05-15 13:21:15.627454440 -0400 +diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 ++++ linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -26247,9 +26262,9 @@ diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/ .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, .release_nvm = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibmveth.c ---- linux-2.6.32.13/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/ibmveth.c 2010-05-15 13:21:15.630621605 -0400 +diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibmveth.c +--- linux-2.6.32.15/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -26259,9 +26274,9 @@ diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibm .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 -+++ linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-05-15 13:21:15.646981498 -0400 +diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 ++++ linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 @@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -26287,9 +26302,9 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 -+++ linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-05-15 13:21:15.646981498 -0400 +diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 ++++ linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 @@ -303,17 +303,17 @@ struct e1000_phy_operations { }; @@ -26315,9 +26330,9 @@ diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/ne }; extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/net/irda/vlsi_ir.c ---- linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-05-15 13:21:15.650979196 -0400 +diff -urNp linux-2.6.32.15/drivers/net/irda/vlsi_ir.c linux-2.6.32.15/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -26334,9 +26349,9 @@ diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/ne spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return NETDEV_TX_OK; -diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/net/iseries_veth.c ---- linux-2.6.32.13/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/iseries_veth.c 2010-05-15 13:21:15.675080517 -0400 +diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/net/iseries_veth.c +--- linux-2.6.32.15/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -26355,9 +26370,9 @@ diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/ne .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcnet32.c ---- linux-2.6.32.13/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/pcnet32.c 2010-05-15 13:21:15.695242570 -0400 +diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcnet32.c +--- linux-2.6.32.15/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -26367,9 +26382,9 @@ diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcn { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h ---- linux-2.6.32.13/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 -+++ linux-2.6.32.13/drivers/net/tg3.h 2010-05-15 13:21:15.715816686 -0400 +diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h +--- linux-2.6.32.15/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 ++++ linux-2.6.32.15/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -26378,9 +26393,9 @@ diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net/tulip/de4x5.c ---- linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-05-15 13:21:15.731971640 -0400 +diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net/tulip/de4x5.c +--- linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; @@ -26399,9 +26414,9 @@ diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net return -EFAULT; break; } -diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb/hso.c ---- linux-2.6.32.13/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/usb/hso.c 2010-05-15 13:21:15.731971640 -0400 +diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb/hso.c +--- linux-2.6.32.15/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -26480,9 +26495,9 @@ diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-05-15 13:21:15.742991879 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -26492,9 +26507,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/dr /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-05-15 13:21:15.742991879 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); @@ -26504,9 +26519,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-15 13:21:15.746908676 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -26516,9 +26531,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl1000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-15 13:21:15.777121582 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -26528,10 +26543,10 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-15 13:21:15.803555313 -0400 -@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib = +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 +@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -26540,10 +26555,10 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-15 13:21:15.810712850 -0400 -@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 +@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -26560,9 +26575,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-15 13:21:15.810712850 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -26572,9 +26587,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-15 13:21:15.810712850 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif @@ -26586,9 +26601,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, void *p, u32 len) {} -diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-15 13:21:15.810712850 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 @@ -67,7 +67,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -26598,9 +26613,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-05-15 13:21:15.810712850 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -26610,9 +26625,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn devdbg(usbdev, "set_rts_threshold %i", rts_threshold); @@ -26622,9 +26637,9 @@ diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/dri rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -26660,9 +26675,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/driver } } release_mm(mm); -diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drivers/oprofile/event_buffer.c ---- linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drivers/oprofile/event_buffer.c +--- linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -26672,9 +26687,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drive return; } -diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/oprofile/oprof.c ---- linux-2.6.32.13/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/oprof.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/oprofile/oprof.c +--- linux-2.6.32.15/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -26684,9 +26699,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/opro start_switch_worker(); } -diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -26696,9 +26711,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -26716,9 +26731,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/dri } -diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -26736,9 +26751,9 @@ diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/dri }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/parisc/pdc_stable.c ---- linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/parisc/pdc_stable.c +--- linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -26748,9 +26763,9 @@ diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/p .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parport/procfs.c ---- linux-2.6.32.13/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/parport/procfs.c 2010-05-15 13:21:15.822985498 -0400 +diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parport/procfs.c +--- linux-2.6.32.15/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -26769,9 +26784,9 @@ diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parp } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-05-15 13:21:15.842765021 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -26781,9 +26796,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/dr .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-15 13:21:15.842765021 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -26798,9 +26813,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/dr dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-05-15 13:21:15.847000534 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -26810,9 +26825,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci/intel-iommu.c ---- linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-05-15 13:21:15.847000534 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci/intel-iommu.c +--- linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de return !dma_addr; } @@ -26822,9 +26837,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-05-15 13:21:15.867469095 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -26834,9 +26849,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/driver }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe.c ---- linux-2.6.32.13/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/probe.c 2010-05-15 13:21:15.867469095 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe.c +--- linux-2.6.32.15/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -26854,9 +26869,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe struct device_attribute *attr, char *buf) { -diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c ---- linux-2.6.32.13/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/proc.c 2010-05-15 13:21:15.867469095 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c +--- linux-2.6.32.15/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -26874,9 +26889,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c ---- linux-2.6.32.13/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pci/slot.c 2010-05-15 13:21:15.895764457 -0400 +diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c +--- linux-2.6.32.15/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -26886,9 +26901,9 @@ diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmcia/ti113x.h ---- linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-05-15 13:21:15.895764457 -0400 +diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmcia/ti113x.h +--- linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), @@ -26898,9 +26913,9 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmci }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -26910,9 +26925,9 @@ diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -26922,9 +26937,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drive .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -26934,9 +26949,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/driv .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/asus-laptop.c linux-2.6.32.15/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -26946,9 +26961,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/dr .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -26958,9 +26973,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/ .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -26970,9 +26985,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/dr .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -26982,9 +26997,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/d .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -26994,9 +27009,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13 .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -27006,9 +27021,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/dri .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-05-15 13:21:15.911499692 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -27018,9 +27033,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -27030,9 +27045,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/dr .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -27042,9 +27057,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/ .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -27054,9 +27069,9 @@ diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/d .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -27113,9 +27128,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quirks.c ---- linux-2.6.32.13/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pnp/quirks.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quirks.c +--- linux-2.6.32.15/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -27125,9 +27140,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quir }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/resource.c ---- linux-2.6.32.13/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/pnp/resource.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/resource.c +--- linux-2.6.32.15/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -27146,9 +27161,9 @@ diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/re return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-05-15 13:21:15.914756904 -0400 +diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -27224,9 +27239,9 @@ diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-05-15 13:21:15.927411554 -0400 +diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.h linux-2.6.32.15/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -27299,9 +27314,9 @@ diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/ } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c ---- linux-2.6.32.13/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/scsi/ipr.c 2010-05-15 13:21:15.970703897 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c +--- linux-2.6.32.15/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -27311,9 +27326,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-05-15 13:21:15.970703897 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -27435,9 +27450,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/ fc_frame_free(fp); } -diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 -+++ linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:21:15.970703897 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 ++++ linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -27447,9 +27462,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h ---- linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-15 13:21:15.991412669 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h +--- linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 @@ -79,7 +79,7 @@ CMD; \ } @@ -27459,9 +27474,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/ #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ -diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/scsi/scsi_logging.h ---- linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-05-15 13:21:15.991412669 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/scsi/scsi_logging.h +--- linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -27471,9 +27486,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/s #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c ---- linux-2.6.32.13/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/scsi/sg.c 2010-05-15 13:21:15.991412669 -0400 +diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c +--- linux-2.6.32.15/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -27492,9 +27507,9 @@ diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/serial/8250_pci.c ---- linux-2.6.32.13/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/serial/8250_pci.c 2010-05-15 13:21:16.030795257 -0400 +diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/serial/8250_pci.c +--- linux-2.6.32.15/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -27504,9 +27519,9 @@ diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/ser }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/serial/kgdboc.c ---- linux-2.6.32.13/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/serial/kgdboc.c 2010-05-15 13:21:16.030795257 -0400 +diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/serial/kgdboc.c +--- linux-2.6.32.15/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -27525,9 +27540,9 @@ diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/seria .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/drivers/staging/android/binder.c ---- linux-2.6.32.13/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/android/binder.c 2010-05-15 13:21:16.072777583 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/drivers/staging/android/binder.c +--- linux-2.6.32.15/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -27537,9 +27552,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/driv .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-05-15 13:21:16.111132239 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -27558,9 +27573,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-05-15 13:21:16.111132239 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -27570,9 +27585,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/ .close = comedi_unmap, }; -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-15 13:21:16.111132239 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -27582,9 +27597,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 .owner = THIS_MODULE, .open = adsp_open, .unlocked_ioctl = adsp_ioctl, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-15 13:21:16.127017061 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -27594,9 +27609,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-15 13:21:16.139031435 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -27606,9 +27621,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 .owner = THIS_MODULE, .open = audamrnb_open, .release = audamrnb_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-15 13:21:16.151007392 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -27618,9 +27633,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 .owner = THIS_MODULE, .open = audevrc_open, .release = audevrc_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-05-15 13:21:16.155145249 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -27639,9 +27654,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-15 13:21:16.171026730 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -27651,9 +27666,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-05-15 13:21:16.175016772 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -27672,9 +27687,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. .owner = THIS_MODULE, .open = audpp_open, .unlocked_ioctl = audpp_ioctl, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-15 13:21:16.183014216 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -27684,9 +27699,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 .owner = THIS_MODULE, .open = audqcelp_open, .release = audqcelp_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-05-15 13:21:16.187015266 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -27696,9 +27711,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/dri .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-05-15 13:21:16.190693177 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -27708,9 +27723,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/d .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-15 13:21:16.190693177 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -27729,9 +27744,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/staging/dst/dcore.c ---- linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-05-15 13:21:16.190693177 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/staging/dst/dcore.c +--- linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -27750,9 +27765,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/staging/dst/trans.c ---- linux-2.6.32.13/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/dst/trans.c 2010-05-15 13:21:16.211066896 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/staging/dst/trans.c +--- linux-2.6.32.15/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -27762,9 +27777,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/s t->enc = bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-05-15 13:21:16.231838911 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -27774,9 +27789,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/ .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-05-15 13:21:16.231838911 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -27786,9 +27801,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drive .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers/staging/panel/panel.c ---- linux-2.6.32.13/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/panel/panel.c 2010-05-15 13:21:16.231838911 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers/staging/panel/panel.c +--- linux-2.6.32.15/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -27807,9 +27822,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drivers/staging/phison/phison.c ---- linux-2.6.32.13/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/phison/phison.c 2010-05-15 13:21:16.242656725 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drivers/staging/phison/phison.c +--- linux-2.6.32.15/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -27819,9 +27834,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drive .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/staging/poch/poch.c ---- linux-2.6.32.13/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/poch/poch.c 2010-05-15 13:21:16.268445393 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/staging/poch/poch.c +--- linux-2.6.32.15/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -27831,9 +27846,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/s .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-05-15 13:21:16.285190860 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -27843,9 +27858,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/driv psb->trans_max_pages = 100; -diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-05-15 13:21:16.291030028 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -27855,9 +27870,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/dri mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-05-15 13:21:16.307023663 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -27867,9 +27882,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/driv unsigned long mcache_timeout; unsigned int idx; -diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-05-15 13:21:16.365819296 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -27879,9 +27894,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/driv .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-05-15 13:21:16.387343522 -0400 +diff -urNp linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * static int __init vme_user_probe(struct device *, int, int); static int __exit vme_user_remove(struct device *, int, int); @@ -27891,9 +27906,9 @@ diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1 .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c ---- linux-2.6.32.13/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/uio/uio.c 2010-05-15 13:21:16.387343522 -0400 +diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c +--- linux-2.6.32.15/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -27912,9 +27927,9 @@ diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c .show = portio_type_show, }; -diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/atm/usbatm.c ---- linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-05-15 13:21:16.394585811 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/atm/usbatm.c +--- linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -27994,9 +28009,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/ if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/usb/class/cdc-acm.c ---- linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 -+++ linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-05-15 13:21:16.402576854 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/usb/class/cdc-acm.c +--- linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 ++++ linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 @@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -28006,9 +28021,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/u }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb/class/usblp.c ---- linux-2.6.32.13/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/class/usblp.c 2010-05-15 13:21:16.423521533 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb/class/usblp.c +--- linux-2.6.32.15/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -28027,9 +28042,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/core/hcd.c ---- linux-2.6.32.13/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/core/hcd.c 2010-05-15 13:21:16.445526992 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/core/hcd.c +--- linux-2.6.32.15/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -28048,9 +28063,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/co { if (mon_ops) -diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/core/hcd.h ---- linux-2.6.32.13/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/core/hcd.h 2010-05-15 13:21:16.447026425 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/core/hcd.h +--- linux-2.6.32.15/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -28078,9 +28093,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/co void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/core/hub.c ---- linux-2.6.32.13/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/core/hub.c 2010-05-15 13:21:16.479087397 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/core/hub.c +--- linux-2.6.32.15/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -28090,9 +28105,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/co }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/usb/core/message.c ---- linux-2.6.32.13/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/core/message.c 2010-05-15 13:21:16.479087397 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/usb/core/message.c +--- linux-2.6.32.15/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -28104,9 +28119,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/us if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/usb/host/ehci-pci.c ---- linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-05-15 13:21:16.495431959 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/usb/host/ehci-pci.c +--- linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .driver_data = (unsigned long) &ehci_pci_hc_driver, @@ -28116,9 +28131,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/u }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/usb/host/uhci-hcd.c ---- linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-05-15 13:21:16.495431959 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -28128,9 +28143,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/u }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-05-15 13:21:16.495431959 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -28140,9 +28155,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drive .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/usb/mon/mon_main.c ---- linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-05-15 13:21:16.504078790 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/usb/mon/mon_main.c +--- linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -28152,9 +28167,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/us .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/usb/storage/debug.h ---- linux-2.6.32.13/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/storage/debug.h 2010-05-15 13:21:16.521852812 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/usb/storage/debug.h +--- linux-2.6.32.15/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -28168,9 +28183,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/u #endif #endif -diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb/storage/usb.c ---- linux-2.6.32.13/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/storage/usb.c 2010-05-15 13:21:16.547749964 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb/storage/usb.c +--- linux-2.6.32.15/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -28180,9 +28195,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-05-15 13:21:16.559032137 -0400 +diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/drivers/usb/storage/usual-tables.c +--- linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -28192,9 +28207,9 @@ diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/dr }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uwb/wlp/messages.c ---- linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-05-15 13:21:16.584920944 -0400 +diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uwb/wlp/messages.c +--- linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -28204,9 +28219,9 @@ diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uw enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-05-15 13:21:16.587027337 -0400 +diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -28217,9 +28232,9 @@ diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/w .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-05-15 13:21:16.587027337 -0400 +diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -28229,9 +28244,9 @@ diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/v .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/video/aty/aty128fb.c ---- linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-05-15 13:21:16.599120806 -0400 +diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/video/aty/aty128fb.c +--- linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -28241,9 +28256,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/ .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -28253,9 +28268,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/driver .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -28265,9 +28280,9 @@ diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/ .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -28277,9 +28292,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/ .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -28289,9 +28304,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/driv .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -28301,9 +28316,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/drivers/video/backlight/backlight.c ---- linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/drivers/video/backlight/backlight.c +--- linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -28313,9 +28328,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -28325,9 +28340,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/d .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -28337,9 +28352,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/dr .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -28349,9 +28364,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/d .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -28361,9 +28376,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/ .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -28373,9 +28388,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/dr .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -28385,9 +28400,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32. .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -28397,9 +28412,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/d .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -28409,9 +28424,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/d .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-15 13:21:16.611030004 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -28421,9 +28436,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. }; /* Module parameters. */ -diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -28433,9 +28448,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/dr .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -28445,9 +28460,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/ .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -28457,9 +28472,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/driv .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -28469,9 +28484,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/dri .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -28481,9 +28496,9 @@ diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/d .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28493,9 +28508,9 @@ diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -28505,9 +28520,9 @@ diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/driv .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/fbcmap.c ---- linux-2.6.32.13/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/fbcmap.c 2010-05-15 13:21:16.647199475 -0400 +diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/fbcmap.c +--- linux-2.6.32.15/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -28518,9 +28533,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/ rc = -EINVAL; goto out1; } -diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/fbmem.c ---- linux-2.6.32.13/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/fbmem.c 2010-05-15 13:21:16.659032956 -0400 +diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/fbmem.c +--- linux-2.6.32.15/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -28548,9 +28563,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/fbmon.c ---- linux-2.6.32.13/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/fbmon.c 2010-05-15 13:21:16.667905259 -0400 +diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/fbmon.c +--- linux-2.6.32.15/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -28560,9 +28575,9 @@ diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/f #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drivers/video/i810/i810_accel.c ---- linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-05-15 13:21:16.667905259 -0400 +diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drivers/video/i810/i810_accel.c +--- linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -28571,9 +28586,9 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drive i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/drivers/video/i810/i810_main.c ---- linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-05-15 13:21:16.675089243 -0400 +diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/drivers/video/i810/i810_main.c +--- linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, @@ -28583,9 +28598,9 @@ diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/driver }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/modedb.c ---- linux-2.6.32.13/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/modedb.c 2010-05-15 13:21:16.691535841 -0400 +diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/modedb.c +--- linux-2.6.32.15/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -28886,9 +28901,9 @@ diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/ }, }; -diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-05-15 13:21:16.691535841 -0400 +diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -28898,9 +28913,9 @@ diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/d .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/video/riva/fbdev.c ---- linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-05-15 13:21:16.695039791 -0400 +diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/video/riva/fbdev.c +--- linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -28910,9 +28925,9 @@ diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/vi .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video/uvesafb.c ---- linux-2.6.32.13/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/uvesafb.c 2010-05-15 13:21:16.714782153 -0400 +diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video/uvesafb.c +--- linux-2.6.32.15/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -28988,9 +29003,9 @@ diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video } framebuffer_release(info); -diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/vesafb.c ---- linux-2.6.32.13/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/video/vesafb.c 2010-05-15 13:21:16.727737170 -0400 +diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/vesafb.c +--- linux-2.6.32.15/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 @@ -9,6 +9,7 @@ */ @@ -29094,9 +29109,9 @@ diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-05-15 13:21:16.727737170 -0400 +diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -29106,9 +29121,9 @@ diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/ .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c ---- linux-2.6.32.13/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/9p/vfs_inode.c 2010-05-15 13:21:16.735266886 -0400 +diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c +--- linux-2.6.32.15/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -29118,9 +29133,9 @@ diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c ---- linux-2.6.32.13/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/aio.c 2010-05-15 13:21:16.759050469 -0400 +diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c +--- linux-2.6.32.15/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -29130,9 +29145,9 @@ diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c ---- linux-2.6.32.13/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/attr.c 2010-05-15 13:21:16.767048242 -0400 +diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c +--- linux-2.6.32.15/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -29141,9 +29156,9 @@ diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c ---- linux-2.6.32.13/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/autofs/root.c 2010-05-15 13:21:16.770726483 -0400 +diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c +--- linux-2.6.32.15/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -29154,9 +29169,9 @@ diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symlink.c ---- linux-2.6.32.13/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/autofs4/symlink.c 2010-05-15 13:21:16.786757439 -0400 +diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symlink.c +--- linux-2.6.32.15/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -29166,9 +29181,9 @@ diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symli return NULL; } -diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c ---- linux-2.6.32.13/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/befs/linuxvfs.c 2010-05-15 13:21:16.795284033 -0400 +diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c +--- linux-2.6.32.15/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -29178,9 +29193,9 @@ diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c ---- linux-2.6.32.13/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/binfmt_aout.c 2010-05-15 13:21:16.799043518 -0400 +diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c +--- linux-2.6.32.15/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -29248,9 +29263,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c ---- linux-2.6.32.13/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/binfmt_elf.c 2010-05-15 13:21:16.818718975 -0400 +diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c +--- linux-2.6.32.15/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -29886,9 +29901,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c ---- linux-2.6.32.13/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/binfmt_flat.c 2010-05-15 13:21:16.818718975 -0400 +diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c +--- linux-2.6.32.15/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -29921,9 +29936,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c ---- linux-2.6.32.13/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/binfmt_misc.c 2010-05-15 13:21:16.827094561 -0400 +diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c +--- linux-2.6.32.15/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -29933,9 +29948,9 @@ diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c ---- linux-2.6.32.13/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/bio.c 2010-05-15 13:21:16.827094561 -0400 +diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c +--- linux-2.6.32.15/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -29954,9 +29969,9 @@ diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c ---- linux-2.6.32.13/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 -+++ linux-2.6.32.13/fs/block_dev.c 2010-05-15 13:21:16.839060742 -0400 +diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c +--- linux-2.6.32.15/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 ++++ linux-2.6.32.15/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, else if (bdev->bd_contains == bdev) res = 0; /* is a whole device which isn't held */ @@ -29966,9 +29981,9 @@ diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c res = 0; /* is a partition of a device that is being partitioned */ else if (bdev->bd_contains->bd_holder != NULL) res = -EBUSY; /* is a partition of a held device */ -diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c ---- linux-2.6.32.13/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/ctree.c 2010-05-15 13:21:16.884750763 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c +--- linux-2.6.32.15/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; @@ -29977,9 +29992,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c ---- linux-2.6.32.13/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/disk-io.c 2010-05-15 13:21:16.884750763 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c +--- linux-2.6.32.15/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -29998,9 +30013,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_io.h ---- linux-2.6.32.13/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/extent_io.h 2010-05-15 13:21:16.911563863 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_io.h +--- linux-2.6.32.15/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -30061,9 +30076,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_ }; struct extent_state { -diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/free-space-cache.c ---- linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-05-15 13:21:16.918599051 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/free-space-cache.c +--- linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -30082,9 +30097,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/ if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c ---- linux-2.6.32.13/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/inode.c 2010-05-15 13:21:16.951236359 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c +--- linux-2.6.32.15/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -30103,9 +30118,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, -diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c ---- linux-2.6.32.13/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/btrfs/sysfs.c 2010-05-15 13:21:16.956074066 -0400 +diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c +--- linux-2.6.32.15/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -30121,9 +30136,9 @@ diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c ---- linux-2.6.32.13/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/buffer.c 2010-05-15 13:21:16.978563593 -0400 +diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c +--- linux-2.6.32.15/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -30132,9 +30147,9 @@ diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bind.c ---- linux-2.6.32.13/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/cachefiles/bind.c 2010-05-15 13:21:16.978563593 -0400 +diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bind.c +--- linux-2.6.32.15/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -30151,9 +30166,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bi cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/daemon.c ---- linux-2.6.32.13/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/cachefiles/daemon.c 2010-05-15 13:21:16.995071409 -0400 +diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/daemon.c +--- linux-2.6.32.15/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -30181,9 +30196,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/ return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rdwr.c ---- linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-05-15 13:21:16.995071409 -0400 +diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rdwr.c +--- linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -30193,9 +30208,9 @@ diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rd set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_uniupr.h ---- linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-05-15 13:21:16.995071409 -0400 +diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_uniupr.h +--- linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -30205,9 +30220,9 @@ diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_un }; #endif -diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c ---- linux-2.6.32.13/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/cifs/link.c 2010-05-15 13:21:16.995071409 -0400 +diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c +--- linux-2.6.32.15/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -30217,9 +30232,9 @@ diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binfmt_elf.c ---- linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-05-15 13:21:16.995071409 -0400 +diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binfmt_elf.c +--- linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -30233,9 +30248,9 @@ diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binf #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c ---- linux-2.6.32.13/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/compat.c 2010-05-15 13:21:17.027084488 -0400 +diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c +--- linux-2.6.32.15/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.15/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -30318,9 +30333,9 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c + fput(old_exec_file); +#endif - current->stack_start = current->mm->start_stack; - -@@ -1543,6 +1585,14 @@ int compat_do_execve(char * filename, + /* execve succeeded */ + current->fs->in_exec = 0; +@@ -1541,6 +1583,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; @@ -30335,9 +30350,9 @@ diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c ---- linux-2.6.32.13/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/compat_ioctl.c 2010-05-15 13:21:17.050796208 -0400 +diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c +--- linux-2.6.32.15/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -30357,9 +30372,9 @@ diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c ---- linux-2.6.32.13/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/debugfs/inode.c 2010-05-15 13:21:17.062663383 -0400 +diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c +--- linux-2.6.32.15/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -30369,9 +30384,9 @@ diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c ---- linux-2.6.32.13/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/dlm/lockspace.c 2010-05-15 13:21:17.082686362 -0400 +diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c +--- linux-2.6.32.15/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -30381,9 +30396,9 @@ diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode.c ---- linux-2.6.32.13/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 -+++ linux-2.6.32.13/fs/ecryptfs/inode.c 2010-05-15 13:21:17.090658956 -0400 +diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode.c +--- linux-2.6.32.15/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 ++++ linux-2.6.32.15/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 @@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -30402,9 +30417,9 @@ diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c ---- linux-2.6.32.13/fs/exec.c 2010-04-04 20:41:50.037938751 -0400 -+++ linux-2.6.32.13/fs/exec.c 2010-05-15 13:21:17.114657511 -0400 +diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c +--- linux-2.6.32.15/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.15/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -30662,9 +30677,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c + fput(old_exec_file); +#endif - current->stack_start = current->mm->start_stack; - -@@ -1390,6 +1471,14 @@ int do_execve(char * filename, + /* execve succeeded */ + current->fs->in_exec = 0; +@@ -1388,6 +1469,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; @@ -30679,7 +30694,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c out: if (bprm->mm) mmput (bprm->mm); -@@ -1553,6 +1642,169 @@ out: +@@ -1551,6 +1640,169 @@ out: return ispipe; } @@ -30849,7 +30864,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1755,17 +2007,17 @@ static void wait_for_dump_helpers(struct +@@ -1753,17 +2005,17 @@ static void wait_for_dump_helpers(struct pipe = file->f_path.dentry->d_inode->i_pipe; pipe_lock(pipe); @@ -30872,7 +30887,7 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c pipe_unlock(pipe); } -@@ -1836,6 +2088,10 @@ void do_coredump(long signr, int exit_co +@@ -1834,6 +2086,10 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); @@ -30883,9 +30898,9 @@ diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c ---- linux-2.6.32.13/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext2/balloc.c 2010-05-15 13:21:17.118672646 -0400 +diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c +--- linux-2.6.32.15/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -30895,9 +30910,9 @@ diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c ---- linux-2.6.32.13/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext2/xattr.c 2010-05-15 13:21:17.122783817 -0400 +diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c +--- linux-2.6.32.15/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 @@ -85,8 +85,8 @@ printk("\n"); \ } while (0) @@ -30909,9 +30924,9 @@ diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c #endif static int ext2_xattr_set2(struct inode *, struct buffer_head *, -diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c ---- linux-2.6.32.13/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext3/balloc.c 2010-05-15 13:21:17.135016428 -0400 +diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c +--- linux-2.6.32.15/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -30921,9 +30936,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c ---- linux-2.6.32.13/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext3/namei.c 2010-05-15 13:21:17.155157464 -0400 +diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c +--- linux-2.6.32.15/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -30933,9 +30948,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c ---- linux-2.6.32.13/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 -+++ linux-2.6.32.13/fs/ext3/xattr.c 2010-05-15 13:21:17.158583972 -0400 +diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c +--- linux-2.6.32.15/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 ++++ linux-2.6.32.15/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -30947,9 +30962,9 @@ diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c ---- linux-2.6.32.13/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext4/balloc.c 2010-05-15 13:21:17.158583972 -0400 +diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c +--- linux-2.6.32.15/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -30959,9 +30974,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c ---- linux-2.6.32.13/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext4/ioctl.c 2010-05-15 13:21:17.158583972 -0400 +diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c +--- linux-2.6.32.15/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 @@ -221,6 +221,9 @@ setversion_out: struct file *donor_filp; int err; @@ -30972,9 +30987,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c if (!(filp->f_mode & FMODE_READ) || !(filp->f_mode & FMODE_WRITE)) return -EBADF; -diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c ---- linux-2.6.32.13/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext4/namei.c 2010-05-15 13:21:17.183216444 -0400 +diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c +--- linux-2.6.32.15/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -30984,9 +30999,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c ---- linux-2.6.32.13/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext4/super.c 2010-05-15 13:21:17.215811745 -0400 +diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c +--- linux-2.6.32.15/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje } @@ -30996,9 +31011,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c ---- linux-2.6.32.13/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ext4/xattr.c 2010-05-15 13:21:17.227060881 -0400 +diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c +--- linux-2.6.32.15/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 @@ -82,8 +82,8 @@ printk("\n"); \ } while (0) @@ -31010,9 +31025,9 @@ diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c #endif static void ext4_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c ---- linux-2.6.32.13/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fcntl.c 2010-05-15 13:21:17.227060881 -0400 +diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c +--- linux-2.6.32.15/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: @@ -31031,9 +31046,9 @@ diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c ---- linux-2.6.32.13/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fifo.c 2010-05-15 13:21:17.252844788 -0400 +diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c +--- linux-2.6.32.15/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -31104,9 +31119,9 @@ diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c ---- linux-2.6.32.13/fs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/file.c 2010-05-15 13:21:17.256078508 -0400 +diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c +--- linux-2.6.32.15/fs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/file.c 2010-05-28 21:27:16.158915754 -0400 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -31124,9 +31139,9 @@ diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c ---- linux-2.6.32.13/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fs_struct.c 2010-05-15 13:21:17.256078508 -0400 +diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c +--- linux-2.6.32.15/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 @@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo struct task_struct *g, *p; struct fs_struct *fs; @@ -31231,9 +31246,9 @@ diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c task_unlock(current); if (kill) -diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c ---- linux-2.6.32.13/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fuse/control.c 2010-05-15 13:21:17.271074520 -0400 +diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c +--- linux-2.6.32.15/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -31243,9 +31258,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c ---- linux-2.6.32.13/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fuse/cuse.c 2010-05-15 13:21:17.289230785 -0400 +diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c +--- linux-2.6.32.15/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -31280,9 +31295,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c ---- linux-2.6.32.13/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fuse/dev.c 2010-05-15 13:21:17.290606220 -0400 +diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c +--- linux-2.6.32.15/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -31388,9 +31403,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, -diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c ---- linux-2.6.32.13/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fuse/dir.c 2010-05-15 13:21:17.295063654 -0400 +diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c +--- linux-2.6.32.15/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -31400,9 +31415,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h ---- linux-2.6.32.13/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/fuse/fuse_i.h 2010-05-15 13:21:17.298596794 -0400 +diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h +--- linux-2.6.32.15/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 @@ -521,6 +521,16 @@ extern const struct file_operations fuse extern const struct dentry_operations fuse_dentry_operations; @@ -31420,9 +31435,9 @@ diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c ---- linux-2.6.32.13/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/gfs2/sys.c 2010-05-15 13:21:17.323073000 -0400 +diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c +--- linux-2.6.32.15/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -31441,9 +31456,9 @@ diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c ---- linux-2.6.32.13/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/hfs/inode.c 2010-05-15 13:21:17.331804288 -0400 +diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c +--- linux-2.6.32.15/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -31462,9 +31477,9 @@ diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c ---- linux-2.6.32.13/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/hfsplus/inode.c 2010-05-15 13:21:17.338586981 -0400 +diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c +--- linux-2.6.32.15/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -31501,9 +31516,9 @@ diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/inode.c ---- linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-05-15 13:21:17.367723130 -0400 +diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/inode.c +--- linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -31513,9 +31528,9 @@ diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/ino static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c ---- linux-2.6.32.13/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ioctl.c 2010-05-15 13:21:17.367723130 -0400 +diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c +--- linux-2.6.32.15/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -31543,9 +31558,9 @@ diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h ---- linux-2.6.32.13/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/jffs2/debug.h 2010-05-15 13:21:17.378571837 -0400 +diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h +--- linux-2.6.32.15/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -31647,9 +31662,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c ---- linux-2.6.32.13/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/jffs2/erase.c 2010-05-15 13:21:17.386577527 -0400 +diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c +--- linux-2.6.32.15/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -31660,9 +31675,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h ---- linux-2.6.32.13/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/jffs2/summary.h 2010-05-15 13:21:17.386577527 -0400 +diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h +--- linux-2.6.32.15/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -31691,9 +31706,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c ---- linux-2.6.32.13/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/jffs2/wbuf.c 2010-05-15 13:21:17.386577527 -0400 +diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c +--- linux-2.6.32.15/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -31704,9 +31719,9 @@ diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c ---- linux-2.6.32.13/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/lockd/svc.c 2010-05-15 13:21:17.394616660 -0400 +diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c +--- linux-2.6.32.15/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -31716,9 +31731,9 @@ diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c ---- linux-2.6.32.13/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/locks.c 2010-05-15 13:21:17.398591192 -0400 +diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c +--- linux-2.6.32.15/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -31740,9 +31755,9 @@ diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c ---- linux-2.6.32.13/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/namei.c 2010-05-15 13:21:17.402570795 -0400 +diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c +--- linux-2.6.32.15/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -32069,9 +32084,9 @@ diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c ---- linux-2.6.32.13/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/namespace.c 2010-05-15 13:21:17.430740691 -0400 +diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c +--- linux-2.6.32.15/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -32132,9 +32147,9 @@ diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c ---- linux-2.6.32.13/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 -+++ linux-2.6.32.13/fs/nfs/inode.c 2010-05-15 13:21:17.459288785 -0400 +diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c +--- linux-2.6.32.15/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 ++++ linux-2.6.32.15/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -32155,9 +32170,9 @@ diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c ---- linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 -+++ linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-05-15 13:21:17.510781468 -0400 +diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c +--- linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 ++++ linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -32428,9 +32443,9 @@ diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c ---- linux-2.6.32.13/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/nfsd/lockd.c 2010-05-15 13:21:17.510781468 -0400 +diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c +--- linux-2.6.32.15/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -32440,9 +32455,9 @@ diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c ---- linux-2.6.32.13/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/nfsd/vfs.c 2010-05-15 13:21:17.539124101 -0400 +diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c +--- linux-2.6.32.15/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -32470,9 +32485,9 @@ diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c ---- linux-2.6.32.13/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/nls/nls_base.c 2010-05-15 13:21:17.550577951 -0400 +diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c +--- linux-2.6.32.15/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -32482,9 +32497,9 @@ diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c ---- linux-2.6.32.13/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ntfs/file.c 2010-05-15 13:21:17.582652999 -0400 +diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c +--- linux-2.6.32.15/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -32494,9 +32509,9 @@ diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-05-15 13:21:17.582652999 -0400 +diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -32506,9 +32521,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/c .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/localalloc.c ---- linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-05-15 13:21:17.587704007 -0400 +diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/localalloc.c +--- linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -32518,9 +32533,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/locala status = 0; bail: -diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h ---- linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-05-15 13:21:17.612604736 -0400 +diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h +--- linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -32538,9 +32553,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc.c ---- linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 -+++ linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-05-15 13:21:17.655985201 -0400 +diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc.c +--- linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 ++++ linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -32586,9 +32601,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc } } if (status < 0) { -diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c ---- linux-2.6.32.13/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/ocfs2/super.c 2010-05-15 13:21:17.677940986 -0400 +diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c +--- linux-2.6.32.15/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -32623,9 +32638,9 @@ diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c ---- linux-2.6.32.13/fs/open.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/open.c 2010-05-15 13:21:17.687346474 -0400 +diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c +--- linux-2.6.32.15/fs/open.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/open.c 2010-05-28 21:27:16.247317121 -0400 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -32799,9 +32814,9 @@ diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c ---- linux-2.6.32.13/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/pipe.c 2010-05-15 13:21:17.687346474 -0400 +diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c +--- linux-2.6.32.15/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -32925,12 +32940,12 @@ diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c ---- linux-2.6.32.13/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/array.c 2010-05-15 13:21:17.690587811 -0400 -@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct +diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c +--- linux-2.6.32.15/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.15/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 +@@ -321,6 +321,21 @@ static inline void task_context_switch_c + p->nivcsw); } - #endif /* CONFIG_MMU */ +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) +static inline void task_pax(struct seq_file *m, struct task_struct *p) @@ -32950,10 +32965,10 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -430,9 +445,20 @@ int proc_pid_status(struct seq_file *m, +@@ -340,9 +355,20 @@ int proc_pid_status(struct seq_file *m, + task_show_regs(m, task); #endif task_context_switch_counts(m, task); - task_show_stack_usage(m, task); + +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) + task_pax(m, task); @@ -32971,7 +32986,7 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task, int whole) { -@@ -529,6 +555,19 @@ static int do_task_stat(struct seq_file +@@ -439,6 +465,19 @@ static int do_task_stat(struct seq_file gtime = task_gtime(task); } @@ -32991,23 +33006,23 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c /* scale priority and nice values from timeslices to -20..20 */ /* to make it look like a "normal" Unix priority/nice value */ priority = task_prio(task); -@@ -569,9 +608,15 @@ static int do_task_stat(struct seq_file +@@ -479,9 +518,15 @@ static int do_task_stat(struct seq_file vsize, mm ? get_mm_rss(mm) : 0, rsslim, +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0), + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0), -+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0), ++ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0), +#else mm ? mm->start_code : 0, mm ? mm->end_code : 0, - (permitted && mm) ? task->stack_start : 0, + (permitted && mm) ? mm->start_stack : 0, +#endif esp, eip, /* The signal information here is obsolete. -@@ -624,3 +669,10 @@ int proc_pid_statm(struct seq_file *m, s +@@ -534,3 +579,10 @@ int proc_pid_statm(struct seq_file *m, s return 0; } @@ -33018,9 +33033,9 @@ diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c ---- linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 -+++ linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:21:17.690587811 -0400 +diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c +--- linux-2.6.32.15/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 ++++ linux-2.6.32.15/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -33386,9 +33401,9 @@ diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c ---- linux-2.6.32.13/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/cmdline.c 2010-05-15 13:21:17.694581759 -0400 +diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c +--- linux-2.6.32.15/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -33401,9 +33416,9 @@ diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c ---- linux-2.6.32.13/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/devices.c 2010-05-15 13:21:17.706647417 -0400 +diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c +--- linux-2.6.32.15/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -33416,9 +33431,9 @@ diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c ---- linux-2.6.32.13/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/inode.c 2010-05-15 13:21:17.710596393 -0400 +diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c +--- linux-2.6.32.15/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -33431,9 +33446,9 @@ diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h ---- linux-2.6.32.13/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/internal.h 2010-05-15 13:21:17.714628011 -0400 +diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h +--- linux-2.6.32.15/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 @@ -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, @@ -33444,9 +33459,9 @@ diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig ---- linux-2.6.32.13/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/Kconfig 2010-05-15 13:21:17.722605604 -0400 +diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig +--- linux-2.6.32.15/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -33474,9 +33489,9 @@ diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c ---- linux-2.6.32.13/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/kcore.c 2010-05-15 13:21:17.730660780 -0400 +diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c +--- linux-2.6.32.15/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use static int open_kcore(struct inode *inode, struct file *filp) @@ -33487,9 +33502,9 @@ diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c ---- linux-2.6.32.13/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/meminfo.c 2010-05-15 13:21:17.734637714 -0400 +diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c +--- linux-2.6.32.15/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -33499,9 +33514,9 @@ diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c #endif ); -diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c ---- linux-2.6.32.13/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/nommu.c 2010-05-15 13:21:17.738599356 -0400 +diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c +--- linux-2.6.32.15/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -33511,9 +33526,9 @@ diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c ---- linux-2.6.32.13/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/proc_net.c 2010-05-15 13:21:17.742599005 -0400 +diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c +--- linux-2.6.32.15/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -33532,9 +33547,9 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sysctl.c ---- linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-05-15 13:21:17.746588317 -0400 +diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sysctl.c +--- linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -33574,9 +33589,9 @@ diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sy generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c ---- linux-2.6.32.13/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/root.c 2010-05-15 13:21:17.750584298 -0400 +diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c +--- linux-2.6.32.15/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -33593,9 +33608,9 @@ diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c ---- linux-2.6.32.13/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/task_mmu.c 2010-05-15 13:21:17.758934117 -0400 +diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c +--- linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -33682,9 +33697,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c + (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack)) { name = "[stack]"; - } else { - unsigned long stack_start; -@@ -403,9 +429,16 @@ static int show_smap(struct seq_file *m, + } + } else { +@@ -384,9 +410,16 @@ static int show_smap(struct seq_file *m, }; memset(&mss, 0, sizeof mss); @@ -33704,7 +33719,7 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c show_map_vma(m, vma); -@@ -421,7 +454,11 @@ static int show_smap(struct seq_file *m, +@@ -402,7 +435,11 @@ static int show_smap(struct seq_file *m, "Swap: %8lu kB\n" "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n", @@ -33716,9 +33731,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nommu.c ---- linux-2.6.32.13/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/proc/task_nommu.c 2010-05-15 13:21:17.758934117 -0400 +diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nommu.c +--- linux-2.6.32.15/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -33737,9 +33752,9 @@ diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nom } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c ---- linux-2.6.32.13/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/readdir.c 2010-05-15 13:21:17.778956743 -0400 +diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c +--- linux-2.6.32.15/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -33829,9 +33844,9 @@ diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do_balan.c ---- linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-05-15 13:21:17.786600991 -0400 +diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do_balan.c +--- linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -33841,9 +33856,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/item_ops.c ---- linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-05-15 13:21:17.794567981 -0400 +diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/item_ops.c +--- linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -33898,9 +33913,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/procfs.c ---- linux-2.6.32.13/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/reiserfs/procfs.c 2010-05-15 13:21:17.802593961 -0400 +diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/procfs.c +--- linux-2.6.32.15/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -33910,9 +33925,9 @@ diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/proc SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c ---- linux-2.6.32.13/fs/select.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/select.c 2010-05-15 13:21:17.806683634 -0400 +diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c +--- linux-2.6.32.15/fs/select.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/select.c 2010-05-28 21:27:16.263231213 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -33929,9 +33944,9 @@ diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c ---- linux-2.6.32.13/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/seq_file.c 2010-05-15 13:21:17.810601731 -0400 +diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c +--- linux-2.6.32.15/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -33972,9 +33987,9 @@ diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c ---- linux-2.6.32.13/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/smbfs/symlink.c 2010-05-15 13:21:17.810601731 -0400 +diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c +--- linux-2.6.32.15/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -33984,9 +33999,9 @@ diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c ---- linux-2.6.32.13/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/splice.c 2010-05-15 13:21:17.818603295 -0400 +diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c +--- linux-2.6.32.15/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -34125,9 +34140,9 @@ diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c ---- linux-2.6.32.13/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/sysfs/file.c 2010-05-15 13:21:17.818603295 -0400 +diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c +--- linux-2.6.32.15/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -34164,9 +34179,9 @@ diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c int error = -EACCES; char *p; -diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c ---- linux-2.6.32.13/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/sysfs/symlink.c 2010-05-15 13:21:17.822590321 -0400 +diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c +--- linux-2.6.32.15/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -34176,9 +34191,9 @@ diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c ---- linux-2.6.32.13/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/udf/balloc.c 2010-05-15 13:21:17.834616935 -0400 +diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c +--- linux-2.6.32.15/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -34201,9 +34216,9 @@ diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c ---- linux-2.6.32.13/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/udf/misc.c 2010-05-15 13:21:17.834616935 -0400 +diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c +--- linux-2.6.32.15/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat iinfo->i_lenEAttr += size; return (struct genericFormat *)&ea[offset]; @@ -34215,9 +34230,9 @@ diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c return NULL; } -diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h ---- linux-2.6.32.13/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/udf/udfdecl.h 2010-05-15 13:21:17.859848219 -0400 +diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h +--- linux-2.6.32.15/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 @@ -26,7 +26,7 @@ do { \ printk(f, ##a); \ } while (0) @@ -34227,9 +34242,9 @@ diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h #endif #define udf_info(f, a...) \ -diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c ---- linux-2.6.32.13/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/utimes.c 2010-05-15 13:21:17.859848219 -0400 +diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c +--- linux-2.6.32.15/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -34251,9 +34266,9 @@ diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-15 13:21:17.862604779 -0400 +diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -34263,9 +34278,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/l copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 -+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-05-15 13:21:17.866593235 -0400 +diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 ++++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -34275,9 +34290,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/li if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c ---- linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-05-15 13:21:17.902607196 -0400 +diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c +--- linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -34287,9 +34302,9 @@ diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/gracl_alloc.c ---- linux-2.6.32.13/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_alloc.c 2010-05-15 13:21:17.902607196 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/gracl_alloc.c +--- linux-2.6.32.15/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -34396,9 +34411,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/g + else + return 1; +} -diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c ---- linux-2.6.32.13/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c +--- linux-2.6.32.15/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,3897 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -38297,9 +38312,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gracl_cap.c ---- linux-2.6.32.13/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_cap.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gracl_cap.c +--- linux-2.6.32.15/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_cap.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -38432,9 +38447,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gra + return 0; +} + -diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/gracl_fs.c ---- linux-2.6.32.13/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_fs.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/gracl_fs.c +--- linux-2.6.32.15/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38860,9 +38875,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/grac + + return 0; +} -diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/gracl_ip.c ---- linux-2.6.32.13/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_ip.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/gracl_ip.c +--- linux-2.6.32.15/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -39203,9 +39218,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/grac + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/gracl_learn.c ---- linux-2.6.32.13/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_learn.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/gracl_learn.c +--- linux-2.6.32.15/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39418,9 +39433,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/g + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gracl_res.c ---- linux-2.6.32.13/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_res.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gracl_res.c +--- linux-2.6.32.15/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39487,9 +39502,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gra + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gracl_segv.c ---- linux-2.6.32.13/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_segv.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gracl_segv.c +--- linux-2.6.32.15/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39801,9 +39816,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gracl_shm.c ---- linux-2.6.32.13/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/gracl_shm.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gracl_shm.c +--- linux-2.6.32.15/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/gracl_shm.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39842,9 +39857,9 @@ diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gra + + return 1; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/grsec_chdir.c ---- linux-2.6.32.13/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_chdir.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/grsec_chdir.c +--- linux-2.6.32.15/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39865,9 +39880,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/grsec_chroot.c ---- linux-2.6.32.13/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_chroot.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/grsec_chroot.c +--- linux-2.6.32.15/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_chroot.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,348 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -40217,9 +40232,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurity/grsec_disabled.c ---- linux-2.6.32.13/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_disabled.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurity/grsec_disabled.c +--- linux-2.6.32.15/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -40647,9 +40662,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurit +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/grsec_exec.c ---- linux-2.6.32.13/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_exec.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/grsec_exec.c +--- linux-2.6.32.15/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40740,9 +40755,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/grsec_fifo.c ---- linux-2.6.32.13/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_fifo.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/grsec_fifo.c +--- linux-2.6.32.15/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40768,9 +40783,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/grsec_fork.c ---- linux-2.6.32.13/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_fork.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/grsec_fork.c +--- linux-2.6.32.15/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40787,9 +40802,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/grsec_init.c ---- linux-2.6.32.13/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_init.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/grsec_init.c +--- linux-2.6.32.15/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_init.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,241 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41032,9 +41047,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/grsec_link.c ---- linux-2.6.32.13/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_link.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/grsec_link.c +--- linux-2.6.32.15/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41079,9 +41094,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grsec_log.c ---- linux-2.6.32.13/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_log.c 2010-05-15 13:21:17.906582737 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grsec_log.c +--- linux-2.6.32.15/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,296 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41379,9 +41394,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grsec_mem.c ---- linux-2.6.32.13/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_mem.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grsec_mem.c +--- linux-2.6.32.15/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41468,9 +41483,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grs + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/grsec_mount.c ---- linux-2.6.32.13/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_mount.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/grsec_mount.c +--- linux-2.6.32.15/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41534,9 +41549,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/g +#endif + return 0; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/grsec_ptrace.c ---- linux-2.6.32.13/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_ptrace.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/grsec_ptrace.c +--- linux-2.6.32.15/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41552,9 +41567,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/ +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grsec_sig.c ---- linux-2.6.32.13/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_sig.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grsec_sig.c +--- linux-2.6.32.15/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41621,9 +41636,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grs + return; +} + -diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/grsec_sock.c ---- linux-2.6.32.13/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_sock.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/grsec_sock.c +--- linux-2.6.32.15/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -41896,9 +41911,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/gr + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/grsec_sysctl.c ---- linux-2.6.32.13/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_sysctl.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/grsec_sysctl.c +--- linux-2.6.32.15/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_sysctl.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,447 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42347,9 +42362,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity/grsec_textrel.c ---- linux-2.6.32.13/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_textrel.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity/grsec_textrel.c +--- linux-2.6.32.15/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42367,9 +42382,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/grsec_time.c ---- linux-2.6.32.13/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_time.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/grsec_time.c +--- linux-2.6.32.15/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42384,9 +42399,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grsec_tpe.c ---- linux-2.6.32.13/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsec_tpe.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grsec_tpe.c +--- linux-2.6.32.15/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42426,9 +42441,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grs +#endif + return 1; +} -diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c ---- linux-2.6.32.13/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/grsum.c 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c +--- linux-2.6.32.15/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/grsum.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -42489,9 +42504,9 @@ diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig ---- linux-2.6.32.13/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/Kconfig 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig +--- linux-2.6.32.15/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/Kconfig 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,965 @@ +# +# grecurity configuration @@ -43458,9 +43473,9 @@ diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefile ---- linux-2.6.32.13/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/grsecurity/Makefile 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefile +--- linux-2.6.32.15/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -43491,9 +43506,9 @@ diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefi + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/acoutput.h ---- linux-2.6.32.13/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/acpi/acoutput.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/acoutput.h +--- linux-2.6.32.15/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 @@ -264,8 +264,8 @@ * leaving no executable debug code! */ @@ -43505,9 +43520,9 @@ diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/ #endif /* ACPI_DEBUG_OUTPUT */ -diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/acpi/acpi_drivers.h ---- linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/acpi/acpi_drivers.h +--- linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -43537,9 +43552,9 @@ diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/include/asm-generic/atomic-long.h ---- linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/include/asm-generic/atomic-long.h +--- linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -43760,9 +43775,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/inc +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32.13/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/dma-mapping-common.h linux-2.6.32.15/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -43871,9 +43886,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/asm-generic/futex.h ---- linux-2.6.32.13/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/futex.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/asm-generic/futex.h +--- linux-2.6.32.15/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -43892,9 +43907,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include/asm-generic/int-l64.h ---- linux-2.6.32.13/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/int-l64.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include/asm-generic/int-l64.h +--- linux-2.6.32.15/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -43904,9 +43919,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/include/asm-generic/int-ll64.h ---- linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/include/asm-generic/int-ll64.h +--- linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -43916,9 +43931,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/includ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/include/asm-generic/kmap_types.h ---- linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/include/asm-generic/kmap_types.h +--- linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -43929,9 +43944,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/incl }; #undef KMAP_D -diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include/asm-generic/pgtable.h ---- linux-2.6.32.13/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/pgtable.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include/asm-generic/pgtable.h +--- linux-2.6.32.15/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -43947,9 +43962,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -43988,9 +44003,9 @@ diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/inc /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/drm_pciids.h ---- linux-2.6.32.13/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.13/include/drm/drm_pciids.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/drm_pciids.h +--- linux-2.6.32.15/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.15/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 @@ -377,7 +377,7 @@ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -44094,9 +44109,9 @@ diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/ {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h ---- linux-2.6.32.13/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/drm/drmP.h 2010-05-15 13:21:17.910594530 -0400 +diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h +--- linux-2.6.32.15/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -44124,9 +44139,9 @@ diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a.out.h ---- linux-2.6.32.13/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/a.out.h 2010-05-15 13:21:17.914599996 -0400 +diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a.out.h +--- linux-2.6.32.15/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -44142,9 +44157,9 @@ diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/atmdev.h ---- linux-2.6.32.13/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/atmdev.h 2010-05-15 13:21:17.914599996 -0400 +diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/atmdev.h +--- linux-2.6.32.15/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -44154,9 +44169,9 @@ diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/linux/backlight.h ---- linux-2.6.32.13/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/backlight.h 2010-05-15 13:21:17.914599996 -0400 +diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/linux/backlight.h +--- linux-2.6.32.15/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -44198,9 +44213,9 @@ diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux/binfmts.h ---- linux-2.6.32.13/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/binfmts.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux/binfmts.h +--- linux-2.6.32.15/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -44209,9 +44224,9 @@ diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/blkdev.h ---- linux-2.6.32.13/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/blkdev.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/blkdev.h +--- linux-2.6.32.15/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -44243,9 +44258,9 @@ diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/ }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/cache.h ---- linux-2.6.32.13/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/cache.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/cache.h +--- linux-2.6.32.15/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -44257,9 +44272,9 @@ diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/linux/capability.h ---- linux-2.6.32.13/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/capability.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/linux/capability.h +--- linux-2.6.32.15/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -44268,9 +44283,9 @@ diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/li /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include/linux/compiler-gcc4.h ---- linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include/linux/compiler-gcc4.h +--- linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -44280,9 +44295,9 @@ diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linux/compiler.h ---- linux-2.6.32.13/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/compiler.h 2010-05-15 13:21:17.934614916 -0400 +diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linux/compiler.h +--- linux-2.6.32.15/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -44306,9 +44321,9 @@ diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linu /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include/linux/decompress/mm.h ---- linux-2.6.32.13/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 -+++ linux-2.6.32.13/include/linux/decompress/mm.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include/linux/decompress/mm.h +--- linux-2.6.32.15/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 ++++ linux-2.6.32.15/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -44318,9 +44333,9 @@ diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/linux/dma-mapping.h ---- linux-2.6.32.13/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/dma-mapping.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/linux/dma-mapping.h +--- linux-2.6.32.15/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -44387,9 +44402,9 @@ diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/l }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst.h ---- linux-2.6.32.13/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/dst.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst.h +--- linux-2.6.32.15/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -44399,9 +44414,9 @@ diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf.h ---- linux-2.6.32.13/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/elf.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf.h +--- linux-2.6.32.15/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -44474,9 +44489,9 @@ diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf #endif -diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h ---- linux-2.6.32.13/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.13/include/linux/fs.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h +--- linux-2.6.32.15/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.15/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -44638,9 +44653,9 @@ diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h }; /* -diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/linux/fs_struct.h ---- linux-2.6.32.13/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/fs_struct.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/linux/fs_struct.h +--- linux-2.6.32.15/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -44650,9 +44665,9 @@ diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/genhd.h ---- linux-2.6.32.13/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/genhd.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/genhd.h +--- linux-2.6.32.15/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -44662,9 +44677,9 @@ diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/g struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/gracl.h ---- linux-2.6.32.13/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/gracl.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/gracl.h +--- linux-2.6.32.15/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/gracl.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,309 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -44975,9 +44990,9 @@ diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/g + +#endif + -diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux/gralloc.h ---- linux-2.6.32.13/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/gralloc.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux/gralloc.h +--- linux-2.6.32.15/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -44988,9 +45003,9 @@ diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/grdefs.h ---- linux-2.6.32.13/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/grdefs.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/grdefs.h +--- linux-2.6.32.15/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -45128,9 +45143,9 @@ diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/ +}; + +#endif -diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/linux/grinternal.h ---- linux-2.6.32.13/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/grinternal.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/linux/grinternal.h +--- linux-2.6.32.15/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/grinternal.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,215 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -45347,9 +45362,9 @@ diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/li +#endif + +#endif -diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/grmsg.h ---- linux-2.6.32.13/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/grmsg.h 2010-05-15 13:21:17.938584561 -0400 +diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/grmsg.h +--- linux-2.6.32.15/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/grmsg.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,107 @@ +#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" @@ -45458,9 +45473,9 @@ diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/g +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " -diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/linux/grsecurity.h ---- linux-2.6.32.13/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/include/linux/grsecurity.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/linux/grsecurity.h +--- linux-2.6.32.15/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/include/linux/grsecurity.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,199 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -45661,9 +45676,9 @@ diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/li +#endif + +#endif -diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include/linux/hdpu_features.h ---- linux-2.6.32.13/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/hdpu_features.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include/linux/hdpu_features.h +--- linux-2.6.32.15/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -45673,9 +45688,9 @@ diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux/highmem.h ---- linux-2.6.32.13/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/highmem.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux/highmem.h +--- linux-2.6.32.15/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -45695,9 +45710,9 @@ diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/linux/init_task.h ---- linux-2.6.32.13/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/init_task.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/init_task.h linux-2.6.32.15/include/linux/init_task.h +--- linux-2.6.32.15/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 @@ -115,6 +115,13 @@ extern struct cred init_cred; # define INIT_PERF_EVENTS(tsk) #endif @@ -45720,9 +45735,9 @@ diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/lin } -diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/linux/interrupt.h ---- linux-2.6.32.13/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/interrupt.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/linux/interrupt.h +--- linux-2.6.32.15/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 @@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -45747,9 +45762,9 @@ diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/lin extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jbd2.h ---- linux-2.6.32.13/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/jbd2.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jbd2.h +--- linux-2.6.32.15/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -45759,9 +45774,9 @@ diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jb #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd.h ---- linux-2.6.32.13/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/jbd.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd.h +--- linux-2.6.32.15/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -45771,9 +45786,9 @@ diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linux/kallsyms.h ---- linux-2.6.32.13/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/kallsyms.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linux/kallsyms.h +--- linux-2.6.32.15/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 @@ -15,7 +15,8 @@ struct module; @@ -45794,9 +45809,9 @@ diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linu /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kgdb.h ---- linux-2.6.32.13/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/kgdb.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kgdb.h +--- linux-2.6.32.15/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -45827,9 +45842,9 @@ diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kg extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux/kobject.h ---- linux-2.6.32.13/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/kobject.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux/kobject.h +--- linux-2.6.32.15/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -45878,9 +45893,9 @@ diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linux/kvm_host.h ---- linux-2.6.32.13/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.13/include/linux/kvm_host.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linux/kvm_host.h +--- linux-2.6.32.15/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.15/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -45899,9 +45914,9 @@ diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linu void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/libata.h ---- linux-2.6.32.13/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/libata.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/libata.h +--- linux-2.6.32.15/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -45967,9 +45982,9 @@ diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/linux/lockd/bind.h ---- linux-2.6.32.13/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/lockd/bind.h 2010-05-15 13:21:17.942979526 -0400 +diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/linux/lockd/bind.h +--- linux-2.6.32.15/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -45987,21 +46002,25 @@ diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/li /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h ---- linux-2.6.32.13/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/mm.h 2010-05-15 13:21:17.946623351 -0400 -@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void - #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ - #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ +diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h +--- linux-2.6.32.15/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/mm.h 2010-05-31 11:15:44.592892079 -0400 +@@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void -+#ifdef CONFIG_PAX_PAGEEXEC -+#define VM_PAGEEXEC 0x80000000 /* vma->vm_page_prot needs special handling */ + #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ + #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ ++ ++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32) ++#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */ ++#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */ ++#else + #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */ +#endif + - #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ - #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS - #endif -@@ -880,6 +884,8 @@ struct shrinker { + #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ + #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ + +@@ -880,6 +887,8 @@ struct shrinker { extern void register_shrinker(struct shrinker *); extern void unregister_shrinker(struct shrinker *); @@ -46010,7 +46029,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); -@@ -1152,6 +1158,7 @@ out: +@@ -1152,6 +1161,7 @@ out: } extern int do_munmap(struct mm_struct *, unsigned long, size_t); @@ -46018,7 +46037,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h extern unsigned long do_brk(unsigned long, unsigned long); -@@ -1206,6 +1213,10 @@ extern struct vm_area_struct * find_vma( +@@ -1206,6 +1216,10 @@ extern struct vm_area_struct * find_vma( extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -46029,7 +46048,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1222,7 +1233,6 @@ static inline unsigned long vma_pages(st +@@ -1222,7 +1236,6 @@ static inline unsigned long vma_pages(st return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; } @@ -46037,7 +46056,7 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); -@@ -1320,7 +1330,13 @@ extern void memory_failure(unsigned long +@@ -1320,7 +1333,13 @@ extern void memory_failure(unsigned long extern int __memory_failure(unsigned long pfn, int trapno, int ref); extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; @@ -46052,9 +46071,9 @@ diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linux/mm_types.h ---- linux-2.6.32.13/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/mm_types.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linux/mm_types.h +--- linux-2.6.32.15/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -46089,9 +46108,9 @@ diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linu }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/linux/mmu_notifier.h ---- linux-2.6.32.13/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/mmu_notifier.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/linux/mmu_notifier.h +--- linux-2.6.32.15/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -46108,9 +46127,9 @@ diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/ }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/include/linux/mod_devicetable.h ---- linux-2.6.32.13/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/mod_devicetable.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/include/linux/mod_devicetable.h +--- linux-2.6.32.15/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -46129,9 +46148,9 @@ diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/inclu struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/module.h ---- linux-2.6.32.13/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400 -+++ linux-2.6.32.13/include/linux/module.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/module.h +--- linux-2.6.32.15/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -46204,9 +46223,9 @@ diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/ } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/linux/moduleloader.h ---- linux-2.6.32.13/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/moduleloader.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/linux/moduleloader.h +--- linux-2.6.32.15/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -46229,9 +46248,9 @@ diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/namei.h ---- linux-2.6.32.13/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/namei.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/namei.h +--- linux-2.6.32.15/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -46256,9 +46275,9 @@ diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/n { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linux/nodemask.h ---- linux-2.6.32.13/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/nodemask.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linux/nodemask.h +--- linux-2.6.32.15/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -46275,9 +46294,9 @@ diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linu }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linux/oprofile.h ---- linux-2.6.32.13/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/oprofile.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linux/oprofile.h +--- linux-2.6.32.15/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -46290,9 +46309,9 @@ diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linu /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/linux/pipe_fs_i.h ---- linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/linux/pipe_fs_i.h +--- linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -46306,9 +46325,9 @@ diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/lin unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/poison.h ---- linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 -+++ linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:23:00.179313143 -0400 +diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/poison.h +--- linux-2.6.32.15/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 ++++ linux-2.6.32.15/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -46320,9 +46339,9 @@ diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/ /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux/proc_fs.h ---- linux-2.6.32.13/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/proc_fs.h 2010-05-15 13:21:17.946623351 -0400 +diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux/proc_fs.h +--- linux-2.6.32.15/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -46343,9 +46362,9 @@ diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/random.h ---- linux-2.6.32.13/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/random.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/random.h +--- linux-2.6.32.15/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -46358,9 +46377,9 @@ diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/ #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/linux/reiserfs_fs.h ---- linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/linux/reiserfs_fs.h +--- linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -46407,9 +46426,9 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/l #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -46419,9 +46438,9 @@ diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/includ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/sched.h ---- linux-2.6.32.13/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/sched.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/sched.h +--- linux-2.6.32.15/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -46529,8 +46548,8 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored adress in ret_stack */ int curr_ret_stack; -@@ -1544,6 +1569,52 @@ struct task_struct { - unsigned long stack_start; +@@ -1543,6 +1568,52 @@ struct task_struct { + #endif /* CONFIG_TRACING */ }; +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */ @@ -46582,7 +46601,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -2143,7 +2214,7 @@ extern void __cleanup_sighand(struct sig +@@ -2142,7 +2213,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -46591,7 +46610,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2245,6 +2316,33 @@ static inline void task_unlock(struct ta +@@ -2244,6 +2315,33 @@ static inline void task_unlock(struct ta spin_unlock(&p->alloc_lock); } @@ -46625,7 +46644,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags); -@@ -2256,8 +2354,8 @@ static inline void unlock_task_sighand(s +@@ -2255,8 +2353,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -46636,7 +46655,7 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -@@ -2272,13 +2370,31 @@ static inline unsigned long *end_of_stac +@@ -2271,13 +2369,31 @@ static inline unsigned long *end_of_stac #endif @@ -46670,9 +46689,9 @@ diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/s extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/linux/screen_info.h ---- linux-2.6.32.13/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/screen_info.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/linux/screen_info.h +--- linux-2.6.32.15/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -46683,9 +46702,9 @@ diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/l } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linux/security.h ---- linux-2.6.32.13/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/security.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linux/security.h +--- linux-2.6.32.15/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -46694,9 +46713,9 @@ diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linu #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm.h ---- linux-2.6.32.13/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/shm.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm.h +--- linux-2.6.32.15/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -46708,9 +46727,9 @@ diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/slab.h ---- linux-2.6.32.13/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/slab.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/slab.h +--- linux-2.6.32.15/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -46782,9 +46801,9 @@ diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/sl +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linux/slub_def.h ---- linux-2.6.32.13/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/slub_def.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linux/slub_def.h +--- linux-2.6.32.15/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -46794,9 +46813,9 @@ diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linu void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/sonet.h ---- linux-2.6.32.13/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/sonet.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/sonet.h +--- linux-2.6.32.15/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -46806,9 +46825,9 @@ diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux/suspend.h ---- linux-2.6.32.13/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/suspend.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux/suspend.h +--- linux-2.6.32.15/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -46897,9 +46916,9 @@ diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/sysctl.h ---- linux-2.6.32.13/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/sysctl.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/sysctl.h +--- linux-2.6.32.15/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -46913,9 +46932,9 @@ diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/ /* CTL_VM names: */ enum -diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/sysfs.h ---- linux-2.6.32.13/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/sysfs.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/sysfs.h +--- linux-2.6.32.15/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -46927,9 +46946,9 @@ diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/s }; struct sysfs_dirent; -diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/linux/thread_info.h ---- linux-2.6.32.13/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/thread_info.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/linux/thread_info.h +--- linux-2.6.32.15/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -46939,9 +46958,9 @@ diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/l u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty.h ---- linux-2.6.32.13/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.13/include/linux/tty.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty.h +--- linux-2.6.32.15/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.15/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -46977,9 +46996,9 @@ diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/linux/tty_ldisc.h ---- linux-2.6.32.13/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/tty_ldisc.h 2010-05-15 13:21:17.950606770 -0400 +diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/linux/tty_ldisc.h +--- linux-2.6.32.15/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -46989,9 +47008,9 @@ diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/lin }; struct tty_ldisc { -diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/types.h ---- linux-2.6.32.13/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/types.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/types.h +--- linux-2.6.32.15/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -47019,9 +47038,9 @@ diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/t #endif struct ustat { -diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux/uaccess.h ---- linux-2.6.32.13/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/uaccess.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux/uaccess.h +--- linux-2.6.32.15/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -47053,9 +47072,9 @@ diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux/vmalloc.h ---- linux-2.6.32.13/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/linux/vmalloc.h 2010-05-15 13:23:38.934774262 -0400 +diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux/vmalloc.h +--- linux-2.6.32.15/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 @@ -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 */ @@ -47150,9 +47169,9 @@ diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include/net/irda/ircomm_tty.h ---- linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include/net/irda/ircomm_tty.h +--- linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -47164,9 +47183,9 @@ diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/neighbour.h ---- linux-2.6.32.13/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/net/neighbour.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/neighbour.h +--- linux-2.6.32.15/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -47186,9 +47205,9 @@ diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/n }; struct pneigh_entry -diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/sctp/sctp.h ---- linux-2.6.32.13/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/net/sctp/sctp.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/sctp/sctp.h +--- linux-2.6.32.15/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -47200,9 +47219,9 @@ diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/s #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h ---- linux-2.6.32.13/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/net/tcp.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h +--- linux-2.6.32.15/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 @@ -1420,6 +1420,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -47211,9 +47230,9 @@ diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h ---- linux-2.6.32.13/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/net/udp.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h +--- linux-2.6.32.15/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -47222,9 +47241,9 @@ diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/sound/ac97_codec.h ---- linux-2.6.32.13/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/sound/ac97_codec.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/sound/ac97_codec.h +--- linux-2.6.32.15/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -47257,9 +47276,9 @@ diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/trace/events/irq.h ---- linux-2.6.32.13/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/trace/events/irq.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/trace/events/irq.h +--- linux-2.6.32.15/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -47296,9 +47315,9 @@ diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/tr TP_ARGS(h, vec), -diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video/uvesafb.h ---- linux-2.6.32.13/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/include/video/uvesafb.h 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video/uvesafb.h +--- linux-2.6.32.15/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -47307,9 +47326,9 @@ diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c ---- linux-2.6.32.13/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/do_mounts.c 2010-05-15 13:21:17.956129899 -0400 +diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c +--- linux-2.6.32.15/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -47355,9 +47374,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h ---- linux-2.6.32.13/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/do_mounts.h 2010-05-15 13:21:18.018620095 -0400 +diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h +--- linux-2.6.32.15/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -47377,9 +47396,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mounts_initrd.c ---- linux-2.6.32.13/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/do_mounts_initrd.c 2010-05-15 13:21:18.018620095 -0400 +diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mounts_initrd.c +--- linux-2.6.32.15/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -47463,9 +47482,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mount + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md.c ---- linux-2.6.32.13/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/do_mounts_md.c 2010-05-15 13:21:18.018620095 -0400 +diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md.c +--- linux-2.6.32.15/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -47493,9 +47512,9 @@ diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c ---- linux-2.6.32.13/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 -+++ linux-2.6.32.13/init/initramfs.c 2010-05-15 13:21:18.018620095 -0400 +diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c +--- linux-2.6.32.15/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 ++++ linux-2.6.32.15/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -47604,9 +47623,9 @@ diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig ---- linux-2.6.32.13/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/Kconfig 2010-05-15 13:21:18.034611512 -0400 +diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig +--- linux-2.6.32.15/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -47616,21 +47635,9 @@ diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -@@ -1116,9 +1116,9 @@ config HAVE_GENERIC_DMA_COHERENT - - config SLABINFO - bool -- depends on PROC_FS -+ depends on PROC_FS && !GRKERNSEC_PROC_ADD - depends on SLAB || SLUB_DEBUG -- default y -+ default n - - config RT_MUTEXES - boolean -diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c ---- linux-2.6.32.13/init/main.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.13/init/main.c 2010-05-15 13:21:18.034611512 -0400 +diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c +--- linux-2.6.32.15/init/main.c 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.15/init/main.c 2010-05-28 21:27:16.427051097 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -47775,9 +47782,9 @@ diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c ---- linux-2.6.32.13/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/init/noinitramfs.c 2010-05-15 13:21:18.034611512 -0400 +diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c +--- linux-2.6.32.15/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -47796,9 +47803,9 @@ diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c ---- linux-2.6.32.13/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/ipc/ipc_sysctl.c 2010-05-15 13:21:18.060013842 -0400 +diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c +--- linux-2.6.32.15/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -47817,9 +47824,9 @@ diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c ---- linux-2.6.32.13/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.13/ipc/mqueue.c 2010-05-15 13:21:18.060013842 -0400 +diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c +--- linux-2.6.32.15/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.15/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -47828,9 +47835,9 @@ diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c ---- linux-2.6.32.13/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/ipc/shm.c 2010-05-15 13:21:18.060013842 -0400 +diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c +--- linux-2.6.32.15/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -47883,9 +47890,9 @@ diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c ---- linux-2.6.32.13/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/acct.c 2010-05-15 13:21:18.060013842 -0400 +diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c +--- linux-2.6.32.15/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -47895,9 +47902,9 @@ diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability.c ---- linux-2.6.32.13/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/capability.c 2010-05-15 13:21:18.079122751 -0400 +diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability.c +--- linux-2.6.32.15/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -47921,9 +47928,9 @@ diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c ---- linux-2.6.32.13/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/configs.c 2010-05-15 13:21:18.079122751 -0400 +diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c +--- linux-2.6.32.15/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -47944,9 +47951,9 @@ diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c ---- linux-2.6.32.13/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/cpu.c 2010-05-15 13:21:18.079122751 -0400 +diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c +--- linux-2.6.32.15/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -47956,9 +47963,9 @@ diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c ---- linux-2.6.32.13/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 -+++ linux-2.6.32.13/kernel/cred.c 2010-05-15 13:21:18.079122751 -0400 +diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c +--- linux-2.6.32.15/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 ++++ linux-2.6.32.15/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -47968,9 +47975,9 @@ diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c ---- linux-2.6.32.13/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/exit.c 2010-05-15 13:21:18.103069718 -0400 +diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c +--- linux-2.6.32.15/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -48060,9 +48067,9 @@ diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c ---- linux-2.6.32.13/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/fork.c 2010-05-15 13:21:18.103069718 -0400 +diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c +--- linux-2.6.32.15/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -48159,7 +48166,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c init_sigpending(&p->pending); p->utime = cputime_zero; -@@ -1179,6 +1212,8 @@ static struct task_struct *copy_process( +@@ -1177,6 +1210,8 @@ static struct task_struct *copy_process( goto bad_fork_free_pid; } @@ -48168,7 +48175,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1344,6 +1379,8 @@ bad_fork_cleanup_count: +@@ -1342,6 +1377,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -48177,7 +48184,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c return ERR_PTR(retval); } -@@ -1437,6 +1474,8 @@ long do_fork(unsigned long clone_flags, +@@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -48186,7 +48193,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1569,7 +1608,7 @@ static int unshare_fs(unsigned long unsh +@@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -48195,7 +48202,7 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1689,14 +1728,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, task_lock(current); if (new_fs) { @@ -48215,9 +48222,9 @@ diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c } if (new_mm) { -diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c ---- linux-2.6.32.13/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/futex.c 2010-05-15 13:21:18.106616956 -0400 +diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c +--- linux-2.6.32.15/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -48285,9 +48292,9 @@ diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_compat.c ---- linux-2.6.32.13/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/futex_compat.c 2010-05-15 13:21:18.106616956 -0400 +diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_compat.c +--- linux-2.6.32.15/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -48325,9 +48332,9 @@ diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_co head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c ---- linux-2.6.32.13/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/gcov/base.c 2010-05-15 13:21:18.106616956 -0400 +diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c +--- linux-2.6.32.15/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -48349,9 +48356,9 @@ diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c ---- linux-2.6.32.13/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 -+++ linux-2.6.32.13/kernel/hrtimer.c 2010-05-15 13:21:18.118636223 -0400 +diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c +--- linux-2.6.32.15/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 ++++ linux-2.6.32.15/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -48361,9 +48368,9 @@ diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c ---- linux-2.6.32.13/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/kallsyms.c 2010-05-15 13:21:18.118636223 -0400 +diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c +--- linux-2.6.32.15/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -48440,9 +48447,9 @@ diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c ---- linux-2.6.32.13/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/kgdb.c 2010-05-15 13:21:18.118636223 -0400 +diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c +--- linux-2.6.32.15/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -48470,9 +48477,9 @@ diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c ---- linux-2.6.32.13/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/kmod.c 2010-05-15 13:21:18.118636223 -0400 +diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c +--- linux-2.6.32.15/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -48492,9 +48499,9 @@ diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c ---- linux-2.6.32.13/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/kprobes.c 2010-05-15 13:21:18.118636223 -0400 +diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c +--- linux-2.6.32.15/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -48531,9 +48538,9 @@ diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c ---- linux-2.6.32.13/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400 -+++ linux-2.6.32.13/kernel/lockdep.c 2010-05-15 13:21:18.122615093 -0400 +diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c +--- linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:02:53.017540947 -0400 ++++ linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:06:14.633871339 -0400 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -48548,9 +48555,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c @@ -592,8 +596,7 @@ static int static_obj(void *obj) */ for_each_possible_cpu(i) { - start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i); -- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i) -- + PERCPU_ENOUGH_ROOM; + start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); +- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM +- + per_cpu_offset(i); + end = start + PERCPU_ENOUGH_ROOM; if ((addr >= start) && (addr < end)) @@ -48563,9 +48570,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_proc.c ---- linux-2.6.32.13/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/lockdep_proc.c 2010-05-15 13:21:18.122615093 -0400 +diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_proc.c +--- linux-2.6.32.15/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 @@ -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) @@ -48575,9 +48582,9 @@ diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_ const char *name = class->name; if (!name) { -diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c ---- linux-2.6.32.13/kernel/module.c 2010-04-29 17:49:38.586002480 -0400 -+++ linux-2.6.32.13/kernel/module.c 2010-05-15 13:21:18.134612708 -0400 +diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c +--- linux-2.6.32.15/kernel/module.c 2010-06-01 15:02:53.053672396 -0400 ++++ linux-2.6.32.15/kernel/module.c 2010-06-01 15:03:15.410128488 -0400 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -49117,9 +49124,9 @@ diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c ---- linux-2.6.32.13/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/panic.c 2010-05-15 13:21:18.146612793 -0400 +diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c +--- linux-2.6.32.15/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) @@ -49130,9 +49137,9 @@ diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c ---- linux-2.6.32.13/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/params.c 2010-05-15 13:21:18.146612793 -0400 +diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c +--- linux-2.6.32.15/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -49151,9 +49158,9 @@ diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c ---- linux-2.6.32.13/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/pid.c 2010-05-15 13:21:18.154611186 -0400 +diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c +--- linux-2.6.32.15/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -49187,9 +49194,9 @@ diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posix-cpu-timers.c ---- linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posix-cpu-timers.c +--- linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -49214,9 +49221,9 @@ diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posi if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { /* * At the soft limit, send a SIGXCPU every second. -diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power/hibernate.c ---- linux-2.6.32.13/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/power/hibernate.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power/hibernate.c +--- linux-2.6.32.15/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -49234,9 +49241,9 @@ diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/poweroff.c ---- linux-2.6.32.13/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/power/poweroff.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/poweroff.c +--- linux-2.6.32.15/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -49246,9 +49253,9 @@ diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/process.c ---- linux-2.6.32.13/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 -+++ linux-2.6.32.13/kernel/power/process.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/process.c +--- linux-2.6.32.15/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 ++++ linux-2.6.32.15/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -49288,9 +49295,9 @@ diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/p do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/suspend.c ---- linux-2.6.32.13/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/power/suspend.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/suspend.c +--- linux-2.6.32.15/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -49307,9 +49314,9 @@ diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c ---- linux-2.6.32.13/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/printk.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c +--- linux-2.6.32.15/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -49322,9 +49329,9 @@ diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c ---- linux-2.6.32.13/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/ptrace.c 2010-05-15 13:21:18.158615271 -0400 +diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c +--- linux-2.6.32.15/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -49406,9 +49413,9 @@ diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c ---- linux-2.6.32.13/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/rcutree.c 2010-05-15 13:21:18.162587722 -0400 +diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c +--- linux-2.6.32.15/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -49418,9 +49425,9 @@ diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c ---- linux-2.6.32.13/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/relay.c 2010-05-15 13:21:18.162587722 -0400 +diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c +--- linux-2.6.32.15/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -49430,9 +49437,9 @@ diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c ---- linux-2.6.32.13/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/resource.c 2010-05-15 13:21:18.162587722 -0400 +diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c +--- linux-2.6.32.15/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -49452,9 +49459,9 @@ diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c ---- linux-2.6.32.13/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 -+++ linux-2.6.32.13/kernel/sched.c 2010-05-15 13:21:18.180350069 -0400 +diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c +--- linux-2.6.32.15/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 ++++ linux-2.6.32.15/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 @@ -4841,7 +4841,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * rebalancing for all the cpus for whom scheduler ticks are stopped. @@ -49510,9 +49517,9 @@ diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c ---- linux-2.6.32.13/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/signal.c 2010-05-15 13:21:18.180350069 -0400 +diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c +--- linux-2.6.32.15/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 @@ -41,12 +41,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -49598,9 +49605,9 @@ diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c return ret; } -diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c ---- linux-2.6.32.13/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/smp.c 2010-05-15 13:21:18.180350069 -0400 +diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c +--- linux-2.6.32.15/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -49628,9 +49635,9 @@ diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c ---- linux-2.6.32.13/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/softirq.c 2010-05-15 13:21:18.186622968 -0400 +diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c +--- linux-2.6.32.15/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -49685,9 +49692,9 @@ diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c ---- linux-2.6.32.13/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/sys.c 2010-05-15 13:21:18.223438230 -0400 +diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c +--- linux-2.6.32.15/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -49823,9 +49830,9 @@ diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c ---- linux-2.6.32.13/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/sysctl.c 2010-05-15 13:21:18.258852946 -0400 +diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c +--- linux-2.6.32.15/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -49947,9 +49954,9 @@ diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c ---- linux-2.6.32.13/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/taskstats.c 2010-05-15 13:21:18.258852946 -0400 +diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c +--- linux-2.6.32.15/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -49973,9 +49980,9 @@ diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/time/tick-broadcast.c ---- linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-05-15 13:21:18.258852946 -0400 +diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/time/tick-broadcast.c +--- linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -49985,9 +49992,9 @@ diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/t cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c ---- linux-2.6.32.13/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/time.c 2010-05-15 13:21:18.262613670 -0400 +diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c +--- linux-2.6.32.15/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -50025,9 +50032,9 @@ diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c ---- linux-2.6.32.13/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/timer.c 2010-05-15 13:21:18.262613670 -0400 +diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c +--- linux-2.6.32.15/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -50037,9 +50044,9 @@ diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c { struct tvec_base *base = __get_cpu_var(tvec_bases); -diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ftrace.c ---- linux-2.6.32.13/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 -+++ linux-2.6.32.13/kernel/trace/ftrace.c 2010-05-15 13:21:18.274619950 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ftrace.c +--- linux-2.6.32.15/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 ++++ linux-2.6.32.15/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -50061,9 +50068,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ft } /* -diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kconfig ---- linux-2.6.32.13/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/trace/Kconfig 2010-05-15 13:21:18.278715003 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kconfig +--- linux-2.6.32.15/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 @@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" @@ -50080,9 +50087,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kco select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/trace/ring_buffer.c ---- linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-05-15 13:21:18.278715003 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/trace/ring_buffer.c +--- linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * its flags will be non zero. @@ -50092,9 +50099,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/tra rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/trace.c ---- linux-2.6.32.13/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.13/kernel/trace/trace.c 2010-05-15 13:21:18.278715003 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/trace.c +--- linux-2.6.32.15/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.15/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 @@ -3808,10 +3808,9 @@ static const struct file_operations trac }; #endif @@ -50119,9 +50126,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/tra static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/trace/trace_events.c ---- linux-2.6.32.13/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/trace/trace_events.c 2010-05-15 13:21:18.282652483 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/trace/trace_events.c +--- linux-2.6.32.15/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -50131,9 +50138,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/tr struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/trace/trace_output.c ---- linux-2.6.32.13/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/trace/trace_output.c 2010-05-15 13:21:18.282652483 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/trace/trace_output.c +--- linux-2.6.32.15/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, return 0; p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -50143,9 +50150,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/tr if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/trace/trace_stack.c ---- linux-2.6.32.13/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/trace/trace_stack.c 2010-05-15 13:21:18.282652483 -0400 +diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/trace/trace_stack.c +--- linux-2.6.32.15/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -50155,9 +50162,9 @@ diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/tra return; local_irq_save(flags); -diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsname_sysctl.c ---- linux-2.6.32.13/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/kernel/utsname_sysctl.c 2010-05-15 13:21:18.282652483 -0400 +diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsname_sysctl.c +--- linux-2.6.32.15/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -50176,9 +50183,9 @@ diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsnam }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c ---- linux-2.6.32.13/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/bug.c 2010-05-15 13:21:18.282652483 -0400 +diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c +--- linux-2.6.32.15/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -50188,9 +50195,9 @@ diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c ---- linux-2.6.32.13/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/debugobjects.c 2010-05-15 13:21:18.298622839 -0400 +diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c +--- linux-2.6.32.15/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -50200,9 +50207,9 @@ diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c ---- linux-2.6.32.13/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/dma-debug.c 2010-05-15 13:21:18.322629085 -0400 +diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c +--- linux-2.6.32.15/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -50212,9 +50219,9 @@ diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c ---- linux-2.6.32.13/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/idr.c 2010-05-15 13:21:18.327545957 -0400 +diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c +--- linux-2.6.32.15/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -50224,9 +50231,9 @@ diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c *starting_id = id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c ---- linux-2.6.32.13/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/inflate.c 2010-05-15 13:21:18.327545957 -0400 +diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c +--- linux-2.6.32.15/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -50236,9 +50243,9 @@ diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug ---- linux-2.6.32.13/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/Kconfig.debug 2010-05-15 13:21:18.339667096 -0400 +diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug +--- linux-2.6.32.15/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -50248,9 +50255,9 @@ diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c ---- linux-2.6.32.13/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/kobject.c 2010-05-15 13:21:18.355221413 -0400 +diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c +--- linux-2.6.32.15/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -50278,9 +50285,9 @@ diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_uevent.c ---- linux-2.6.32.13/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/kobject_uevent.c 2010-05-15 13:21:18.355221413 -0400 +diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_uevent.c +--- linux-2.6.32.15/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -50290,9 +50297,9 @@ diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_ueve u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c ---- linux-2.6.32.13/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/parser.c 2010-05-15 13:21:18.358625413 -0400 +diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c +--- linux-2.6.32.15/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -50302,9 +50309,9 @@ diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c ---- linux-2.6.32.13/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/radix-tree.c 2010-05-15 13:21:18.366643034 -0400 +diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c +--- linux-2.6.32.15/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -50314,9 +50321,9 @@ diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c ---- linux-2.6.32.13/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/lib/random32.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c +--- linux-2.6.32.15/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -50326,14 +50333,14 @@ diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c } /** -diff -urNp linux-2.6.32.13/localversion-grsec linux-2.6.32.13/localversion-grsec ---- linux-2.6.32.13/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.13/localversion-grsec 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/localversion-grsec linux-2.6.32.15/localversion-grsec +--- linux-2.6.32.15/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.15/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile ---- linux-2.6.32.13/Makefile 2010-05-15 13:20:18.396226636 -0400 -+++ linux-2.6.32.13/Makefile 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile +--- linux-2.6.32.15/Makefile 2010-06-01 15:02:53.005442437 -0400 ++++ linux-2.6.32.15/Makefile 2010-06-01 15:03:15.405630699 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -50354,9 +50361,9 @@ diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c ---- linux-2.6.32.13/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/filemap.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c +--- linux-2.6.32.15/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -50374,9 +50381,9 @@ diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c ---- linux-2.6.32.13/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/fremap.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c +--- linux-2.6.32.15/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -50389,9 +50396,9 @@ diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c ---- linux-2.6.32.13/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/highmem.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c +--- linux-2.6.32.15/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -50417,9 +50424,9 @@ diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c ---- linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:20:19.411414284 -0400 -+++ linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c +--- linux-2.6.32.15/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -50499,9 +50506,9 @@ diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig ---- linux-2.6.32.13/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/Kconfig 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig +--- linux-2.6.32.15/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -50511,9 +50518,9 @@ diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c ---- linux-2.6.32.13/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/maccess.c 2010-05-15 13:21:18.370623064 -0400 +diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c +--- linux-2.6.32.15/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -50532,9 +50539,9 @@ diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c ---- linux-2.6.32.13/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/madvise.c 2010-05-15 13:21:18.378626814 -0400 +diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c +--- linux-2.6.32.15/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -50611,9 +50618,9 @@ diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c ---- linux-2.6.32.13/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/memory.c 2010-05-15 13:21:18.394625565 -0400 +diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c +--- linux-2.6.32.15/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/memory.c 2010-05-28 21:27:16.487251224 -0400 @@ -48,6 +48,7 @@ #include <linux/ksm.h> #include <linux/rmap.h> @@ -51018,9 +51025,9 @@ diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure.c ---- linux-2.6.32.13/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/memory-failure.c 2010-05-15 13:21:18.394625565 -0400 +diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure.c +--- linux-2.6.32.15/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -51039,9 +51046,9 @@ diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c ---- linux-2.6.32.13/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.13/mm/mempolicy.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c +--- linux-2.6.32.15/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.15/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -51122,9 +51129,9 @@ diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c ---- linux-2.6.32.13/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/migrate.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c +--- linux-2.6.32.15/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -51150,9 +51157,9 @@ diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c ---- linux-2.6.32.13/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/mlock.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c +--- linux-2.6.32.15/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -51221,9 +51228,9 @@ diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c ---- linux-2.6.32.13/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/mmap.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c +--- linux-2.6.32.15/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -52312,9 +52319,9 @@ diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c ---- linux-2.6.32.13/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/mprotect.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c +--- linux-2.6.32.15/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -52435,9 +52442,16 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c /* * First try to merge with previous and/or next vma. */ -@@ -196,8 +284,14 @@ success: +@@ -195,9 +283,21 @@ success: + * vm_flags and vm_page_prot are protected by the mmap_sem * held in write mode. */ ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ)) ++ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ; ++#endif ++ vma->vm_flags = newflags; + +#ifdef CONFIG_PAX_MPROTECT @@ -52451,7 +52465,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c if (vma_wants_writenotify(vma)) { vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); -@@ -238,6 +332,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -238,6 +338,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, end = start + len; if (end <= start) return -ENOMEM; @@ -52469,7 +52483,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c if (!arch_validate_prot(prot)) return -EINVAL; -@@ -245,7 +350,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -245,7 +356,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, /* * Does the application expect PROT_READ to imply PROT_EXEC: */ @@ -52478,7 +52492,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot); -@@ -277,6 +382,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -277,6 +388,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (start > vma->vm_start) prev = vma; @@ -52495,7 +52509,7 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c for (nstart = start ; ; ) { unsigned long newflags; -@@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -301,6 +422,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (error) goto out; perf_event_mmap(vma); @@ -52505,9 +52519,9 @@ diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c ---- linux-2.6.32.13/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/mremap.c 2010-05-15 13:21:18.411130134 -0400 +diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c +--- linux-2.6.32.15/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -52608,9 +52622,9 @@ diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c ---- linux-2.6.32.13/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/nommu.c 2010-05-15 13:21:18.414629737 -0400 +diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c +--- linux-2.6.32.15/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -52627,9 +52641,9 @@ diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c ---- linux-2.6.32.13/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/page_alloc.c 2010-05-15 13:21:18.414629737 -0400 +diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c +--- linux-2.6.32.15/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page int bad = 0; int wasMlocked = __TestClearPageMlocked(page); @@ -52686,9 +52700,9 @@ diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c struct zone *zone, unsigned long zonesize) {} #endif /* CONFIG_SPARSEMEM */ -diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c ---- linux-2.6.32.13/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/percpu.c 2010-05-15 13:21:18.450640661 -0400 +diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c +--- linux-2.6.32.15/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -52698,9 +52712,9 @@ diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c ---- linux-2.6.32.13/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/rmap.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c +--- linux-2.6.32.15/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -52712,7 +52726,7 @@ diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c anon_vma = find_mergeable_anon_vma(vma); allocated = NULL; if (!anon_vma) { -@@ -121,6 +125,15 @@ int anon_vma_prepare(struct vm_area_stru +@@ -121,6 +125,16 @@ int anon_vma_prepare(struct vm_area_stru /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); if (likely(!vma->anon_vma)) { @@ -52720,17 +52734,18 @@ diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c +#ifdef CONFIG_PAX_SEGMEXEC + vma_m = pax_find_mirror_vma(vma); + if (vma_m) { ++ BUG_ON(vma_m->anon_vma); + vma_m->anon_vma = anon_vma; -+ __anon_vma_link(vma_m); ++ list_add_tail(&vma_m->anon_vma_node, &anon_vma->head); + } +#endif + vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c ---- linux-2.6.32.13/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/shmem.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c +--- linux-2.6.32.15/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -52740,9 +52755,9 @@ diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c ---- linux-2.6.32.13/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/slab.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c +--- linux-2.6.32.15/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/slab.c 2010-05-31 11:16:00.657200601 -0400 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -52779,16 +52794,24 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c /* internal cache of cache description objs */ static struct kmem_cache cache_cache = { -@@ -4082,7 +4082,7 @@ out: - schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); - } - --#ifdef CONFIG_SLABINFO -+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) +@@ -4471,15 +4471,66 @@ static const struct file_operations proc - static void print_slabinfo_header(struct seq_file *m) + static int __init slab_proc_init(void) { -@@ -4480,6 +4480,51 @@ static int __init slab_proc_init(void) +- proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); ++ mode_t gr_mode = S_IRUGO; ++ ++#ifdef CONFIG_GRKERNSEC_PROC_ADD ++ gr_mode = S_IRUSR; ++#endif ++ ++ proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations); + #ifdef CONFIG_DEBUG_SLAB_LEAK +- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); ++ proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations); + #endif + return 0; + } module_init(slab_proc_init); #endif @@ -52840,9 +52863,9 @@ diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c ---- linux-2.6.32.13/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/slob.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c +--- linux-2.6.32.15/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/slob.c 2010-05-31 11:16:35.308884479 -0400 @@ -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 @@ -53163,9 +53186,9 @@ diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c ---- linux-2.6.32.13/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/slub.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c +--- linux-2.6.32.15/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/slub.c 2010-05-31 11:16:21.137686742 -0400 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * page = virt_to_head_page(x); @@ -53313,18 +53336,24 @@ diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c .filter = uevent_filter, }; -@@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init); - /* - * The /proc/slabinfo ABI - */ --#ifdef CONFIG_SLABINFO -+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) - static void print_slabinfo_header(struct seq_file *m) - { - seq_puts(m, "slabinfo - version: 2.1\n"); -diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c ---- linux-2.6.32.13/mm/util.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/util.c 2010-05-15 13:21:18.454622314 -0400 +@@ -4785,7 +4826,13 @@ static const struct file_operations proc + + static int __init slab_proc_init(void) + { +- proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations); ++ mode_t gr_mode = S_IRUGO; ++ ++#ifdef CONFIG_GRKERNSEC_PROC_ADD ++ gr_mode = S_IRUSR; ++#endif ++ ++ proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations); + return 0; + } + module_init(slab_proc_init); +diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c +--- linux-2.6.32.15/mm/util.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/util.c 2010-05-28 21:27:16.563017088 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -53338,9 +53367,9 @@ diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c ---- linux-2.6.32.13/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/mm/vmalloc.c 2010-05-15 13:23:38.946686210 -0400 +diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c +--- linux-2.6.32.15/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -53551,9 +53580,9 @@ diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c ---- linux-2.6.32.13/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/8021q/vlan.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c +--- linux-2.6.32.15/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -53564,9 +53593,9 @@ diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c ---- linux-2.6.32.13/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/atm/atm_misc.c 2010-05-15 13:21:18.454622314 -0400 +diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c +--- linux-2.6.32.15/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -53603,9 +53632,9 @@ diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c ---- linux-2.6.32.13/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/atm/proc.c 2010-05-15 13:21:18.466625554 -0400 +diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c +--- linux-2.6.32.15/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -53619,9 +53648,9 @@ diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources.c ---- linux-2.6.32.13/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/atm/resources.c 2010-05-15 13:21:18.466625554 -0400 +diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources.c +--- linux-2.6.32.15/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -53640,9 +53669,9 @@ diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br_private.h ---- linux-2.6.32.13/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/bridge/br_private.h 2010-05-15 13:21:18.499638693 -0400 +diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br_private.h +--- linux-2.6.32.15/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -53652,9 +53681,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_stp_if.c ---- linux-2.6.32.13/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/bridge/br_stp_if.c 2010-05-15 13:21:18.499638693 -0400 +diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_stp_if.c +--- linux-2.6.32.15/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -53664,9 +53693,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/br_sysfs_if.c ---- linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-05-15 13:21:18.499638693 -0400 +diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/br_sysfs_if.c +--- linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -53676,9 +53705,9 @@ diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/b .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c ---- linux-2.6.32.13/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/core/dev.c 2010-05-15 13:21:18.499638693 -0400 +diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c +--- linux-2.6.32.15/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -53697,9 +53726,9 @@ diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c { struct list_head *list = &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c ---- linux-2.6.32.13/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/core/flow.c 2010-05-15 13:21:18.499638693 -0400 +diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c +--- linux-2.6.32.15/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -53727,9 +53756,9 @@ diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids/ccid3.c ---- linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids/ccid3.c +--- linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 @@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -53739,9 +53768,9 @@ diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids #endif /* -diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h ---- linux-2.6.32.13/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/dccp/dccp.h 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h +--- linux-2.6.32.15/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) @@ -53755,9 +53784,9 @@ diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -53776,9 +53805,9 @@ diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/de return -EFAULT; *lenp = len; -diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/inet_hashtables.c ---- linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/inet_hashtables.c +--- linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -53803,9 +53832,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -53815,9 +53844,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1 if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -53862,9 +53891,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4 tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -53887,9 +53916,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_probe.c ---- linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_probe.c +--- linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -53899,9 +53928,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_pro return -EFAULT; cnt += width; } -diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_timer.c ---- linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_timer.c +--- linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 @@ -21,6 +21,10 @@ #include <linux/module.h> #include <net/tcp.h> @@ -53927,9 +53956,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_tim if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c ---- linux-2.6.32.13/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv4/udp.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c +--- linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -53999,9 +54028,9 @@ diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c ---- linux-2.6.32.13/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv6/exthdrs.c 2010-05-15 13:21:18.502580406 -0400 +diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c +--- linux-2.6.32.15/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -54011,9 +54040,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c ---- linux-2.6.32.13/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv6/raw.c 2010-05-15 13:21:18.523941597 -0400 +diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c +--- linux-2.6.32.15/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -54023,9 +54052,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-05-28 21:27:16.624385427 -0400 @@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; @@ -54046,9 +54075,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6 tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c ---- linux-2.6.32.13/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/ipv6/udp.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c +--- linux-2.6.32.15/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/ipv6/udp.c 2010-05-28 21:27:16.631258014 -0400 @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -54059,9 +54088,9 @@ diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -54184,9 +54213,9 @@ diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac80211/ieee80211_i.h ---- linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac80211/ieee80211_i.h +--- linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 ++++ linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 @@ -635,7 +635,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -54196,9 +54225,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac802 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/iface.c ---- linux-2.6.32.13/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/mac80211/iface.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/iface.c +--- linux-2.6.32.15/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -54253,9 +54282,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main.c ---- linux-2.6.32.13/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.13/net/mac80211/main.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main.c +--- linux-2.6.32.15/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 ++++ linux-2.6.32.15/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -54265,9 +54294,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c ---- linux-2.6.32.13/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/mac80211/pm.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c +--- linux-2.6.32.15/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -54277,9 +54306,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate.c ---- linux-2.6.32.13/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/mac80211/rate.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate.c +--- linux-2.6.32.15/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -54289,9 +54318,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c ---- linux-2.6.32.13/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 -+++ linux-2.6.32.13/net/mac80211/tx.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c +--- linux-2.6.32.15/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 ++++ linux-2.6.32.15/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct return cpu_to_le16(dur); } @@ -54301,9 +54330,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c struct net_device *dev) { return local == wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util.c ---- linux-2.6.32.13/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 -+++ linux-2.6.32.13/net/mac80211/util.c 2010-05-15 13:21:18.734776060 -0400 +diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util.c +--- linux-2.6.32.15/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 ++++ linux-2.6.32.15/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -54321,9 +54350,9 @@ diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" -diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c ---- linux-2.6.32.13/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/sctp/socket.c 2010-05-15 13:21:18.788974801 -0400 +diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c +--- linux-2.6.32.15/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -54341,9 +54370,9 @@ diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c ---- linux-2.6.32.13/net/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/socket.c 2010-05-15 13:21:18.788974801 -0400 +diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c +--- linux-2.6.32.15/net/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/socket.c 2010-05-28 21:27:16.671255671 -0400 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -54498,9 +54527,9 @@ diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -= *ppos; if (len > *lenp) @@ -54510,9 +54539,9 @@ diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/su return -EFAULT; *lenp = len; *ppos += len; -diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c ---- linux-2.6.32.13/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/sysctl_net.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c +--- linux-2.6.32.15/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -54522,9 +54551,9 @@ diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c ---- linux-2.6.32.13/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/tipc/socket.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c +--- linux-2.6.32.15/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, } else { if (res == 0) @@ -54537,9 +54566,9 @@ diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c sock->state = SS_DISCONNECTING; } -diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c ---- linux-2.6.32.13/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/unix/af_unix.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c +--- linux-2.6.32.15/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -54597,9 +54626,22 @@ diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_policy.c ---- linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext.c +--- linux-2.6.32.15/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 +@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc + */ + + /* Support for very large requests */ +- if ((descr->flags & IW_DESCR_FLAG_NOMAX) && +- (user_length > descr->max_tokens)) { ++ if (user_length > descr->max_tokens) { + /* Allow userspace to GET more than max so + * we can support any size GET requests. + * There is still a limit : -ENOMEM. +diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_policy.c +--- linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 @@ -1477,7 +1477,7 @@ free_dst: goto out; } @@ -54627,9 +54669,9 @@ diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/samples/kobject/kset-example.c ---- linux-2.6.32.13/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/samples/kobject/kset-example.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/samples/kobject/kset-example.c +--- linux-2.6.32.15/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -54639,9 +54681,9 @@ diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/sample .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/fixdep.c ---- linux-2.6.32.13/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/basic/fixdep.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/fixdep.c +--- linux-2.6.32.15/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen static void parse_config_file(char *map, size_t len) @@ -54663,9 +54705,9 @@ diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/ if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c ---- linux-2.6.32.13/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/kallsyms.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c +--- linux-2.6.32.15/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -54681,9 +54723,9 @@ diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/file2alias.c ---- linux-2.6.32.13/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/mod/file2alias.c 2010-05-15 13:21:18.790642809 -0400 +diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/file2alias.c +--- linux-2.6.32.15/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -54738,9 +54780,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/ sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/modpost.c ---- linux-2.6.32.13/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/mod/modpost.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/modpost.c +--- linux-2.6.32.15/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -54808,9 +54850,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/mod goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/modpost.h ---- linux-2.6.32.13/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/mod/modpost.h 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/modpost.h +--- linux-2.6.32.15/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -54830,9 +54872,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/mod struct module { struct module *next; -diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/sumversion.c ---- linux-2.6.32.13/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/mod/sumversion.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/sumversion.c +--- linux-2.6.32.15/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -54842,9 +54884,9 @@ diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo.c ---- linux-2.6.32.13/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/scripts/pnmtologo.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo.c +--- linux-2.6.32.15/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -54871,9 +54913,9 @@ diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commoncap.c ---- linux-2.6.32.13/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/commoncap.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commoncap.c +--- linux-2.6.32.15/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -54896,9 +54938,9 @@ diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commonc return 0; } -diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/security/integrity/ima/ima_api.c ---- linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/security/integrity/ima/ima_api.c +--- linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -54908,9 +54950,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/secu entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/security/integrity/ima/ima_fs.c ---- linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/security/integrity/ima/ima_fs.c +--- linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -54926,9 +54968,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/secur return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security/integrity/ima/ima.h ---- linux-2.6.32.13/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/integrity/ima/ima.h 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security/integrity/ima/ima.h +--- linux-2.6.32.15/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -54940,9 +54982,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/security/integrity/ima/ima_queue.c ---- linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/security/integrity/ima/ima_queue.c +--- linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -54952,9 +54994,9 @@ diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/se key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig ---- linux-2.6.32.13/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/security/Kconfig 2010-05-15 13:37:07.058702111 -0400 +diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig +--- linux-2.6.32.15/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 @@ -4,6 +4,499 @@ menu "Security options" @@ -55257,7 +55299,7 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig +config PAX_KERNEXEC + bool "Enforce non-executable kernel pages" + depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN -+ select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE) ++ select PAX_PER_CPU_PGD if X86_64 + help + This is the kernel land equivalent of PAGEEXEC and MPROTECT, + that is, enabling this option will make it harder to inject @@ -55464,9 +55506,9 @@ diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr.c ---- linux-2.6.32.13/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400 -+++ linux-2.6.32.13/security/min_addr.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr.c +--- linux-2.6.32.15/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.15/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -55483,9 +55525,9 @@ diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr } /* -diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/codecs/onyx.c ---- linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/codecs/onyx.c +--- linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -55514,9 +55556,9 @@ diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/cod onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/oss/pcm_oss.c ---- linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/oss/pcm_oss.c +--- linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -55528,9 +55570,9 @@ diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/o #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/seq/seq_lock.h ---- linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/seq/seq_lock.h +--- linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -55546,9 +55588,9 @@ diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/ #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/mts64.c ---- linux-2.6.32.13/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/drivers/mts64.c 2010-05-15 13:21:18.814648703 -0400 +diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/mts64.c +--- linux-2.6.32.15/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -55597,9 +55639,9 @@ diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/m return 0; } -diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/drivers/portman2x4.c ---- linux-2.6.32.13/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/drivers/portman2x4.c 2010-05-15 13:21:18.818605087 -0400 +diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/drivers/portman2x4.c +--- linux-2.6.32.15/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -55609,9 +55651,9 @@ diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/driv int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_audio.c ---- linux-2.6.32.13/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/oss/sb_audio.c 2010-05-15 13:21:18.853427293 -0400 +diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_audio.c +--- linux-2.6.32.15/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -55621,9 +55663,9 @@ diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_aud if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-05-15 13:21:18.897182507 -0400 +diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -55633,9 +55675,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 -+++ linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-05-15 13:21:18.938590352 -0400 +diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 ++++ linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -55942,9 +55984,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370.c ---- linux-2.6.32.13/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/pci/ens1370.c 2010-05-15 13:21:18.938590352 -0400 +diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370.c +--- linux-2.6.32.15/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ @@ -55954,9 +55996,9 @@ diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370 }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c ---- linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-05-15 13:21:18.938590352 -0400 +diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); @@ -55972,9 +56014,9 @@ diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound } -diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8x0.c ---- linux-2.6.32.13/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/pci/intel8x0.c 2010-05-15 13:21:18.938590352 -0400 +diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8x0.c +--- linux-2.6.32.15/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ @@ -55993,9 +56035,9 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel8x0m.c ---- linux-2.6.32.13/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/sound/pci/intel8x0m.c 2010-05-15 13:21:18.997275588 -0400 +diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel8x0m.c +--- linux-2.6.32.15/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ @@ -56014,9 +56056,9 @@ diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio.c ---- linux-2.6.32.13/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.13/usr/gen_init_cpio.c 2010-05-15 13:21:18.997275588 -0400 +diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio.c +--- linux-2.6.32.15/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.15/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -56039,9 +56081,9 @@ diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio } else break; } -diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main.c ---- linux-2.6.32.13/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 -+++ linux-2.6.32.13/virt/kvm/kvm_main.c 2010-05-15 13:21:19.058665704 -0400 +diff -urNp linux-2.6.32.15/virt/kvm/kvm_main.c linux-2.6.32.15/virt/kvm/kvm_main.c +--- linux-2.6.32.15/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 ++++ linux-2.6.32.15/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } diff --git a/main/linux-grsec/hv-grsec.patch b/main/linux-grsec/hv-grsec.patch new file mode 100644 index 000000000..6fde34199 --- /dev/null +++ b/main/linux-grsec/hv-grsec.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c +index b12237f..9d47edb 100644 +--- a/drivers/staging/hv/Hv.c ++++ b/drivers/staging/hv/Hv.c +@@ -133,7 +133,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output) + u64 hvStatus = 0; + u64 inputAddress = (Input) ? virt_to_phys(Input) : 0; + u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; +- volatile void *hypercallPage = gHvContext.HypercallPage; ++ volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage); + + DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p " + "output phys %llx virt %p hypercall %p>", diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 13e508a9f..d70107d29 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.9 -# Mon Mar 15 14:11:23 2010 +# Linux kernel version: 2.6.32.14 +# Wed Jun 2 07:39:39 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -133,7 +133,6 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y -# CONFIG_EVENT_PROFILE is not set CONFIG_PERF_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y @@ -143,7 +142,6 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_IBS is not set # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set @@ -305,6 +303,7 @@ CONFIG_HIGHMEM=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -931,7 +930,6 @@ CONFIG_NET_SCH_FIFO=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set CONFIG_CAN=m CONFIG_CAN_RAW=m @@ -3111,7 +3109,7 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m +CONFIG_DVB_LGS8GXX=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3939,7 +3937,65 @@ CONFIG_UIO_SERCOS3=m # # TI VLYNQ # -# CONFIG_STAGING is not set +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_ET131X is not set +# CONFIG_SLICOSS is not set +# CONFIG_VIDEO_GO7007 is not set +# CONFIG_VIDEO_CX25821 is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_POCH is not set +# CONFIG_OTUS is not set +# CONFIG_RT2860 is not set +# CONFIG_RT2870 is not set +# CONFIG_RT3090 is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_PANEL is not set +# CONFIG_ALTERA_PCIE_CHDMA is not set +# CONFIG_RTL8187SE is not set +# CONFIG_RTL8192SU is not set +# CONFIG_RTL8192E is not set +# CONFIG_TRANZPORT is not set + +# +# Android +# + +# +# Qualcomm MSM Camera And Video +# + +# +# Camera Sensor Selection +# +# CONFIG_INPUT_GPIO is not set +# CONFIG_DST is not set +# CONFIG_POHMELFS is not set +# CONFIG_B3DFG is not set +# CONFIG_IDE_PHISON is not set +# CONFIG_PLAN9AUTH is not set +# CONFIG_LINE6_USB is not set +# CONFIG_DRM_RADEON_KMS is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set +# CONFIG_FB_UDL is not set +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m +# CONFIG_VME_BUS is not set + +# +# RAR Register Driver +# +# CONFIG_RAR_REGISTER is not set +# CONFIG_IIO is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m @@ -4240,7 +4296,6 @@ CONFIG_FRAME_WARN=1024 CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_STACKTRACE=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y @@ -4249,7 +4304,6 @@ CONFIG_FRAME_POINTER=y # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4258,10 +4312,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -4570,7 +4621,7 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m -CONFIG_BINARY_PRINTF=y +# CONFIG_BINARY_PRINTF is not set # # Library routines diff --git a/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch b/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch new file mode 100644 index 000000000..bd111e877 --- /dev/null +++ b/main/linux-grsec/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch @@ -0,0 +1,56 @@ +From patchwork Wed Jun 9 05:22:10 2010 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: r8169: fix mdio_read and update mdio_write according to hw specs +Date: Tue, 08 Jun 2010 19:22:10 -0000 +From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= +X-Patchwork-Id: 55049 +Message-Id: <1276060930-15697-1-git-send-email-timo.teras@iki.fi> +To: netdev@vger.kernel.org +Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, + Francois Romieu <romieu@fr.zoreil.com>, Hayeswang <hayeswang@realtek.com> + +Realtek confirmed that a 20us delay is needed after mdio_read and +mdio_write operations. Reduce the delay in mdio_write, and add it +to mdio_read too. Also add a comment that the 20us is from hw specs. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Cc: Francois Romieu <romieu@fr.zoreil.com> +Cc: Hayeswang <hayeswang@realtek.com> + +--- +drivers/net/r8169.c | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 03a8318..96b6cfb 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -560,10 +560,10 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) + udelay(25); + } + /* +- * Some configurations require a small delay even after the write +- * completed indication or the next write might fail. ++ * According to hardware specs a 20us delay is required after write ++ * complete indication, but before sending next command. + */ +- udelay(25); ++ udelay(20); + } + + static int mdio_read(void __iomem *ioaddr, int reg_addr) +@@ -583,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) + } + udelay(25); + } ++ /* ++ * According to hardware specs a 20us delay is required after read ++ * complete indication, but before sending next command. ++ */ ++ udelay(20); ++ + return value; + } + diff --git a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch new file mode 100644 index 000000000..1e2beadd0 --- /dev/null +++ b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch @@ -0,0 +1,48 @@ +From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Sun, 6 Jun 2010 15:38:47 -0700 +Subject: [PATCH 1/1] r8169: fix random mdio_write failures +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Some configurations need delay between the "write completed" indication +and new write to work reliably. + +Realtek driver seems to use longer delay when polling the "write complete" +bit, so it waits long enough between writes with high probability (but +could probably break too). This patch adds a new udelay to make sure we +wait unconditionally some time after the write complete indication. + +This caused a regression with XID 18000000 boards when the board specific +phy configuration writing many mdio registers was added in commit +2e955856ff (r8169: phy init for the 8169scd). Some of the configration +mdio writes would almost always fail, and depending on failure might leave +the PHY in non-working state. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Acked-off-by: Francois Romieu <romieu@fr.zoreil.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/r8169.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 217e709..03a8318 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) + break; + udelay(25); + } ++ /* ++ * Some configurations require a small delay even after the write ++ * completed indication or the next write might fail. ++ */ ++ udelay(25); + } + + static int mdio_read(void __iomem *ioaddr, int reg_addr) +-- +1.7.1 + diff --git a/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch b/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch new file mode 100644 index 000000000..a4f94d7fa --- /dev/null +++ b/main/linux-grsec/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch @@ -0,0 +1,48 @@ +From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001 +From: H. Peter Anvin <hpa@zytor.com> +Date: Wed, 17 Feb 2010 18:32:06 -0800 +Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info + +When we restore the screen content after a mode change, we return the +cursor to its former position. However, we need to also update +boot_params.screen_info accordingly, so that the decompression code +knows where on the screen the cursor is. Just in case the video BIOS +does something extra screwy, read the cursor position back from the +BIOS instead of relying on it doing the right thing. + +While we're at it, make sure we cap the cursor position to the new +screen coordinates. + +Reported-by: Wim Osterholt <wim@djo.tudelft.nl> +Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 +Signed-off-by: H. Peter Anvin <hpa@zytor.com> +--- + arch/x86/boot/video.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c +index f767164..43eda28 100644 +--- a/arch/x86/boot/video.c ++++ b/arch/x86/boot/video.c +@@ -298,11 +298,18 @@ static void restore_screen(void) + } + + /* Restore cursor position */ ++ if (saved.curx >= xs) ++ saved.curx = xs-1; ++ if (saved.cury >= ys) ++ saved.cury = ys-1; ++ + initregs(&ireg); + ireg.ah = 0x02; /* Set cursor position */ + ireg.dh = saved.cury; + ireg.dl = saved.curx; + intcall(0x10, &ireg, NULL); ++ ++ store_cursor_position(); + } + + void set_video(void) +-- +1.7.1 + diff --git a/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch b/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch new file mode 100644 index 000000000..36a0ae449 --- /dev/null +++ b/main/linux-pae/0002-gre-fix-hard-header-destination-address-checking.patch @@ -0,0 +1,44 @@ +From 9082391046940c410eac3bad065c8701998b5cab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 3 Mar 2010 04:01:13 +0000 +Subject: [PATCH 02/18] gre: fix hard header destination address checking + +ipgre_header() can be called with zero daddr when the gre device is +configured as multipoint tunnel and still has the NOARP flag set (which is +typically cleared by the userspace arp daemon). If the NOARP packets are +not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and +use that for route look up (and may lead to bogus xfrm acquires). + +The multicast address check is removed as sending to multicast group should +be ok. In fact, if gre device has a multicast address as destination +ipgre_header is always called with multicast address. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3) +--- + net/ipv4/ip_gre.c | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c +index 1433338..ac88ce5 100644 +--- a/net/ipv4/ip_gre.c ++++ b/net/ipv4/ip_gre.c +@@ -1137,12 +1137,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, + + if (saddr) + memcpy(&iph->saddr, saddr, 4); +- +- if (daddr) { ++ if (daddr) + memcpy(&iph->daddr, daddr, 4); +- return t->hlen; +- } +- if (iph->daddr && !ipv4_is_multicast(iph->daddr)) ++ if (iph->daddr) + return t->hlen; + + return -t->hlen; +-- +1.7.0.2 + diff --git a/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch b/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch new file mode 100644 index 000000000..61d7c9a6c --- /dev/null +++ b/main/linux-pae/0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -0,0 +1,39 @@ +From cd0e9d08480e1e0648e17d099ecf50f6fd8714e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Sat, 20 Mar 2010 02:27:58 +0000 +Subject: [PATCH 03/18] ip_gre: include route header_len in max_headroom calculation + +Taking route's header_len into account, and updating gre device +needed_headroom will give better hints on upper bound of required +headroom. This is useful if the gre traffic is xfrm'ed. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 243aad830e8a4cdda261626fbaeddde16b08d04a) +--- + net/ipv4/ip_gre.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c +index ac88ce5..7f1ff73 100644 +--- a/net/ipv4/ip_gre.c ++++ b/net/ipv4/ip_gre.c +@@ -803,11 +803,13 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev + tunnel->err_count = 0; + } + +- max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; ++ max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; + + if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| + (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { + struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); ++ if (max_headroom > dev->needed_headroom) ++ dev->needed_headroom = max_headroom; + if (!new_skb) { + ip_rt_put(rt); + stats->tx_dropped++; +-- +1.7.0.2 + diff --git a/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch b/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch new file mode 100644 index 000000000..85161ea3a --- /dev/null +++ b/main/linux-pae/0004-arp-flush-arp-cache-on-device-change.patch @@ -0,0 +1,29 @@ +From 8a0e3ea4924059a7268446177d6869e3399adbb2 Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Mon, 12 Apr 2010 13:46:45 +0000 +Subject: [PATCH 04/18] arp: flush arp cache on device change + +If IFF_NOARP is changed, we must flush the arp cache. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +--- + net/ipv4/arp.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c +index 4e80f33..580bfc3 100644 +--- a/net/ipv4/arp.c ++++ b/net/ipv4/arp.c +@@ -1200,6 +1200,9 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo + neigh_changeaddr(&arp_tbl, dev); + rt_cache_flush(dev_net(dev), 0); + break; ++ case NETDEV_CHANGE: ++ neigh_changeaddr(&arp_tbl, dev); ++ break; + default: + break; + } +-- +1.7.0.2 + diff --git a/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch b/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch new file mode 100644 index 000000000..fad272328 --- /dev/null +++ b/main/linux-pae/0007-r8169-Fix-rtl8169_rx_interrupt.patch @@ -0,0 +1,89 @@ +From 26654a966adb674afc30d285f7e79535d03c2492 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet <eric.dumazet@gmail.com> +Date: Wed, 31 Mar 2010 02:08:31 +0000 +Subject: [PATCH 07/18] r8169: Fix rtl8169_rx_interrupt() + +In case a reset is performed, rtl8169_rx_interrupt() is called from +process context instead of softirq context. Special care must be taken +to call appropriate network core services (netif_rx() instead of +netif_receive_skb()). VLAN handling also corrected. + +Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> +Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> +Diagnosed-by: Oleg Nesterov <oleg@redhat.com> +Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 630b943c182d1aed69f244405131902fbcba7ec6) +--- + drivers/net/r8169.c | 22 +++++++++++++++++----- + 1 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 1484528..bed1d47 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -1047,14 +1047,14 @@ static void rtl8169_vlan_rx_register(struct net_device *dev, + } + + static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, +- struct sk_buff *skb) ++ struct sk_buff *skb, int polling) + { + u32 opts2 = le32_to_cpu(desc->opts2); + struct vlan_group *vlgrp = tp->vlgrp; + int ret; + + if (vlgrp && (opts2 & RxVlanTag)) { +- vlan_hwaccel_receive_skb(skb, vlgrp, swab16(opts2 & 0xffff)); ++ __vlan_hwaccel_rx(skb, vlgrp, swab16(opts2 & 0xffff), polling); + ret = 0; + } else + ret = -1; +@@ -1071,7 +1071,7 @@ static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp, + } + + static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, +- struct sk_buff *skb) ++ struct sk_buff *skb, int polling) + { + return -1; + } +@@ -4480,12 +4480,20 @@ out: + return done; + } + ++/* ++ * Warning : rtl8169_rx_interrupt() might be called : ++ * 1) from NAPI (softirq) context ++ * (polling = 1 : we should call netif_receive_skb()) ++ * 2) from process context (rtl8169_reset_task()) ++ * (polling = 0 : we must call netif_rx() instead) ++ */ + static int rtl8169_rx_interrupt(struct net_device *dev, + struct rtl8169_private *tp, + void __iomem *ioaddr, u32 budget) + { + unsigned int cur_rx, rx_left; + unsigned int delta, count; ++ int polling = (budget != ~(u32)0) ? 1 : 0; + + cur_rx = tp->cur_rx; + rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx; +@@ -4550,8 +4558,12 @@ static int rtl8169_rx_interrupt(struct net_device *dev, + skb_put(skb, pkt_size); + skb->protocol = eth_type_trans(skb, dev); + +- if (rtl8169_rx_vlan_skb(tp, desc, skb) < 0) +- netif_receive_skb(skb); ++ if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) { ++ if (likely(polling)) ++ netif_receive_skb(skb); ++ else ++ netif_rx(skb); ++ } + + dev->stats.rx_bytes += pkt_size; + dev->stats.rx_packets++; +-- +1.7.0.2 + diff --git a/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch b/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch new file mode 100644 index 000000000..d4de0e1d5 --- /dev/null +++ b/main/linux-pae/0009-ipsec-Fix-bogus-bundle-flowi.patch @@ -0,0 +1,110 @@ +From 21ee14f92ef1b6d4ca965c9b59135f3462919631 Mon Sep 17 00:00:00 2001 +From: Herbert Xu <herbert@gondor.apana.org.au> +Date: Tue, 2 Mar 2010 02:51:56 +0000 +Subject: [PATCH 09/18] ipsec: Fix bogus bundle flowi + +When I merged the bundle creation code, I introduced a bogus +flowi value in the bundle. Instead of getting from the caller, +it was instead set to the flow in the route object, which is +totally different. + +The end result is that the bundles we created never match, and +we instead end up with an ever growing bundle list. + +Thanks to Jamal for find this problem. + +Reported-by: Jamal Hadi Salim <hadi@cyberus.ca> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Acked-by: Steffen Klassert <steffen.klassert@secunet.com> +Acked-by: Jamal Hadi Salim <hadi@cyberus.ca> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9) +--- + include/net/xfrm.h | 3 ++- + net/ipv4/xfrm4_policy.c | 5 +++-- + net/ipv6/xfrm6_policy.c | 3 ++- + net/xfrm/xfrm_policy.c | 7 ++++--- + 4 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index 223e90a..6960be2 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h +@@ -273,7 +273,8 @@ struct xfrm_policy_afinfo { + struct dst_entry *dst, + int nfheader_len); + int (*fill_dst)(struct xfrm_dst *xdst, +- struct net_device *dev); ++ struct net_device *dev, ++ struct flowi *fl); + }; + + extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); +diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c +index 74fb2eb..7009886 100644 +--- a/net/ipv4/xfrm4_policy.c ++++ b/net/ipv4/xfrm4_policy.c +@@ -92,11 +92,12 @@ static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst, + return 0; + } + +-static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) ++static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ++ struct flowi *fl) + { + struct rtable *rt = (struct rtable *)xdst->route; + +- xdst->u.rt.fl = rt->fl; ++ xdst->u.rt.fl = *fl; + + xdst->u.dst.dev = dev; + dev_hold(dev); +diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c +index 8ec3d45..3f89ab7 100644 +--- a/net/ipv6/xfrm6_policy.c ++++ b/net/ipv6/xfrm6_policy.c +@@ -117,7 +117,8 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst, + return 0; + } + +-static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) ++static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ++ struct flowi *fl) + { + struct rt6_info *rt = (struct rt6_info*)xdst->route; + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index cb81ca3..d75047c 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1341,7 +1341,8 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst, + return err; + } + +-static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) ++static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ++ struct flowi *fl) + { + struct xfrm_policy_afinfo *afinfo = + xfrm_policy_get_afinfo(xdst->u.dst.ops->family); +@@ -1350,7 +1351,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev) + if (!afinfo) + return -EINVAL; + +- err = afinfo->fill_dst(xdst, dev); ++ err = afinfo->fill_dst(xdst, dev, fl); + + xfrm_policy_put_afinfo(afinfo); + +@@ -1454,7 +1455,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, + for (dst_prev = dst0; dst_prev != dst; dst_prev = dst_prev->child) { + struct xfrm_dst *xdst = (struct xfrm_dst *)dst_prev; + +- err = xfrm_fill_dst(xdst, dev); ++ err = xfrm_fill_dst(xdst, dev, fl); + if (err) + goto free_dst; + +-- +1.7.0.2 + diff --git a/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch b/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch new file mode 100644 index 000000000..8cfffd739 --- /dev/null +++ b/main/linux-pae/0010-xfrm-Remove-xfrm_state_genid.patch @@ -0,0 +1,54 @@ +From f2c59932757a06851bb740dc757ce2ba1961fc08 Mon Sep 17 00:00:00 2001 +From: Herbert Xu <herbert@gondor.apana.org.au> +Date: Wed, 31 Mar 2010 01:19:49 +0000 +Subject: [PATCH 10/18] xfrm: Remove xfrm_state_genid +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The xfrm state genid only needs to be matched against the copy +saved in xfrm_dst. So we don't need a global genid at all. In +fact, we don't even need to initialise it. + +Based on observation by Timo Teräs. + +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 34996cb91dd72f0b0456d8fd3fef4aaee62232f2) +--- + net/xfrm/xfrm_state.c | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c +index f2f7c63..8ee733f 100644 +--- a/net/xfrm/xfrm_state.c ++++ b/net/xfrm/xfrm_state.c +@@ -34,7 +34,6 @@ + static DEFINE_SPINLOCK(xfrm_state_lock); + + static unsigned int xfrm_state_hashmax __read_mostly = 1 * 1024 * 1024; +-static unsigned int xfrm_state_genid; + + static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family); + static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo); +@@ -903,8 +902,6 @@ static void __xfrm_state_insert(struct xfrm_state *x) + struct net *net = xs_net(x); + unsigned int h; + +- x->genid = ++xfrm_state_genid; +- + list_add(&x->km.all, &net->xfrm.state_all); + + h = xfrm_dst_hash(net, &x->id.daddr, &x->props.saddr, +@@ -948,7 +945,7 @@ static void __xfrm_state_bump_genids(struct xfrm_state *xnew) + x->props.reqid == reqid && + !xfrm_addr_cmp(&x->id.daddr, &xnew->id.daddr, family) && + !xfrm_addr_cmp(&x->props.saddr, &xnew->props.saddr, family)) +- x->genid = xfrm_state_genid; ++ x->genid++; + } + } + +-- +1.7.0.2 + diff --git a/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch b/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch new file mode 100644 index 000000000..ae2a0f910 --- /dev/null +++ b/main/linux-pae/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch @@ -0,0 +1,35 @@ +From 5b3e87bccb0e48f2f8b78695e949c015a3695f8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 31 Mar 2010 00:17:04 +0000 +Subject: [PATCH 11/18] xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler + +Add missing check for policy direction verification. This is +especially important since without this xfrm_user may end up +deleting per-socket policy which is not allowed. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit c8bf4d04f970fafb3430d332533e1cf103f2a018) +--- + net/xfrm/xfrm_user.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c +index b95a2d6..d1e9ee3 100644 +--- a/net/xfrm/xfrm_user.c ++++ b/net/xfrm/xfrm_user.c +@@ -1589,6 +1589,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, + if (err) + return err; + ++ err = verify_policy_dir(p->dir); ++ if (err) ++ return err; ++ + if (p->index) + xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err); + else { +-- +1.7.0.2 + diff --git a/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch b/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch new file mode 100644 index 000000000..222caaddf --- /dev/null +++ b/main/linux-pae/0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch @@ -0,0 +1,105 @@ +From 7a400eb025dd53883c3560d0fdb069542f7ad3db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 31 Mar 2010 00:17:05 +0000 +Subject: [PATCH 12/18] xfrm: remove policy lock when accessing policy->walk.dead + +All of the code considers ->dead as a hint that the cached policy +needs to get refreshed. The read side can just drop the read lock +without any side effects. + +The write side needs to make sure that it's written only exactly +once. Only possible race is at xfrm_policy_kill(). This is fixed +by checking result of __xfrm_policy_unlink() when needed. It will +always succeed if the policy object is looked up from the hash +list (so some checks are removed), but it needs to be checked if +we are trying to unlink policy via a reference (appropriate +checks added). + +Since policy->walk.dead is written exactly once, it no longer +needs to be protected with a write lock. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(backported from commit ea2dea9dacc256fe927857feb423872051642ae7) +--- + net/xfrm/xfrm_policy.c | 20 +++++--------------- + net/xfrm/xfrm_user.c | 6 +----- + 2 files changed, 6 insertions(+), 20 deletions(-) + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index d75047c..110184f 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -156,7 +156,7 @@ static void xfrm_policy_timer(unsigned long data) + + read_lock(&xp->lock); + +- if (xp->walk.dead) ++ if (unlikely(xp->walk.dead)) + goto out; + + dir = xfrm_policy_id2dir(xp->index); +@@ -297,17 +297,7 @@ static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task); + + static void xfrm_policy_kill(struct xfrm_policy *policy) + { +- int dead; +- +- write_lock_bh(&policy->lock); +- dead = policy->walk.dead; + policy->walk.dead = 1; +- write_unlock_bh(&policy->lock); +- +- if (unlikely(dead)) { +- WARN_ON(1); +- return; +- } + + spin_lock_bh(&xfrm_policy_gc_lock); + hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); +@@ -1115,6 +1105,9 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol) + __xfrm_policy_link(pol, XFRM_POLICY_MAX+dir); + } + if (old_pol) ++ /* Unlinking succeeds always. This is the only function ++ * allowed to delete or replace socket policy. ++ */ + __xfrm_policy_unlink(old_pol, XFRM_POLICY_MAX+dir); + write_unlock_bh(&xfrm_policy_lock); + +@@ -1705,11 +1698,8 @@ restart: + goto error; + } + +- for (pi = 0; pi < npols; pi++) { +- read_lock_bh(&pols[pi]->lock); ++ for (pi = 0; pi < npols; pi++) + pol_dead |= pols[pi]->walk.dead; +- read_unlock_bh(&pols[pi]->lock); +- } + + write_lock_bh(&policy->lock); + if (unlikely(pol_dead || stale_bundle(dst))) { +diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c +index d1e9ee3..f9c56e9 100644 +--- a/net/xfrm/xfrm_user.c ++++ b/net/xfrm/xfrm_user.c +@@ -1617,13 +1617,9 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, + if (xp == NULL) + return -ENOENT; + +- read_lock(&xp->lock); +- if (xp->walk.dead) { +- read_unlock(&xp->lock); ++ if (unlikely(xp->walk.dead)) + goto out; +- } + +- read_unlock(&xp->lock); + err = 0; + if (up->hard) { + uid_t loginuid = NETLINK_CB(skb).loginuid; +-- +1.7.0.2 + diff --git a/main/linux-pae/0013-flow-structurize-flow-cache.patch b/main/linux-pae/0013-flow-structurize-flow-cache.patch new file mode 100644 index 000000000..68fa753a2 --- /dev/null +++ b/main/linux-pae/0013-flow-structurize-flow-cache.patch @@ -0,0 +1,395 @@ +From 884f6e44f0b405c06bd234b14cc228482291bb38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 31 Mar 2010 00:17:06 +0000 +Subject: [PATCH 13/18] flow: structurize flow cache + +Group all per-cpu data to one structure instead of having many +globals. Also prepare the internals so that we can have multiple +instances of the flow cache if needed. + +Only the kmem_cache is left as a global as all flow caches share +the same element size, and benefit from using a common cache. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit d7997fe1f4584da12e9c29fb682c18e9bdc13b73) +--- + net/core/flow.c | 223 +++++++++++++++++++++++++++++-------------------------- + 1 files changed, 119 insertions(+), 104 deletions(-) + +diff --git a/net/core/flow.c b/net/core/flow.c +index 9601587..1d27ca6 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -35,104 +35,105 @@ struct flow_cache_entry { + atomic_t *object_ref; + }; + +-atomic_t flow_cache_genid = ATOMIC_INIT(0); +- +-static u32 flow_hash_shift; +-#define flow_hash_size (1 << flow_hash_shift) +-static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL }; +- +-#define flow_table(cpu) (per_cpu(flow_tables, cpu)) +- +-static struct kmem_cache *flow_cachep __read_mostly; +- +-static int flow_lwm, flow_hwm; +- +-struct flow_percpu_info { +- int hash_rnd_recalc; +- u32 hash_rnd; +- int count; ++struct flow_cache_percpu { ++ struct flow_cache_entry ** hash_table; ++ int hash_count; ++ u32 hash_rnd; ++ int hash_rnd_recalc; ++ struct tasklet_struct flush_tasklet; + }; +-static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 }; +- +-#define flow_hash_rnd_recalc(cpu) \ +- (per_cpu(flow_hash_info, cpu).hash_rnd_recalc) +-#define flow_hash_rnd(cpu) \ +- (per_cpu(flow_hash_info, cpu).hash_rnd) +-#define flow_count(cpu) \ +- (per_cpu(flow_hash_info, cpu).count) +- +-static struct timer_list flow_hash_rnd_timer; +- +-#define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) + + struct flow_flush_info { +- atomic_t cpuleft; +- struct completion completion; ++ struct flow_cache * cache; ++ atomic_t cpuleft; ++ struct completion completion; + }; +-static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL }; + +-#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) ++struct flow_cache { ++ u32 hash_shift; ++ unsigned long order; ++ struct flow_cache_percpu * percpu; ++ struct notifier_block hotcpu_notifier; ++ int low_watermark; ++ int high_watermark; ++ struct timer_list rnd_timer; ++}; ++ ++atomic_t flow_cache_genid = ATOMIC_INIT(0); ++static struct flow_cache flow_cache_global; ++static struct kmem_cache *flow_cachep; ++ ++#define flow_cache_hash_size(cache) (1 << (cache)->hash_shift) ++#define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) + + static void flow_cache_new_hashrnd(unsigned long arg) + { ++ struct flow_cache *fc = (void *) arg; + int i; + + for_each_possible_cpu(i) +- flow_hash_rnd_recalc(i) = 1; ++ per_cpu_ptr(fc->percpu, i)->hash_rnd_recalc = 1; + +- flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; +- add_timer(&flow_hash_rnd_timer); ++ fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; ++ add_timer(&fc->rnd_timer); + } + +-static void flow_entry_kill(int cpu, struct flow_cache_entry *fle) ++static void flow_entry_kill(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp, ++ struct flow_cache_entry *fle) + { + if (fle->object) + atomic_dec(fle->object_ref); + kmem_cache_free(flow_cachep, fle); +- flow_count(cpu)--; ++ fcp->hash_count--; + } + +-static void __flow_cache_shrink(int cpu, int shrink_to) ++static void __flow_cache_shrink(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp, ++ int shrink_to) + { + struct flow_cache_entry *fle, **flp; + int i; + +- for (i = 0; i < flow_hash_size; i++) { ++ for (i = 0; i < flow_cache_hash_size(fc); i++) { + int k = 0; + +- flp = &flow_table(cpu)[i]; ++ flp = &fcp->hash_table[i]; + while ((fle = *flp) != NULL && k < shrink_to) { + k++; + flp = &fle->next; + } + while ((fle = *flp) != NULL) { + *flp = fle->next; +- flow_entry_kill(cpu, fle); ++ flow_entry_kill(fc, fcp, fle); + } + } + } + +-static void flow_cache_shrink(int cpu) ++static void flow_cache_shrink(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp) + { +- int shrink_to = flow_lwm / flow_hash_size; ++ int shrink_to = fc->low_watermark / flow_cache_hash_size(fc); + +- __flow_cache_shrink(cpu, shrink_to); ++ __flow_cache_shrink(fc, fcp, shrink_to); + } + +-static void flow_new_hash_rnd(int cpu) ++static void flow_new_hash_rnd(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp) + { +- get_random_bytes(&flow_hash_rnd(cpu), sizeof(u32)); +- flow_hash_rnd_recalc(cpu) = 0; +- +- __flow_cache_shrink(cpu, 0); ++ get_random_bytes(&fcp->hash_rnd, sizeof(u32)); ++ fcp->hash_rnd_recalc = 0; ++ __flow_cache_shrink(fc, fcp, 0); + } + +-static u32 flow_hash_code(struct flowi *key, int cpu) ++static u32 flow_hash_code(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp, ++ struct flowi *key) + { + u32 *k = (u32 *) key; + +- return (jhash2(k, (sizeof(*key) / sizeof(u32)), flow_hash_rnd(cpu)) & +- (flow_hash_size - 1)); ++ return (jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) ++ & (flow_cache_hash_size(fc) - 1)); + } + + #if (BITS_PER_LONG == 64) +@@ -168,24 +169,25 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) + void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + flow_resolve_t resolver) + { ++ struct flow_cache *fc = &flow_cache_global; ++ struct flow_cache_percpu *fcp; + struct flow_cache_entry *fle, **head; + unsigned int hash; +- int cpu; + + local_bh_disable(); +- cpu = smp_processor_id(); ++ fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); + + fle = NULL; + /* Packet really early in init? Making flow_cache_init a + * pre-smp initcall would solve this. --RR */ +- if (!flow_table(cpu)) ++ if (!fcp->hash_table) + goto nocache; + +- if (flow_hash_rnd_recalc(cpu)) +- flow_new_hash_rnd(cpu); +- hash = flow_hash_code(key, cpu); ++ if (fcp->hash_rnd_recalc) ++ flow_new_hash_rnd(fc, fcp); ++ hash = flow_hash_code(fc, fcp, key); + +- head = &flow_table(cpu)[hash]; ++ head = &fcp->hash_table[hash]; + for (fle = *head; fle; fle = fle->next) { + if (fle->family == family && + fle->dir == dir && +@@ -204,8 +206,8 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + } + + if (!fle) { +- if (flow_count(cpu) > flow_hwm) +- flow_cache_shrink(cpu); ++ if (fcp->hash_count > fc->high_watermark) ++ flow_cache_shrink(fc, fcp); + + fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC); + if (fle) { +@@ -215,7 +217,7 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + fle->dir = dir; + memcpy(&fle->key, key, sizeof(*key)); + fle->object = NULL; +- flow_count(cpu)++; ++ fcp->hash_count++; + } + } + +@@ -249,14 +251,15 @@ nocache: + static void flow_cache_flush_tasklet(unsigned long data) + { + struct flow_flush_info *info = (void *)data; ++ struct flow_cache *fc = info->cache; ++ struct flow_cache_percpu *fcp; + int i; +- int cpu; + +- cpu = smp_processor_id(); +- for (i = 0; i < flow_hash_size; i++) { ++ fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); ++ for (i = 0; i < flow_cache_hash_size(fc); i++) { + struct flow_cache_entry *fle; + +- fle = flow_table(cpu)[i]; ++ fle = fcp->hash_table[i]; + for (; fle; fle = fle->next) { + unsigned genid = atomic_read(&flow_cache_genid); + +@@ -272,7 +275,6 @@ static void flow_cache_flush_tasklet(unsigned long data) + complete(&info->completion); + } + +-static void flow_cache_flush_per_cpu(void *) __attribute__((__unused__)); + static void flow_cache_flush_per_cpu(void *data) + { + struct flow_flush_info *info = data; +@@ -280,8 +282,7 @@ static void flow_cache_flush_per_cpu(void *data) + struct tasklet_struct *tasklet; + + cpu = smp_processor_id(); +- +- tasklet = flow_flush_tasklet(cpu); ++ tasklet = &per_cpu_ptr(info->cache->percpu, cpu)->flush_tasklet; + tasklet->data = (unsigned long)info; + tasklet_schedule(tasklet); + } +@@ -294,6 +295,7 @@ void flow_cache_flush(void) + /* Don't want cpus going down or up during this. */ + get_online_cpus(); + mutex_lock(&flow_flush_sem); ++ info.cache = &flow_cache_global; + atomic_set(&info.cpuleft, num_online_cpus()); + init_completion(&info.completion); + +@@ -307,62 +309,75 @@ void flow_cache_flush(void) + put_online_cpus(); + } + +-static void __init flow_cache_cpu_prepare(int cpu) ++static void __init flow_cache_cpu_prepare(struct flow_cache *fc, ++ struct flow_cache_percpu *fcp) + { +- struct tasklet_struct *tasklet; +- unsigned long order; +- +- for (order = 0; +- (PAGE_SIZE << order) < +- (sizeof(struct flow_cache_entry *)*flow_hash_size); +- order++) +- /* NOTHING */; +- +- flow_table(cpu) = (struct flow_cache_entry **) +- __get_free_pages(GFP_KERNEL|__GFP_ZERO, order); +- if (!flow_table(cpu)) +- panic("NET: failed to allocate flow cache order %lu\n", order); +- +- flow_hash_rnd_recalc(cpu) = 1; +- flow_count(cpu) = 0; +- +- tasklet = flow_flush_tasklet(cpu); +- tasklet_init(tasklet, flow_cache_flush_tasklet, 0); ++ fcp->hash_table = (struct flow_cache_entry **) ++ __get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order); ++ if (!fcp->hash_table) ++ panic("NET: failed to allocate flow cache order %lu\n", fc->order); ++ ++ fcp->hash_rnd_recalc = 1; ++ fcp->hash_count = 0; ++ tasklet_init(&fcp->flush_tasklet, flow_cache_flush_tasklet, 0); + } + + static int flow_cache_cpu(struct notifier_block *nfb, + unsigned long action, + void *hcpu) + { ++ struct flow_cache *fc = container_of(nfb, struct flow_cache, hotcpu_notifier); ++ int cpu = (unsigned long) hcpu; ++ struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); ++ + if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) +- __flow_cache_shrink((unsigned long)hcpu, 0); ++ __flow_cache_shrink(fc, fcp, 0); + return NOTIFY_OK; + } + +-static int __init flow_cache_init(void) ++static int flow_cache_init(struct flow_cache *fc) + { ++ unsigned long order; + int i; + +- flow_cachep = kmem_cache_create("flow_cache", +- sizeof(struct flow_cache_entry), +- 0, SLAB_PANIC, +- NULL); +- flow_hash_shift = 10; +- flow_lwm = 2 * flow_hash_size; +- flow_hwm = 4 * flow_hash_size; ++ fc->hash_shift = 10; ++ fc->low_watermark = 2 * flow_cache_hash_size(fc); ++ fc->high_watermark = 4 * flow_cache_hash_size(fc); ++ ++ for (order = 0; ++ (PAGE_SIZE << order) < ++ (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc)); ++ order++) ++ /* NOTHING */; ++ fc->order = order; ++ fc->percpu = alloc_percpu(struct flow_cache_percpu); + +- setup_timer(&flow_hash_rnd_timer, flow_cache_new_hashrnd, 0); +- flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; +- add_timer(&flow_hash_rnd_timer); ++ setup_timer(&fc->rnd_timer, flow_cache_new_hashrnd, ++ (unsigned long) fc); ++ fc->rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD; ++ add_timer(&fc->rnd_timer); + + for_each_possible_cpu(i) +- flow_cache_cpu_prepare(i); ++ flow_cache_cpu_prepare(fc, per_cpu_ptr(fc->percpu, i)); ++ ++ fc->hotcpu_notifier = (struct notifier_block){ ++ .notifier_call = flow_cache_cpu, ++ }; ++ register_hotcpu_notifier(&fc->hotcpu_notifier); + +- hotcpu_notifier(flow_cache_cpu, 0); + return 0; + } + +-module_init(flow_cache_init); ++static int __init flow_cache_init_global(void) ++{ ++ flow_cachep = kmem_cache_create("flow_cache", ++ sizeof(struct flow_cache_entry), ++ 0, SLAB_PANIC, NULL); ++ ++ return flow_cache_init(&flow_cache_global); ++} ++ ++module_init(flow_cache_init_global); + + EXPORT_SYMBOL(flow_cache_genid); + EXPORT_SYMBOL(flow_cache_lookup); +-- +1.7.0.2 + diff --git a/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch b/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch new file mode 100644 index 000000000..5c4a9ea59 --- /dev/null +++ b/main/linux-pae/0014-flow-virtualize-flow-cache-entry-methods.patch @@ -0,0 +1,513 @@ +From d56cd1c538e5448fe43acc69991aa842f382a622 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 7 Apr 2010 00:30:04 +0000 +Subject: [PATCH 14/18] flow: virtualize flow cache entry methods + +This allows to validate the cached object before returning it. +It also allows to destruct object properly, if the last reference +was held in flow cache. This is also a prepartion for caching +bundles in the flow cache. + +In return for virtualizing the methods, we save on: +- not having to regenerate the whole flow cache on policy removal: + each flow matching a killed policy gets refreshed as the getter + function notices it smartly. +- we do not have to call flow_cache_flush from policy gc, since the + flow cache now properly deletes the object if it had any references + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Acked-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +(backported from commit fe1a5f031e76bd8761a7803d75b95ee96e84a574) +--- + include/net/flow.h | 23 +++++++-- + include/net/xfrm.h | 3 + + net/core/flow.c | 128 +++++++++++++++++++++++++---------------------- + net/xfrm/xfrm_policy.c | 111 ++++++++++++++++++++++++++++-------------- + 4 files changed, 164 insertions(+), 101 deletions(-) + +diff --git a/include/net/flow.h b/include/net/flow.h +index 809970b..bb08692 100644 +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -86,11 +86,26 @@ struct flowi { + + struct net; + struct sock; +-typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family, +- u8 dir, void **objp, atomic_t **obj_refp); ++struct flow_cache_ops; ++ ++struct flow_cache_object { ++ const struct flow_cache_ops *ops; ++}; ++ ++struct flow_cache_ops { ++ struct flow_cache_object *(*get)(struct flow_cache_object *); ++ int (*check)(struct flow_cache_object *); ++ void (*delete)(struct flow_cache_object *); ++}; ++ ++typedef struct flow_cache_object *(*flow_resolve_t)( ++ struct net *net, struct flowi *key, u16 family, ++ u8 dir, struct flow_cache_object *oldobj, void *ctx); ++ ++extern struct flow_cache_object *flow_cache_lookup( ++ struct net *net, struct flowi *key, u16 family, ++ u8 dir, flow_resolve_t resolver, void *ctx); + +-extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, +- u8 dir, flow_resolve_t resolver); + extern void flow_cache_flush(void); + extern atomic_t flow_cache_genid; + +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index 6960be2..6023a48 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h +@@ -19,6 +19,8 @@ + #include <net/route.h> + #include <net/ipv6.h> + #include <net/ip6_fib.h> ++#include <net/flow.h> ++ + #ifdef CONFIG_XFRM_STATISTICS + #include <net/snmp.h> + #endif +@@ -482,6 +484,7 @@ struct xfrm_policy + atomic_t refcnt; + struct timer_list timer; + ++ struct flow_cache_object flo; + u32 priority; + u32 index; + struct xfrm_selector selector; +diff --git a/net/core/flow.c b/net/core/flow.c +index 1d27ca6..521df52 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -26,17 +26,16 @@ + #include <linux/security.h> + + struct flow_cache_entry { +- struct flow_cache_entry *next; +- u16 family; +- u8 dir; +- u32 genid; +- struct flowi key; +- void *object; +- atomic_t *object_ref; ++ struct flow_cache_entry *next; ++ u16 family; ++ u8 dir; ++ u32 genid; ++ struct flowi key; ++ struct flow_cache_object *object; + }; + + struct flow_cache_percpu { +- struct flow_cache_entry ** hash_table; ++ struct flow_cache_entry **hash_table; + int hash_count; + u32 hash_rnd; + int hash_rnd_recalc; +@@ -44,7 +43,7 @@ struct flow_cache_percpu { + }; + + struct flow_flush_info { +- struct flow_cache * cache; ++ struct flow_cache *cache; + atomic_t cpuleft; + struct completion completion; + }; +@@ -52,7 +51,7 @@ struct flow_flush_info { + struct flow_cache { + u32 hash_shift; + unsigned long order; +- struct flow_cache_percpu * percpu; ++ struct flow_cache_percpu *percpu; + struct notifier_block hotcpu_notifier; + int low_watermark; + int high_watermark; +@@ -78,12 +77,21 @@ static void flow_cache_new_hashrnd(unsigned long arg) + add_timer(&fc->rnd_timer); + } + ++static int flow_entry_valid(struct flow_cache_entry *fle) ++{ ++ if (atomic_read(&flow_cache_genid) != fle->genid) ++ return 0; ++ if (fle->object && !fle->object->ops->check(fle->object)) ++ return 0; ++ return 1; ++} ++ + static void flow_entry_kill(struct flow_cache *fc, + struct flow_cache_percpu *fcp, + struct flow_cache_entry *fle) + { + if (fle->object) +- atomic_dec(fle->object_ref); ++ fle->object->ops->delete(fle->object); + kmem_cache_free(flow_cachep, fle); + fcp->hash_count--; + } +@@ -96,16 +104,18 @@ static void __flow_cache_shrink(struct flow_cache *fc, + int i; + + for (i = 0; i < flow_cache_hash_size(fc); i++) { +- int k = 0; ++ int saved = 0; + + flp = &fcp->hash_table[i]; +- while ((fle = *flp) != NULL && k < shrink_to) { +- k++; +- flp = &fle->next; +- } + while ((fle = *flp) != NULL) { +- *flp = fle->next; +- flow_entry_kill(fc, fcp, fle); ++ if (saved < shrink_to && ++ flow_entry_valid(fle)) { ++ saved++; ++ flp = &fle->next; ++ } else { ++ *flp = fle->next; ++ flow_entry_kill(fc, fcp, fle); ++ } + } + } + } +@@ -166,18 +176,21 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) + return 0; + } + +-void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, +- flow_resolve_t resolver) ++struct flow_cache_object * ++flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, ++ flow_resolve_t resolver, void *ctx) + { + struct flow_cache *fc = &flow_cache_global; + struct flow_cache_percpu *fcp; + struct flow_cache_entry *fle, **head; ++ struct flow_cache_object *flo; + unsigned int hash; + + local_bh_disable(); + fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); + + fle = NULL; ++ flo = NULL; + /* Packet really early in init? Making flow_cache_init a + * pre-smp initcall would solve this. --RR */ + if (!fcp->hash_table) +@@ -185,27 +198,17 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + + if (fcp->hash_rnd_recalc) + flow_new_hash_rnd(fc, fcp); +- hash = flow_hash_code(fc, fcp, key); + ++ hash = flow_hash_code(fc, fcp, key); + head = &fcp->hash_table[hash]; + for (fle = *head; fle; fle = fle->next) { + if (fle->family == family && + fle->dir == dir && +- flow_key_compare(key, &fle->key) == 0) { +- if (fle->genid == atomic_read(&flow_cache_genid)) { +- void *ret = fle->object; +- +- if (ret) +- atomic_inc(fle->object_ref); +- local_bh_enable(); +- +- return ret; +- } ++ flow_key_compare(key, &fle->key) == 0) + break; +- } + } + +- if (!fle) { ++ if (unlikely(!fle)) { + if (fcp->hash_count > fc->high_watermark) + flow_cache_shrink(fc, fcp); + +@@ -219,33 +222,39 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + fle->object = NULL; + fcp->hash_count++; + } ++ } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) { ++ flo = fle->object; ++ if (!flo) ++ goto ret_object; ++ flo = flo->ops->get(flo); ++ if (flo) ++ goto ret_object; ++ } else if (fle->object) { ++ flo = fle->object; ++ flo->ops->delete(flo); ++ fle->object = NULL; + } + + nocache: +- { +- int err; +- void *obj; +- atomic_t *obj_ref; +- +- err = resolver(net, key, family, dir, &obj, &obj_ref); +- +- if (fle && !err) { +- fle->genid = atomic_read(&flow_cache_genid); +- +- if (fle->object) +- atomic_dec(fle->object_ref); +- +- fle->object = obj; +- fle->object_ref = obj_ref; +- if (obj) +- atomic_inc(fle->object_ref); +- } +- local_bh_enable(); +- +- if (err) +- obj = ERR_PTR(err); +- return obj; ++ flo = NULL; ++ if (fle) { ++ flo = fle->object; ++ fle->object = NULL; ++ } ++ flo = resolver(net, key, family, dir, flo, ctx); ++ if (fle) { ++ fle->genid = atomic_read(&flow_cache_genid); ++ if (!IS_ERR(flo)) ++ fle->object = flo; ++ else ++ fle->genid--; ++ } else { ++ if (flo && !IS_ERR(flo)) ++ flo->ops->delete(flo); + } ++ret_object: ++ local_bh_enable(); ++ return flo; + } + + static void flow_cache_flush_tasklet(unsigned long data) +@@ -261,13 +270,12 @@ static void flow_cache_flush_tasklet(unsigned long data) + + fle = fcp->hash_table[i]; + for (; fle; fle = fle->next) { +- unsigned genid = atomic_read(&flow_cache_genid); +- +- if (!fle->object || fle->genid == genid) ++ if (flow_entry_valid(fle)) + continue; + ++ if (fle->object) ++ fle->object->ops->delete(fle->object); + fle->object = NULL; +- atomic_dec(fle->object_ref); + } + } + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 110184f..d1eb2b5 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -216,6 +216,35 @@ expired: + xfrm_pol_put(xp); + } + ++static struct flow_cache_object *xfrm_policy_flo_get(struct flow_cache_object *flo) ++{ ++ struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo); ++ ++ if (unlikely(pol->walk.dead)) ++ flo = NULL; ++ else ++ xfrm_pol_hold(pol); ++ ++ return flo; ++} ++ ++static int xfrm_policy_flo_check(struct flow_cache_object *flo) ++{ ++ struct xfrm_policy *pol = container_of(flo, struct xfrm_policy, flo); ++ ++ return !pol->walk.dead; ++} ++ ++static void xfrm_policy_flo_delete(struct flow_cache_object *flo) ++{ ++ xfrm_pol_put(container_of(flo, struct xfrm_policy, flo)); ++} ++ ++static const struct flow_cache_ops xfrm_policy_fc_ops = { ++ .get = xfrm_policy_flo_get, ++ .check = xfrm_policy_flo_check, ++ .delete = xfrm_policy_flo_delete, ++}; + + /* Allocate xfrm_policy. Not used here, it is supposed to be used by pfkeyv2 + * SPD calls. +@@ -236,6 +265,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp) + atomic_set(&policy->refcnt, 1); + setup_timer(&policy->timer, xfrm_policy_timer, + (unsigned long)policy); ++ policy->flo.ops = &xfrm_policy_fc_ops; + } + return policy; + } +@@ -269,9 +299,6 @@ static void xfrm_policy_gc_kill(struct xfrm_policy *policy) + if (del_timer(&policy->timer)) + atomic_dec(&policy->refcnt); + +- if (atomic_read(&policy->refcnt) > 1) +- flow_cache_flush(); +- + xfrm_pol_put(policy); + } + +@@ -658,10 +685,8 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir, + } + write_unlock_bh(&xfrm_policy_lock); + +- if (ret && delete) { +- atomic_inc(&flow_cache_genid); ++ if (ret && delete) + xfrm_policy_kill(ret); +- } + return ret; + } + EXPORT_SYMBOL(xfrm_policy_bysel_ctx); +@@ -699,10 +724,8 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u8 type, int dir, u32 id, + } + write_unlock_bh(&xfrm_policy_lock); + +- if (ret && delete) { +- atomic_inc(&flow_cache_genid); ++ if (ret && delete) + xfrm_policy_kill(ret); +- } + return ret; + } + EXPORT_SYMBOL(xfrm_policy_byid); +@@ -967,32 +990,35 @@ fail: + return ret; + } + +-static int xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, +- u8 dir, void **objp, atomic_t **obj_refp) ++static struct flow_cache_object * ++xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, ++ u8 dir, struct flow_cache_object *old_obj, void *ctx) + { + struct xfrm_policy *pol; +- int err = 0; ++ ++ if (old_obj) ++ xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo)); + + #ifdef CONFIG_XFRM_SUB_POLICY + pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); +- if (IS_ERR(pol)) { +- err = PTR_ERR(pol); +- pol = NULL; +- } +- if (pol || err) +- goto end; ++ if (IS_ERR(pol)) ++ return ERR_CAST(pol); ++ if (pol) ++ goto found; + #endif + pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); +- if (IS_ERR(pol)) { +- err = PTR_ERR(pol); +- pol = NULL; +- } +-#ifdef CONFIG_XFRM_SUB_POLICY +-end: +-#endif +- if ((*objp = (void *) pol) != NULL) +- *obj_refp = &pol->refcnt; +- return err; ++ if (IS_ERR(pol)) ++ return ERR_CAST(pol); ++ if (pol) ++ goto found; ++ return NULL; ++ ++found: ++ /* Resolver returns two references: ++ * one for cache and one for caller of flow_cache_lookup() */ ++ xfrm_pol_hold(pol); ++ ++ return &pol->flo; + } + + static inline int policy_to_flow_dir(int dir) +@@ -1077,8 +1103,6 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir) + pol = __xfrm_policy_unlink(pol, dir); + write_unlock_bh(&xfrm_policy_lock); + if (pol) { +- if (dir < XFRM_POLICY_MAX) +- atomic_inc(&flow_cache_genid); + xfrm_policy_kill(pol); + return 0; + } +@@ -1549,18 +1573,24 @@ restart: + } + + if (!policy) { ++ struct flow_cache_object *flo; ++ + /* To accelerate a bit... */ + if ((dst_orig->flags & DST_NOXFRM) || + !net->xfrm.policy_count[XFRM_POLICY_OUT]) + goto nopol; + +- policy = flow_cache_lookup(net, fl, dst_orig->ops->family, +- dir, xfrm_policy_lookup); +- err = PTR_ERR(policy); +- if (IS_ERR(policy)) { ++ flo = flow_cache_lookup(net, fl, dst_orig->ops->family, ++ dir, xfrm_policy_lookup, NULL); ++ err = PTR_ERR(flo); ++ if (IS_ERR(flo)) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); + goto dropdst; + } ++ if (flo) ++ policy = container_of(flo, struct xfrm_policy, flo); ++ else ++ policy = NULL; + } + + if (!policy) +@@ -1910,9 +1940,16 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, + } + } + +- if (!pol) +- pol = flow_cache_lookup(net, &fl, family, fl_dir, +- xfrm_policy_lookup); ++ if (!pol) { ++ struct flow_cache_object *flo; ++ ++ flo = flow_cache_lookup(net, &fl, family, fl_dir, ++ xfrm_policy_lookup, NULL); ++ if (flo == NULL || IS_ERR(flo)) ++ pol = ERR_CAST(flo); ++ else ++ pol = container_of(flo, struct xfrm_policy, flo); ++ } + + if (IS_ERR(pol)) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR); +-- +1.7.0.2 + diff --git a/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch b/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch new file mode 100644 index 000000000..0d066c84d --- /dev/null +++ b/main/linux-pae/0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch @@ -0,0 +1,1068 @@ +From f89d21648e6dc06db2aeabc8926c270894c41446 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 7 Apr 2010 00:30:05 +0000 +Subject: [PATCH 15/18] xfrm: cache bundles instead of policies for outgoing flows + +__xfrm_lookup() is called for each packet transmitted out of +system. The xfrm_find_bundle() does a linear search which can +kill system performance depending on how many bundles are +required per policy. + +This modifies __xfrm_lookup() to store bundles directly in +the flow cache. If we did not get a hit, we just create a new +bundle instead of doing slow search. This means that we can now +get multiple xfrm_dst's for same flow (on per-cpu basis). + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Signed-off-by: David S. Miller <davem@davemloft.net> +(backported from commit 80c802f3073e84c956846e921e8a0b02dfa3755f) +--- + include/net/xfrm.h | 10 +- + net/ipv4/xfrm4_policy.c | 22 -- + net/ipv6/xfrm6_policy.c | 31 -- + net/xfrm/xfrm_policy.c | 710 +++++++++++++++++++++++++---------------------- + 4 files changed, 383 insertions(+), 390 deletions(-) + +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index 6023a48..d51ef61 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h +@@ -266,7 +266,6 @@ struct xfrm_policy_afinfo { + xfrm_address_t *saddr, + xfrm_address_t *daddr); + int (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr); +- struct dst_entry *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy); + void (*decode_session)(struct sk_buff *skb, + struct flowi *fl, + int reverse); +@@ -485,12 +484,12 @@ struct xfrm_policy + struct timer_list timer; + + struct flow_cache_object flo; ++ atomic_t genid; + u32 priority; + u32 index; + struct xfrm_selector selector; + struct xfrm_lifetime_cfg lft; + struct xfrm_lifetime_cur curlft; +- struct dst_entry *bundles; + struct xfrm_policy_walk_entry walk; + u8 type; + u8 action; +@@ -883,11 +882,15 @@ struct xfrm_dst + struct rt6_info rt6; + } u; + struct dst_entry *route; ++ struct flow_cache_object flo; ++ struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; ++ int num_pols, num_xfrms; + #ifdef CONFIG_XFRM_SUB_POLICY + struct flowi *origin; + struct xfrm_selector *partner; + #endif +- u32 genid; ++ u32 xfrm_genid; ++ u32 policy_genid; + u32 route_mtu_cached; + u32 child_mtu_cached; + u32 route_cookie; +@@ -897,6 +900,7 @@ struct xfrm_dst + #ifdef CONFIG_XFRM + static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) + { ++ xfrm_pols_put(xdst->pols, xdst->num_pols); + dst_release(xdst->route); + if (likely(xdst->u.dst.xfrm)) + xfrm_state_put(xdst->u.dst.xfrm); +diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c +index 7009886..651a3e7 100644 +--- a/net/ipv4/xfrm4_policy.c ++++ b/net/ipv4/xfrm4_policy.c +@@ -60,27 +60,6 @@ static int xfrm4_get_saddr(struct net *net, + return 0; + } + +-static struct dst_entry * +-__xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy) +-{ +- struct dst_entry *dst; +- +- read_lock_bh(&policy->lock); +- for (dst = policy->bundles; dst; dst = dst->next) { +- struct xfrm_dst *xdst = (struct xfrm_dst *)dst; +- if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/ +- xdst->u.rt.fl.fl4_dst == fl->fl4_dst && +- xdst->u.rt.fl.fl4_src == fl->fl4_src && +- xdst->u.rt.fl.fl4_tos == fl->fl4_tos && +- xfrm_bundle_ok(policy, xdst, fl, AF_INET, 0)) { +- dst_clone(dst); +- break; +- } +- } +- read_unlock_bh(&policy->lock); +- return dst; +-} +- + static int xfrm4_get_tos(struct flowi *fl) + { + return fl->fl4_tos; +@@ -258,7 +237,6 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo = { + .dst_ops = &xfrm4_dst_ops, + .dst_lookup = xfrm4_dst_lookup, + .get_saddr = xfrm4_get_saddr, +- .find_bundle = __xfrm4_find_bundle, + .decode_session = _decode_session4, + .get_tos = xfrm4_get_tos, + .init_path = xfrm4_init_path, +diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c +index 3f89ab7..fb2a5b7 100644 +--- a/net/ipv6/xfrm6_policy.c ++++ b/net/ipv6/xfrm6_policy.c +@@ -68,36 +68,6 @@ static int xfrm6_get_saddr(struct net *net, + return 0; + } + +-static struct dst_entry * +-__xfrm6_find_bundle(struct flowi *fl, struct xfrm_policy *policy) +-{ +- struct dst_entry *dst; +- +- /* Still not clear if we should set fl->fl6_{src,dst}... */ +- read_lock_bh(&policy->lock); +- for (dst = policy->bundles; dst; dst = dst->next) { +- struct xfrm_dst *xdst = (struct xfrm_dst*)dst; +- struct in6_addr fl_dst_prefix, fl_src_prefix; +- +- ipv6_addr_prefix(&fl_dst_prefix, +- &fl->fl6_dst, +- xdst->u.rt6.rt6i_dst.plen); +- ipv6_addr_prefix(&fl_src_prefix, +- &fl->fl6_src, +- xdst->u.rt6.rt6i_src.plen); +- if (ipv6_addr_equal(&xdst->u.rt6.rt6i_dst.addr, &fl_dst_prefix) && +- ipv6_addr_equal(&xdst->u.rt6.rt6i_src.addr, &fl_src_prefix) && +- xfrm_bundle_ok(policy, xdst, fl, AF_INET6, +- (xdst->u.rt6.rt6i_dst.plen != 128 || +- xdst->u.rt6.rt6i_src.plen != 128))) { +- dst_clone(dst); +- break; +- } +- } +- read_unlock_bh(&policy->lock); +- return dst; +-} +- + static int xfrm6_get_tos(struct flowi *fl) + { + return 0; +@@ -290,7 +260,6 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = { + .dst_ops = &xfrm6_dst_ops, + .dst_lookup = xfrm6_dst_lookup, + .get_saddr = xfrm6_get_saddr, +- .find_bundle = __xfrm6_find_bundle, + .decode_session = _decode_session6, + .get_tos = xfrm6_get_tos, + .init_path = xfrm6_init_path, +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index d1eb2b5..0379d82 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -37,6 +37,8 @@ + DEFINE_MUTEX(xfrm_cfg_mutex); + EXPORT_SYMBOL(xfrm_cfg_mutex); + ++static DEFINE_SPINLOCK(xfrm_policy_sk_bundle_lock); ++static struct dst_entry *xfrm_policy_sk_bundles; + static DEFINE_RWLOCK(xfrm_policy_lock); + + static DEFINE_RWLOCK(xfrm_policy_afinfo_lock); +@@ -50,6 +52,7 @@ static DEFINE_SPINLOCK(xfrm_policy_gc_lock); + static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family); + static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo); + static void xfrm_init_pmtu(struct dst_entry *dst); ++static int stale_bundle(struct dst_entry *dst); + + static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, + int dir); +@@ -277,8 +280,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) + { + BUG_ON(!policy->walk.dead); + +- BUG_ON(policy->bundles); +- + if (del_timer(&policy->timer)) + BUG(); + +@@ -289,12 +290,7 @@ EXPORT_SYMBOL(xfrm_policy_destroy); + + static void xfrm_policy_gc_kill(struct xfrm_policy *policy) + { +- struct dst_entry *dst; +- +- while ((dst = policy->bundles) != NULL) { +- policy->bundles = dst->next; +- dst_free(dst); +- } ++ atomic_inc(&policy->genid); + + if (del_timer(&policy->timer)) + atomic_dec(&policy->refcnt); +@@ -572,7 +568,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) + struct xfrm_policy *delpol; + struct hlist_head *chain; + struct hlist_node *entry, *newpos; +- struct dst_entry *gc_list; + + write_lock_bh(&xfrm_policy_lock); + chain = policy_hash_bysel(net, &policy->selector, policy->family, dir); +@@ -620,34 +615,6 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) + else if (xfrm_bydst_should_resize(net, dir, NULL)) + schedule_work(&net->xfrm.policy_hash_work); + +- read_lock_bh(&xfrm_policy_lock); +- gc_list = NULL; +- entry = &policy->bydst; +- hlist_for_each_entry_continue(policy, entry, bydst) { +- struct dst_entry *dst; +- +- write_lock(&policy->lock); +- dst = policy->bundles; +- if (dst) { +- struct dst_entry *tail = dst; +- while (tail->next) +- tail = tail->next; +- tail->next = gc_list; +- gc_list = dst; +- +- policy->bundles = NULL; +- } +- write_unlock(&policy->lock); +- } +- read_unlock_bh(&xfrm_policy_lock); +- +- while (gc_list) { +- struct dst_entry *dst = gc_list; +- +- gc_list = dst->next; +- dst_free(dst); +- } +- + return 0; + } + EXPORT_SYMBOL(xfrm_policy_insert); +@@ -990,6 +957,19 @@ fail: + return ret; + } + ++static struct xfrm_policy * ++__xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir) ++{ ++#ifdef CONFIG_XFRM_SUB_POLICY ++ struct xfrm_policy *pol; ++ ++ pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); ++ if (pol != NULL) ++ return pol; ++#endif ++ return xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); ++} ++ + static struct flow_cache_object * + xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, + u8 dir, struct flow_cache_object *old_obj, void *ctx) +@@ -999,21 +979,10 @@ xfrm_policy_lookup(struct net *net, struct flowi *fl, u16 family, + if (old_obj) + xfrm_pol_put(container_of(old_obj, struct xfrm_policy, flo)); + +-#ifdef CONFIG_XFRM_SUB_POLICY +- pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_SUB, fl, family, dir); +- if (IS_ERR(pol)) ++ pol = __xfrm_policy_lookup(net, fl, family, dir); ++ if (pol == NULL || IS_ERR(pol)) + return ERR_CAST(pol); +- if (pol) +- goto found; +-#endif +- pol = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN, fl, family, dir); +- if (IS_ERR(pol)) +- return ERR_CAST(pol); +- if (pol) +- goto found; +- return NULL; + +-found: + /* Resolver returns two references: + * one for cache and one for caller of flow_cache_lookup() */ + xfrm_pol_hold(pol); +@@ -1299,18 +1268,6 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, struct flowi *fl, + * still valid. + */ + +-static struct dst_entry * +-xfrm_find_bundle(struct flowi *fl, struct xfrm_policy *policy, unsigned short family) +-{ +- struct dst_entry *x; +- struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); +- if (unlikely(afinfo == NULL)) +- return ERR_PTR(-EINVAL); +- x = afinfo->find_bundle(fl, policy); +- xfrm_policy_put_afinfo(afinfo); +- return x; +-} +- + static inline int xfrm_get_tos(struct flowi *fl, int family) + { + struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); +@@ -1326,6 +1283,54 @@ static inline int xfrm_get_tos(struct flowi *fl, int family) + return tos; + } + ++static struct flow_cache_object *xfrm_bundle_flo_get(struct flow_cache_object *flo) ++{ ++ struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); ++ struct dst_entry *dst = &xdst->u.dst; ++ ++ if (xdst->route == NULL) { ++ /* Dummy bundle - if it has xfrms we were not ++ * able to build bundle as template resolution failed. ++ * It means we need to try again resolving. */ ++ if (xdst->num_xfrms > 0) ++ return NULL; ++ } else { ++ /* Real bundle */ ++ if (stale_bundle(dst)) ++ return NULL; ++ } ++ ++ dst_hold(dst); ++ return flo; ++} ++ ++static int xfrm_bundle_flo_check(struct flow_cache_object *flo) ++{ ++ struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); ++ struct dst_entry *dst = &xdst->u.dst; ++ ++ if (!xdst->route) ++ return 0; ++ if (stale_bundle(dst)) ++ return 0; ++ ++ return 1; ++} ++ ++static void xfrm_bundle_flo_delete(struct flow_cache_object *flo) ++{ ++ struct xfrm_dst *xdst = container_of(flo, struct xfrm_dst, flo); ++ struct dst_entry *dst = &xdst->u.dst; ++ ++ dst_free(dst); ++} ++ ++static const struct flow_cache_ops xfrm_bundle_fc_ops = { ++ .get = xfrm_bundle_flo_get, ++ .check = xfrm_bundle_flo_check, ++ .delete = xfrm_bundle_flo_delete, ++}; ++ + static inline struct xfrm_dst *xfrm_alloc_dst(int family) + { + struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); +@@ -1338,6 +1343,8 @@ static inline struct xfrm_dst *xfrm_alloc_dst(int family) + + xfrm_policy_put_afinfo(afinfo); + ++ xdst->flo.ops = &xfrm_bundle_fc_ops; ++ + return xdst; + } + +@@ -1375,6 +1382,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, + return err; + } + ++ + /* Allocate chain of dst_entry's, attach known xfrm's, calculate + * all the metrics... Shortly, bundle a bundle. + */ +@@ -1437,7 +1445,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, + dst_hold(dst); + + dst1->xfrm = xfrm[i]; +- xdst->genid = xfrm[i]->genid; ++ xdst->xfrm_genid = xfrm[i]->genid; + + dst1->obsolete = -1; + dst1->flags |= DST_HOST; +@@ -1530,7 +1538,186 @@ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) + #endif + } + +-static int stale_bundle(struct dst_entry *dst); ++static int xfrm_expand_policies(struct flowi *fl, u16 family, ++ struct xfrm_policy **pols, ++ int *num_pols, int *num_xfrms) ++{ ++ int i; ++ ++ if (*num_pols == 0 || !pols[0]) { ++ *num_pols = 0; ++ *num_xfrms = 0; ++ return 0; ++ } ++ if (IS_ERR(pols[0])) ++ return PTR_ERR(pols[0]); ++ ++ *num_xfrms = pols[0]->xfrm_nr; ++ ++#ifdef CONFIG_XFRM_SUB_POLICY ++ if (pols[0] && pols[0]->action == XFRM_POLICY_ALLOW && ++ pols[0]->type != XFRM_POLICY_TYPE_MAIN) { ++ pols[1] = xfrm_policy_lookup_bytype(xp_net(pols[0]), ++ XFRM_POLICY_TYPE_MAIN, ++ fl, family, ++ XFRM_POLICY_OUT); ++ if (pols[1]) { ++ if (IS_ERR(pols[1])) { ++ xfrm_pols_put(pols, *num_pols); ++ return PTR_ERR(pols[1]); ++ } ++ (*num_pols) ++; ++ (*num_xfrms) += pols[1]->xfrm_nr; ++ } ++ } ++#endif ++ for (i = 0; i < *num_pols; i++) { ++ if (pols[i]->action != XFRM_POLICY_ALLOW) { ++ *num_xfrms = -1; ++ break; ++ } ++ } ++ ++ return 0; ++ ++} ++ ++static struct xfrm_dst * ++xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, ++ struct flowi *fl, u16 family, ++ struct dst_entry *dst_orig) ++{ ++ struct net *net = xp_net(pols[0]); ++ struct xfrm_state *xfrm[XFRM_MAX_DEPTH]; ++ struct dst_entry *dst; ++ struct xfrm_dst *xdst; ++ int err; ++ ++ /* Try to instantiate a bundle */ ++ err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family); ++ if (err < 0) { ++ if (err != -EAGAIN) ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); ++ return ERR_PTR(err); ++ } ++ ++ dst = xfrm_bundle_create(pols[0], xfrm, err, fl, dst_orig); ++ if (IS_ERR(dst)) { ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR); ++ return ERR_CAST(dst); ++ } ++ ++ xdst = (struct xfrm_dst *)dst; ++ xdst->num_xfrms = err; ++ if (num_pols > 1) ++ err = xfrm_dst_update_parent(dst, &pols[1]->selector); ++ else ++ err = xfrm_dst_update_origin(dst, fl); ++ if (unlikely(err)) { ++ dst_free(dst); ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); ++ return ERR_PTR(err); ++ } ++ ++ xdst->num_pols = num_pols; ++ memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); ++ xdst->policy_genid = atomic_read(&pols[0]->genid); ++ ++ return xdst; ++} ++ ++static struct flow_cache_object * ++xfrm_bundle_lookup(struct net *net, struct flowi *fl, u16 family, u8 dir, ++ struct flow_cache_object *oldflo, void *ctx) ++{ ++ struct dst_entry *dst_orig = (struct dst_entry *)ctx; ++ struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; ++ struct xfrm_dst *xdst, *new_xdst; ++ int num_pols = 0, num_xfrms = 0, i, err, pol_dead; ++ ++ /* Check if the policies from old bundle are usable */ ++ xdst = NULL; ++ if (oldflo) { ++ xdst = container_of(oldflo, struct xfrm_dst, flo); ++ num_pols = xdst->num_pols; ++ num_xfrms = xdst->num_xfrms; ++ pol_dead = 0; ++ for (i = 0; i < num_pols; i++) { ++ pols[i] = xdst->pols[i]; ++ pol_dead |= pols[i]->walk.dead; ++ } ++ if (pol_dead) { ++ dst_free(&xdst->u.dst); ++ xdst = NULL; ++ num_pols = 0; ++ num_xfrms = 0; ++ oldflo = NULL; ++ } ++ } ++ ++ /* Resolve policies to use if we couldn't get them from ++ * previous cache entry */ ++ if (xdst == NULL) { ++ num_pols = 1; ++ pols[0] = __xfrm_policy_lookup(net, fl, family, dir); ++ err = xfrm_expand_policies(fl, family, pols, ++ &num_pols, &num_xfrms); ++ if (err < 0) ++ goto inc_error; ++ if (num_pols == 0) ++ return NULL; ++ if (num_xfrms <= 0) ++ goto make_dummy_bundle; ++ } ++ ++ new_xdst = xfrm_resolve_and_create_bundle(pols, num_pols, fl, family, dst_orig); ++ if (IS_ERR(new_xdst)) { ++ err = PTR_ERR(new_xdst); ++ if (err != -EAGAIN) ++ goto error; ++ if (oldflo == NULL) ++ goto make_dummy_bundle; ++ dst_hold(&xdst->u.dst); ++ return oldflo; ++ } ++ ++ /* Kill the previous bundle */ ++ if (xdst) { ++ /* The policies were stolen for newly generated bundle */ ++ xdst->num_pols = 0; ++ dst_free(&xdst->u.dst); ++ } ++ ++ /* Flow cache does not have reference, it dst_free()'s, ++ * but we do need to return one reference for original caller */ ++ dst_hold(&new_xdst->u.dst); ++ return &new_xdst->flo; ++ ++make_dummy_bundle: ++ /* We found policies, but there's no bundles to instantiate: ++ * either because the policy blocks, has no transformations or ++ * we could not build template (no xfrm_states).*/ ++ xdst = xfrm_alloc_dst(family); ++ if (IS_ERR(xdst)) { ++ xfrm_pols_put(pols, num_pols); ++ return ERR_CAST(xdst); ++ } ++ xdst->num_pols = num_pols; ++ xdst->num_xfrms = num_xfrms; ++ memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); ++ ++ dst_hold(&xdst->u.dst); ++ return &xdst->flo; ++ ++inc_error: ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); ++error: ++ if (xdst != NULL) ++ dst_free(&xdst->u.dst); ++ else ++ xfrm_pols_put(pols, num_pols); ++ return ERR_PTR(err); ++} + + /* Main function: finds/creates a bundle for given flow. + * +@@ -1540,248 +1727,152 @@ static int stale_bundle(struct dst_entry *dst); + int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl, + struct sock *sk, int flags) + { +- struct xfrm_policy *policy; + struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; +- int npols; +- int pol_dead; +- int xfrm_nr; +- int pi; +- struct xfrm_state *xfrm[XFRM_MAX_DEPTH]; +- struct dst_entry *dst, *dst_orig = *dst_p; +- int nx = 0; +- int err; +- u32 genid; +- u16 family; ++ struct flow_cache_object *flo; ++ struct xfrm_dst *xdst; ++ struct dst_entry *dst, *dst_orig = *dst_p, *route; ++ u16 family = dst_orig->ops->family; + u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT); ++ int i, err, num_pols, num_xfrms, drop_pols = 0; + + restart: +- genid = atomic_read(&flow_cache_genid); +- policy = NULL; +- for (pi = 0; pi < ARRAY_SIZE(pols); pi++) +- pols[pi] = NULL; +- npols = 0; +- pol_dead = 0; +- xfrm_nr = 0; ++ dst = NULL; ++ xdst = NULL; ++ route = NULL; + + if (sk && sk->sk_policy[XFRM_POLICY_OUT]) { +- policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl); +- err = PTR_ERR(policy); +- if (IS_ERR(policy)) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); ++ num_pols = 1; ++ pols[0] = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl); ++ err = xfrm_expand_policies(fl, family, pols, ++ &num_pols, &num_xfrms); ++ if (err < 0) + goto dropdst; ++ ++ if (num_pols) { ++ if (num_xfrms <= 0) { ++ drop_pols = num_pols; ++ goto no_transform; ++ } ++ ++ xdst = xfrm_resolve_and_create_bundle( ++ pols, num_pols, fl, ++ family, dst_orig); ++ if (IS_ERR(xdst)) { ++ xfrm_pols_put(pols, num_pols); ++ err = PTR_ERR(xdst); ++ goto dropdst; ++ } ++ ++ spin_lock_bh(&xfrm_policy_sk_bundle_lock); ++ xdst->u.dst.next = xfrm_policy_sk_bundles; ++ xfrm_policy_sk_bundles = &xdst->u.dst; ++ spin_unlock_bh(&xfrm_policy_sk_bundle_lock); ++ ++ route = xdst->route; + } + } + +- if (!policy) { +- struct flow_cache_object *flo; +- ++ if (xdst == NULL) { + /* To accelerate a bit... */ + if ((dst_orig->flags & DST_NOXFRM) || + !net->xfrm.policy_count[XFRM_POLICY_OUT]) + goto nopol; + +- flo = flow_cache_lookup(net, fl, dst_orig->ops->family, +- dir, xfrm_policy_lookup, NULL); +- err = PTR_ERR(flo); ++ flo = flow_cache_lookup(net, fl, family, dir, ++ xfrm_bundle_lookup, dst_orig); ++ if (flo == NULL) ++ goto nopol; + if (IS_ERR(flo)) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); ++ err = PTR_ERR(flo); + goto dropdst; + } +- if (flo) +- policy = container_of(flo, struct xfrm_policy, flo); +- else +- policy = NULL; ++ xdst = container_of(flo, struct xfrm_dst, flo); ++ ++ num_pols = xdst->num_pols; ++ num_xfrms = xdst->num_xfrms; ++ memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols); ++ route = xdst->route; ++ } ++ ++ dst = &xdst->u.dst; ++ if (route == NULL && num_xfrms > 0) { ++ /* The only case when xfrm_bundle_lookup() returns a ++ * bundle with null route, is when the template could ++ * not be resolved. It means policies are there, but ++ * bundle could not be created, since we don't yet ++ * have the xfrm_state's. We need to wait for KM to ++ * negotiate new SA's or bail out with error.*/ ++ if (net->xfrm.sysctl_larval_drop) { ++ /* EREMOTE tells the caller to generate ++ * a one-shot blackhole route. */ ++ dst_release(dst); ++ xfrm_pols_put(pols, num_pols); ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); ++ return -EREMOTE; ++ } ++ if (flags & XFRM_LOOKUP_WAIT) { ++ DECLARE_WAITQUEUE(wait, current); ++ ++ add_wait_queue(&net->xfrm.km_waitq, &wait); ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule(); ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&net->xfrm.km_waitq, &wait); ++ ++ if (!signal_pending(current)) { ++ dst_release(dst); ++ goto restart; ++ } ++ ++ err = -ERESTART; ++ } else ++ err = -EAGAIN; ++ ++ XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); ++ goto error; + } + +- if (!policy) ++no_transform: ++ if (num_pols == 0) + goto nopol; + +- family = dst_orig->ops->family; +- pols[0] = policy; +- npols ++; +- xfrm_nr += pols[0]->xfrm_nr; +- +- err = -ENOENT; +- if ((flags & XFRM_LOOKUP_ICMP) && !(policy->flags & XFRM_POLICY_ICMP)) ++ if ((flags & XFRM_LOOKUP_ICMP) && ++ !(pols[0]->flags & XFRM_POLICY_ICMP)) { ++ err = -ENOENT; + goto error; ++ } + +- policy->curlft.use_time = get_seconds(); ++ for (i = 0; i < num_pols; i++) ++ pols[i]->curlft.use_time = get_seconds(); + +- switch (policy->action) { +- default: +- case XFRM_POLICY_BLOCK: ++ if (num_xfrms < 0) { + /* Prohibit the flow */ + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK); + err = -EPERM; + goto error; +- +- case XFRM_POLICY_ALLOW: +-#ifndef CONFIG_XFRM_SUB_POLICY +- if (policy->xfrm_nr == 0) { +- /* Flow passes not transformed. */ +- xfrm_pol_put(policy); +- return 0; +- } +-#endif +- +- /* Try to find matching bundle. +- * +- * LATER: help from flow cache. It is optional, this +- * is required only for output policy. +- */ +- dst = xfrm_find_bundle(fl, policy, family); +- if (IS_ERR(dst)) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); +- err = PTR_ERR(dst); +- goto error; +- } +- +- if (dst) +- break; +- +-#ifdef CONFIG_XFRM_SUB_POLICY +- if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) { +- pols[1] = xfrm_policy_lookup_bytype(net, +- XFRM_POLICY_TYPE_MAIN, +- fl, family, +- XFRM_POLICY_OUT); +- if (pols[1]) { +- if (IS_ERR(pols[1])) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR); +- err = PTR_ERR(pols[1]); +- goto error; +- } +- if (pols[1]->action == XFRM_POLICY_BLOCK) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLBLOCK); +- err = -EPERM; +- goto error; +- } +- npols ++; +- xfrm_nr += pols[1]->xfrm_nr; +- } +- } +- +- /* +- * Because neither flowi nor bundle information knows about +- * transformation template size. On more than one policy usage +- * we can realize whether all of them is bypass or not after +- * they are searched. See above not-transformed bypass +- * is surrounded by non-sub policy configuration, too. +- */ +- if (xfrm_nr == 0) { +- /* Flow passes not transformed. */ +- xfrm_pols_put(pols, npols); +- return 0; +- } +- +-#endif +- nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family); +- +- if (unlikely(nx<0)) { +- err = nx; +- if (err == -EAGAIN && net->xfrm.sysctl_larval_drop) { +- /* EREMOTE tells the caller to generate +- * a one-shot blackhole route. +- */ +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); +- xfrm_pol_put(policy); +- return -EREMOTE; +- } +- if (err == -EAGAIN && (flags & XFRM_LOOKUP_WAIT)) { +- DECLARE_WAITQUEUE(wait, current); +- +- add_wait_queue(&net->xfrm.km_waitq, &wait); +- set_current_state(TASK_INTERRUPTIBLE); +- schedule(); +- set_current_state(TASK_RUNNING); +- remove_wait_queue(&net->xfrm.km_waitq, &wait); +- +- nx = xfrm_tmpl_resolve(pols, npols, fl, xfrm, family); +- +- if (nx == -EAGAIN && signal_pending(current)) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); +- err = -ERESTART; +- goto error; +- } +- if (nx == -EAGAIN || +- genid != atomic_read(&flow_cache_genid)) { +- xfrm_pols_put(pols, npols); +- goto restart; +- } +- err = nx; +- } +- if (err < 0) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); +- goto error; +- } +- } +- if (nx == 0) { +- /* Flow passes not transformed. */ +- xfrm_pols_put(pols, npols); +- return 0; +- } +- +- dst = xfrm_bundle_create(policy, xfrm, nx, fl, dst_orig); +- err = PTR_ERR(dst); +- if (IS_ERR(dst)) { +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLEGENERROR); +- goto error; +- } +- +- for (pi = 0; pi < npols; pi++) +- pol_dead |= pols[pi]->walk.dead; +- +- write_lock_bh(&policy->lock); +- if (unlikely(pol_dead || stale_bundle(dst))) { +- /* Wow! While we worked on resolving, this +- * policy has gone. Retry. It is not paranoia, +- * we just cannot enlist new bundle to dead object. +- * We can't enlist stable bundles either. +- */ +- write_unlock_bh(&policy->lock); +- dst_free(dst); +- +- if (pol_dead) +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLDEAD); +- else +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); +- err = -EHOSTUNREACH; +- goto error; +- } +- +- if (npols > 1) +- err = xfrm_dst_update_parent(dst, &pols[1]->selector); +- else +- err = xfrm_dst_update_origin(dst, fl); +- if (unlikely(err)) { +- write_unlock_bh(&policy->lock); +- dst_free(dst); +- XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTBUNDLECHECKERROR); +- goto error; +- } +- +- dst->next = policy->bundles; +- policy->bundles = dst; +- dst_hold(dst); +- write_unlock_bh(&policy->lock); ++ } else if (num_xfrms > 0) { ++ /* Flow transformed */ ++ *dst_p = dst; ++ dst_release(dst_orig); ++ } else { ++ /* Flow passes untransformed */ ++ dst_release(dst); + } +- *dst_p = dst; +- dst_release(dst_orig); +- xfrm_pols_put(pols, npols); ++ok: ++ xfrm_pols_put(pols, drop_pols); + return 0; + ++nopol: ++ if (!(flags & XFRM_LOOKUP_ICMP)) ++ goto ok; ++ err = -ENOENT; + error: +- xfrm_pols_put(pols, npols); ++ dst_release(dst); + dropdst: + dst_release(dst_orig); + *dst_p = NULL; ++ xfrm_pols_put(pols, drop_pols); + return err; +- +-nopol: +- err = -ENOENT; +- if (flags & XFRM_LOOKUP_ICMP) +- goto dropdst; +- return 0; + } + EXPORT_SYMBOL(__xfrm_lookup); + +@@ -2134,71 +2225,24 @@ static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst) + return dst; + } + +-static void prune_one_bundle(struct xfrm_policy *pol, int (*func)(struct dst_entry *), struct dst_entry **gc_list_p) +-{ +- struct dst_entry *dst, **dstp; +- +- write_lock(&pol->lock); +- dstp = &pol->bundles; +- while ((dst=*dstp) != NULL) { +- if (func(dst)) { +- *dstp = dst->next; +- dst->next = *gc_list_p; +- *gc_list_p = dst; +- } else { +- dstp = &dst->next; +- } +- } +- write_unlock(&pol->lock); +-} +- +-static void xfrm_prune_bundles(struct net *net, int (*func)(struct dst_entry *)) ++static void __xfrm_garbage_collect(struct net *net) + { +- struct dst_entry *gc_list = NULL; +- int dir; ++ struct dst_entry *head, *next; + +- read_lock_bh(&xfrm_policy_lock); +- for (dir = 0; dir < XFRM_POLICY_MAX * 2; dir++) { +- struct xfrm_policy *pol; +- struct hlist_node *entry; +- struct hlist_head *table; +- int i; ++ flow_cache_flush(); + +- hlist_for_each_entry(pol, entry, +- &net->xfrm.policy_inexact[dir], bydst) +- prune_one_bundle(pol, func, &gc_list); ++ spin_lock_bh(&xfrm_policy_sk_bundle_lock); ++ head = xfrm_policy_sk_bundles; ++ xfrm_policy_sk_bundles = NULL; ++ spin_unlock_bh(&xfrm_policy_sk_bundle_lock); + +- table = net->xfrm.policy_bydst[dir].table; +- for (i = net->xfrm.policy_bydst[dir].hmask; i >= 0; i--) { +- hlist_for_each_entry(pol, entry, table + i, bydst) +- prune_one_bundle(pol, func, &gc_list); +- } +- } +- read_unlock_bh(&xfrm_policy_lock); +- +- while (gc_list) { +- struct dst_entry *dst = gc_list; +- gc_list = dst->next; +- dst_free(dst); ++ while (head) { ++ next = head->next; ++ dst_free(head); ++ head = next; + } + } + +-static int unused_bundle(struct dst_entry *dst) +-{ +- return !atomic_read(&dst->__refcnt); +-} +- +-static void __xfrm_garbage_collect(struct net *net) +-{ +- xfrm_prune_bundles(net, unused_bundle); +-} +- +-static int xfrm_flush_bundles(struct net *net) +-{ +- xfrm_prune_bundles(net, stale_bundle); +- return 0; +-} +- + static void xfrm_init_pmtu(struct dst_entry *dst) + { + do { +@@ -2256,7 +2300,9 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, + return 0; + if (dst->xfrm->km.state != XFRM_STATE_VALID) + return 0; +- if (xdst->genid != dst->xfrm->genid) ++ if (xdst->xfrm_genid != dst->xfrm->genid) ++ return 0; ++ if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid)) + return 0; + + if (strict && fl && +@@ -2383,7 +2429,7 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void + + switch (event) { + case NETDEV_DOWN: +- xfrm_flush_bundles(dev_net(dev)); ++ __xfrm_garbage_collect(dev_net(dev)); + } + return NOTIFY_DONE; + } +@@ -2714,7 +2760,6 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, + struct xfrm_migrate *m, int num_migrate) + { + struct xfrm_migrate *mp; +- struct dst_entry *dst; + int i, j, n = 0; + + write_lock_bh(&pol->lock); +@@ -2739,10 +2784,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, + sizeof(pol->xfrm_vec[i].saddr)); + pol->xfrm_vec[i].encap_family = mp->new_family; + /* flush bundles */ +- while ((dst = pol->bundles) != NULL) { +- pol->bundles = dst->next; +- dst_free(dst); +- } ++ atomic_inc(&pol->genid); + } + } + +-- +1.7.0.2 + diff --git a/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch b/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch new file mode 100644 index 000000000..4a45c7f40 --- /dev/null +++ b/main/linux-pae/0016-xfrm-remove-policy-garbage-collection.patch @@ -0,0 +1,91 @@ +From 4c53c9239069f48ec9a86f8e596c163b72e8bc4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 7 Apr 2010 00:30:06 +0000 +Subject: [PATCH 16/18] xfrm: remove policy garbage collection + +Policies are now properly reference counted and destroyed from +all code paths. The delayed gc is just an overhead now and can +be removed. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 285ead175c5dd5075cab5b6c94f35a3e6c0a3ae6) +--- + net/xfrm/xfrm_policy.c | 39 +++++---------------------------------- + 1 files changed, 5 insertions(+), 34 deletions(-) + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 0379d82..5606841 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -46,9 +46,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO]; + + static struct kmem_cache *xfrm_dst_cache __read_mostly; + +-static HLIST_HEAD(xfrm_policy_gc_list); +-static DEFINE_SPINLOCK(xfrm_policy_gc_lock); +- + static struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short family); + static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo); + static void xfrm_init_pmtu(struct dst_entry *dst); +@@ -288,32 +285,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) + } + EXPORT_SYMBOL(xfrm_policy_destroy); + +-static void xfrm_policy_gc_kill(struct xfrm_policy *policy) +-{ +- atomic_inc(&policy->genid); +- +- if (del_timer(&policy->timer)) +- atomic_dec(&policy->refcnt); +- +- xfrm_pol_put(policy); +-} +- +-static void xfrm_policy_gc_task(struct work_struct *work) +-{ +- struct xfrm_policy *policy; +- struct hlist_node *entry, *tmp; +- struct hlist_head gc_list; +- +- spin_lock_bh(&xfrm_policy_gc_lock); +- gc_list.first = xfrm_policy_gc_list.first; +- INIT_HLIST_HEAD(&xfrm_policy_gc_list); +- spin_unlock_bh(&xfrm_policy_gc_lock); +- +- hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst) +- xfrm_policy_gc_kill(policy); +-} +-static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task); +- + /* Rule must be locked. Release descentant resources, announce + * entry dead. The rule must be unlinked from lists to the moment. + */ +@@ -322,11 +293,12 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) + { + policy->walk.dead = 1; + +- spin_lock_bh(&xfrm_policy_gc_lock); +- hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); +- spin_unlock_bh(&xfrm_policy_gc_lock); ++ atomic_inc(&policy->genid); + +- schedule_work(&xfrm_policy_gc_work); ++ if (del_timer(&policy->timer)) ++ xfrm_pol_put(policy); ++ ++ xfrm_pol_put(policy); + } + + static unsigned int xfrm_policy_hashmax __read_mostly = 1 * 1024 * 1024; +@@ -2535,7 +2507,6 @@ static void xfrm_policy_fini(struct net *net) + audit_info.sessionid = -1; + audit_info.secid = 0; + xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info); +- flush_work(&xfrm_policy_gc_work); + + WARN_ON(!list_empty(&net->xfrm.policy_all)); + +-- +1.7.0.2 + diff --git a/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch b/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch new file mode 100644 index 000000000..7d17d41ae --- /dev/null +++ b/main/linux-pae/0017-flow-delayed-deletion-of-flow-cache-entries.patch @@ -0,0 +1,231 @@ +From fede05e99e2d860e97bc877b8b77fb9e63f55cc8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 7 Apr 2010 00:30:07 +0000 +Subject: [PATCH 17/18] flow: delayed deletion of flow cache entries + +Speed up lookups by freeing flow cache entries later. After +virtualizing flow cache entry operations, the flow cache may now +end up calling policy or bundle destructor which can be slowish. + +As gc_list is more effective with double linked list, the flow cache +is converted to use common hlist and list macroes where appropriate. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 8e4795605d1e1b39113818ad7c147b8a867a1f6a) +--- + net/core/flow.c | 100 ++++++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 69 insertions(+), 31 deletions(-) + +diff --git a/net/core/flow.c b/net/core/flow.c +index 521df52..1619006 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -26,7 +26,10 @@ + #include <linux/security.h> + + struct flow_cache_entry { +- struct flow_cache_entry *next; ++ union { ++ struct hlist_node hlist; ++ struct list_head gc_list; ++ } u; + u16 family; + u8 dir; + u32 genid; +@@ -35,7 +38,7 @@ struct flow_cache_entry { + }; + + struct flow_cache_percpu { +- struct flow_cache_entry **hash_table; ++ struct hlist_head *hash_table; + int hash_count; + u32 hash_rnd; + int hash_rnd_recalc; +@@ -62,6 +65,9 @@ atomic_t flow_cache_genid = ATOMIC_INIT(0); + static struct flow_cache flow_cache_global; + static struct kmem_cache *flow_cachep; + ++static DEFINE_SPINLOCK(flow_cache_gc_lock); ++static LIST_HEAD(flow_cache_gc_list); ++ + #define flow_cache_hash_size(cache) (1 << (cache)->hash_shift) + #define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) + +@@ -86,38 +92,66 @@ static int flow_entry_valid(struct flow_cache_entry *fle) + return 1; + } + +-static void flow_entry_kill(struct flow_cache *fc, +- struct flow_cache_percpu *fcp, +- struct flow_cache_entry *fle) ++static void flow_entry_kill(struct flow_cache_entry *fle) + { + if (fle->object) + fle->object->ops->delete(fle->object); + kmem_cache_free(flow_cachep, fle); +- fcp->hash_count--; ++} ++ ++static void flow_cache_gc_task(struct work_struct *work) ++{ ++ struct list_head gc_list; ++ struct flow_cache_entry *fce, *n; ++ ++ INIT_LIST_HEAD(&gc_list); ++ spin_lock_bh(&flow_cache_gc_lock); ++ list_splice_tail_init(&flow_cache_gc_list, &gc_list); ++ spin_unlock_bh(&flow_cache_gc_lock); ++ ++ list_for_each_entry_safe(fce, n, &gc_list, u.gc_list) ++ flow_entry_kill(fce); ++} ++static DECLARE_WORK(flow_cache_gc_work, flow_cache_gc_task); ++ ++static void flow_cache_queue_garbage(struct flow_cache_percpu *fcp, ++ int deleted, struct list_head *gc_list) ++{ ++ if (deleted) { ++ fcp->hash_count -= deleted; ++ spin_lock_bh(&flow_cache_gc_lock); ++ list_splice_tail(gc_list, &flow_cache_gc_list); ++ spin_unlock_bh(&flow_cache_gc_lock); ++ schedule_work(&flow_cache_gc_work); ++ } + } + + static void __flow_cache_shrink(struct flow_cache *fc, + struct flow_cache_percpu *fcp, + int shrink_to) + { +- struct flow_cache_entry *fle, **flp; +- int i; ++ struct flow_cache_entry *fle; ++ struct hlist_node *entry, *tmp; ++ LIST_HEAD(gc_list); ++ int i, deleted = 0; + + for (i = 0; i < flow_cache_hash_size(fc); i++) { + int saved = 0; + +- flp = &fcp->hash_table[i]; +- while ((fle = *flp) != NULL) { ++ hlist_for_each_entry_safe(fle, entry, tmp, ++ &fcp->hash_table[i], u.hlist) { + if (saved < shrink_to && + flow_entry_valid(fle)) { + saved++; +- flp = &fle->next; + } else { +- *flp = fle->next; +- flow_entry_kill(fc, fcp, fle); ++ deleted++; ++ hlist_del(&fle->u.hlist); ++ list_add_tail(&fle->u.gc_list, &gc_list); + } + } + } ++ ++ flow_cache_queue_garbage(fcp, deleted, &gc_list); + } + + static void flow_cache_shrink(struct flow_cache *fc, +@@ -182,7 +216,8 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + { + struct flow_cache *fc = &flow_cache_global; + struct flow_cache_percpu *fcp; +- struct flow_cache_entry *fle, **head; ++ struct flow_cache_entry *fle, *tfle; ++ struct hlist_node *entry; + struct flow_cache_object *flo; + unsigned int hash; + +@@ -200,12 +235,13 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + flow_new_hash_rnd(fc, fcp); + + hash = flow_hash_code(fc, fcp, key); +- head = &fcp->hash_table[hash]; +- for (fle = *head; fle; fle = fle->next) { +- if (fle->family == family && +- fle->dir == dir && +- flow_key_compare(key, &fle->key) == 0) ++ hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { ++ if (tfle->family == family && ++ tfle->dir == dir && ++ flow_key_compare(key, &tfle->key) == 0) { ++ fle = tfle; + break; ++ } + } + + if (unlikely(!fle)) { +@@ -214,12 +250,11 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, + + fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC); + if (fle) { +- fle->next = *head; +- *head = fle; + fle->family = family; + fle->dir = dir; + memcpy(&fle->key, key, sizeof(*key)); + fle->object = NULL; ++ hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); + fcp->hash_count++; + } + } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) { +@@ -262,23 +297,26 @@ static void flow_cache_flush_tasklet(unsigned long data) + struct flow_flush_info *info = (void *)data; + struct flow_cache *fc = info->cache; + struct flow_cache_percpu *fcp; +- int i; ++ struct flow_cache_entry *fle; ++ struct hlist_node *entry, *tmp; ++ LIST_HEAD(gc_list); ++ int i, deleted = 0; + + fcp = per_cpu_ptr(fc->percpu, smp_processor_id()); + for (i = 0; i < flow_cache_hash_size(fc); i++) { +- struct flow_cache_entry *fle; +- +- fle = fcp->hash_table[i]; +- for (; fle; fle = fle->next) { ++ hlist_for_each_entry_safe(fle, entry, tmp, ++ &fcp->hash_table[i], u.hlist) { + if (flow_entry_valid(fle)) + continue; + +- if (fle->object) +- fle->object->ops->delete(fle->object); +- fle->object = NULL; ++ deleted++; ++ hlist_del(&fle->u.hlist); ++ list_add_tail(&fle->u.gc_list, &gc_list); + } + } + ++ flow_cache_queue_garbage(fcp, deleted, &gc_list); ++ + if (atomic_dec_and_test(&info->cpuleft)) + complete(&info->completion); + } +@@ -320,7 +358,7 @@ void flow_cache_flush(void) + static void __init flow_cache_cpu_prepare(struct flow_cache *fc, + struct flow_cache_percpu *fcp) + { +- fcp->hash_table = (struct flow_cache_entry **) ++ fcp->hash_table = (struct hlist_head *) + __get_free_pages(GFP_KERNEL|__GFP_ZERO, fc->order); + if (!fcp->hash_table) + panic("NET: failed to allocate flow cache order %lu\n", fc->order); +@@ -354,7 +392,7 @@ static int flow_cache_init(struct flow_cache *fc) + + for (order = 0; + (PAGE_SIZE << order) < +- (sizeof(struct flow_cache_entry *)*flow_cache_hash_size(fc)); ++ (sizeof(struct hlist_head)*flow_cache_hash_size(fc)); + order++) + /* NOTHING */; + fc->order = order; +-- +1.7.0.2 + diff --git a/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch new file mode 100644 index 000000000..6f0dc9128 --- /dev/null +++ b/main/linux-pae/0018-xfrm-Fix-crashes-in-xfrm_lookup.patch @@ -0,0 +1,46 @@ +From e0c0800740cdf64fe7b121c2ef235c01f1957af0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 8 Apr 2010 11:27:42 -0700 +Subject: [PATCH 18/18] xfrm: Fix crashes in xfrm_lookup() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Timo Teräs <timo.teras@iki.fi> + +Happens because CONFIG_XFRM_SUB_POLICY is not enabled, and one of +the helper functions I used did unexpected things in that case. + +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit e4077e018b5ead3de9951fc01d8bf12eeeeeefed) +--- + include/net/xfrm.h | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index d51ef61..280f46f 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h +@@ -738,19 +738,12 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy) + xfrm_policy_destroy(policy); + } + +-#ifdef CONFIG_XFRM_SUB_POLICY + static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) + { + int i; + for (i = npols - 1; i >= 0; --i) + xfrm_pol_put(pols[i]); + } +-#else +-static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) +-{ +- xfrm_pol_put(pols[0]); +-} +-#endif + + extern void __xfrm_state_destroy(struct xfrm_state *); + +-- +1.7.0.2 + diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD index 1f96f01ee..fa5b0431d 100644 --- a/main/linux-pae/APKBUILD +++ b/main/linux-pae/APKBUILD @@ -2,9 +2,9 @@ _flavor=pae pkgname=linux-${_flavor} -pkgver=2.6.32.10 +pkgver=2.6.32.15 _kernver=2.6.32 -pkgrel=1 +pkgrel=0 pkgdesc="Linux kernel with PAE enabled" url=http://www.kernel.org depends="mkinitfs linux-firmware" @@ -14,12 +14,24 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - ip_gre.patch - ip_gre2.patch - arp.patch - xfrm-cache-size-revert.patch - net-git-78f1cd-r8169-fix-broken-register-writes.patch - net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch + 0002-gre-fix-hard-header-destination-address-checking.patch + 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch + 0004-arp-flush-arp-cache-on-device-change.patch + 0007-r8169-Fix-rtl8169_rx_interrupt.patch + 0009-ipsec-Fix-bogus-bundle-flowi.patch + 0010-xfrm-Remove-xfrm_state_genid.patch + 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch + 0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch + 0013-flow-structurize-flow-cache.patch + 0014-flow-virtualize-flow-cache-entry-methods.patch + 0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch + 0016-xfrm-remove-policy-garbage-collection.patch + 0017-flow-delayed-deletion-of-flow-cache-entries.patch + 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch + xfrm-fix-policy-unreferencing-on-larval-drop.patch + r8169-fix-random-mdio_write-failures.patch + r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch + x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch kernelconfig.x86 " subpackages="$pkgname-dev" @@ -33,16 +45,20 @@ prepare() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 fi - for i in ../*.diff ../*.patch; do - [ -f $i ] || continue - msg "Applying $i..." - patch -s -p1 -N < $i || return 1 + # first apply patches in specified order + for i in $source; do + case $i in + *.patch) + msg "Applying $i..." + patch -s -p1 -N < "$srcdir"/$i || return 1 + ;; + esac done mkdir -p "$srcdir"/build cp "$srcdir"/$_config "$srcdir"/build/.config echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor} - make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \ + make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \ silentoldconfig } @@ -55,7 +71,9 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="$CC" || return 1 + make CC="${CC:--gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + || return 1 } package() { @@ -88,7 +106,7 @@ dev() { # external modules, and create the scripts mkdir -p "$dir" cp "$srcdir"/$_config "$dir"/.config - make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \ + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \ silentoldconfig prepare scripts # remove the stuff that poits to real sources. we want 3rd party @@ -120,11 +138,23 @@ dev() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -0f1863836bf96fd0aab128d61eaa5693 patch-2.6.32.10.bz2 -3ef822f3a2723b9a80c3f12954457225 ip_gre.patch -13ca9e91700e459da269c957062bbea7 ip_gre2.patch -4c39a161d918e7f274292ecfd168b891 arp.patch -329fcab881425e001d3243caa4648478 xfrm-cache-size-revert.patch -21ed38773d846097b7315e1e0801d87a net-git-78f1cd-r8169-fix-broken-register-writes.patch -962a6dd7c639612fc8bdaeb836388b0b net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch -bf15e3ee69e03319dab0d59e08b67195 kernelconfig.x86" +5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 +437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch +151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch +776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch +5f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch +cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch +3af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch +9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch +b035114e893883cf67530350678e00f5 0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch +9dea03ec19aaf9a384e4f56f57009257 0013-flow-structurize-flow-cache.patch +fc9ab26abbfec0d3f20000b5e695620b 0014-flow-virtualize-flow-cache-entry-methods.patch +c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch +41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch +3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch +45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch +c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch +ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch +b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch +a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch +970a1dc0f8c6c3e3227a77934eafd68e kernelconfig.x86" diff --git a/main/linux-pae/arp.patch b/main/linux-pae/arp.patch deleted file mode 100644 index d2682690f..000000000 --- a/main/linux-pae/arp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c -index c95cd93..71ab56f 100644 ---- a/net/ipv4/arp.c -+++ b/net/ipv4/arp.c -@@ -1200,6 +1200,9 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo - neigh_changeaddr(&arp_tbl, dev); - rt_cache_flush(dev_net(dev), 0); - break; -+ case NETDEV_CHANGE: -+ neigh_changeaddr(&arp_tbl, dev); -+ break; - default: - break; - } diff --git a/main/linux-pae/ip_gre.patch b/main/linux-pae/ip_gre.patch deleted file mode 100644 index ba5f19b30..000000000 --- a/main/linux-pae/ip_gre.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/ipv4/ip_gre.c.orig -+++ b/net/ipv4/ip_gre.c -@@ -1137,11 +1137,8 @@ - - if (saddr) - memcpy(&iph->saddr, saddr, 4); -- -- if (daddr) { -+ if (daddr) - memcpy(&iph->daddr, daddr, 4); -- return t->hlen; -- } - if (iph->daddr && !ipv4_is_multicast(iph->daddr)) - return t->hlen; - diff --git a/main/linux-pae/ip_gre2.patch b/main/linux-pae/ip_gre2.patch deleted file mode 100644 index 52c44076d..000000000 --- a/main/linux-pae/ip_gre2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- linux-2.6.32/net/ipv4/ip_gre.c.orig -+++ linux-2.6.32/net/ipv4/ip_gre.c -@@ -803,11 +803,13 @@ - tunnel->err_count = 0; - } - -- max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; -+ max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; - - if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| - (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { - struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); -+ if (max_headroom > dev->needed_headroom) -+ dev->needed_headroom = max_headroom; - if (!new_skb) { - ip_rt_put(rt); - stats->tx_dropped++; diff --git a/main/linux-pae/kernelconfig.x86 b/main/linux-pae/kernelconfig.x86 index 2b424ce7b..951f1f886 100644 --- a/main/linux-pae/kernelconfig.x86 +++ b/main/linux-pae/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.10 -# Tue Mar 23 13:08:19 2010 +# Linux kernel version: 2.6.32.15 +# Thu Jun 10 08:10:37 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -311,6 +311,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -3959,7 +3960,65 @@ CONFIG_XEN_DEV_EVTCHN=y CONFIG_XENFS=y CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_SYS_HYPERVISOR=y -# CONFIG_STAGING is not set +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_ET131X is not set +# CONFIG_SLICOSS is not set +# CONFIG_VIDEO_GO7007 is not set +# CONFIG_VIDEO_CX25821 is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_POCH is not set +# CONFIG_OTUS is not set +# CONFIG_RT2860 is not set +# CONFIG_RT2870 is not set +# CONFIG_RT3090 is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_PANEL is not set +# CONFIG_ALTERA_PCIE_CHDMA is not set +# CONFIG_RTL8187SE is not set +# CONFIG_RTL8192SU is not set +# CONFIG_RTL8192E is not set +# CONFIG_TRANZPORT is not set + +# +# Android +# + +# +# Qualcomm MSM Camera And Video +# + +# +# Camera Sensor Selection +# +# CONFIG_INPUT_GPIO is not set +# CONFIG_DST is not set +# CONFIG_POHMELFS is not set +# CONFIG_B3DFG is not set +# CONFIG_IDE_PHISON is not set +# CONFIG_PLAN9AUTH is not set +# CONFIG_LINE6_USB is not set +# CONFIG_DRM_RADEON_KMS is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set +# CONFIG_FB_UDL is not set +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m +# CONFIG_VME_BUS is not set + +# +# RAR Register Driver +# +# CONFIG_RAR_REGISTER is not set +# CONFIG_IIO is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m diff --git a/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch b/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch deleted file mode 100644 index f5f72acc4..000000000 --- a/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 78f1cd02457252e1ffbc6caa44a17424a45286b8 Mon Sep 17 00:00:00 2001 -From: Francois Romieu <romieu@fr.zoreil.com> -Date: Sat, 27 Mar 2010 19:35:46 -0700 -Subject: [PATCH] r8169: fix broken register writes -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7 -though said registers are not even documented as 64-bit registers -- as opposed to the initial TxDescStartAddress ones - but as single -bytes which must be combined into 32 bits at the MMIO read/write -level before being merged into a 64 bit logical entity. - -Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR -registers (aka "multicast is broken for ages on ARM) and to -Timo Teräs <timo.teras@iki.fi> for the MAC registers. - -Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/r8169.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c -index b93fd23..7193afc 100644 ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) - spin_lock_irq(&tp->lock); - - RTL_W8(Cfg9346, Cfg9346_Unlock); -- RTL_W32(MAC0, low); - RTL_W32(MAC4, high); -+ RTL_W32(MAC0, low); - RTL_W8(Cfg9346, Cfg9346_Lock); - - spin_unlock_irq(&tp->lock); -@@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev) - mc_filter[1] = swab32(data); - } - -- RTL_W32(MAR0 + 0, mc_filter[0]); - RTL_W32(MAR0 + 4, mc_filter[1]); -+ RTL_W32(MAR0 + 0, mc_filter[0]); - - RTL_W32(RxConfig, tmp); - --- -1.7.0.3 - diff --git a/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch b/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch deleted file mode 100644 index 250c85d67..000000000 --- a/main/linux-pae/net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch +++ /dev/null @@ -1,119 +0,0 @@ -From c0cd884af045338476b8e69a61fceb3f34ff22f1 Mon Sep 17 00:00:00 2001 -From: Neil Horman <nhorman@redhat.com> -Date: Mon, 29 Mar 2010 13:16:02 -0700 -Subject: [PATCH] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) - -Official patch to fix the r8169 frame length check error. - -Based on this initial thread: -http://marc.info/?l=linux-netdev&m=126202972828626&w=1 -This is the official patch to fix the frame length problems in the r8169 -driver. As noted in the previous thread, while this patch incurs a performance -hit on the driver, its possible to improve performance dynamically by updating -the mtu and rx_copybreak values at runtime to return performance to what it was -for those NICS which are unaffected by the ideosyncracy (if there are any). - -Summary: - - A while back Eric submitted a patch for r8169 in which the proper -allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too -much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A -long time prior to that however, Francois posted -126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize -setting due to the fact that the hardware behaved in odd ways when overlong -frames were received on NIC's supported by this driver. This was mentioned in a -security conference recently: -http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html - -It seems that if we can't enable frame size filtering, then, as Eric correctly -noticed, we can find ourselves DMA-ing too much data to a buffer, causing -corruption. As a result is seems that we are forced to allocate a frame which -is ready to handle a maximally sized receive. - -This obviously has performance issues with it, so to mitigate that issue, this -patch does two things: - -1) Raises the copybreak value to the frame allocation size, which should force -appropriately sized packets to get allocated on rx, rather than a full new 16k -buffer. - -2) This patch only disables frame filtering initially (i.e., during the NIC -open), changing the MTU results in ring buffer allocation of a size in relation -to the new mtu (along with a warning indicating that this is dangerous). - -Because of item (2), individuals who can't cope with the performance hit (or can -otherwise filter frames to prevent the bug), or who have hardware they are sure -is unaffected by this issue, can manually lower the copybreak and reset the mtu -such that performance is restored easily. - -Signed-off-by: Neil Horman <nhorman@redhat.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/r8169.c | 29 ++++++++++++++++++++++++----- - 1 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c -index 7193afc..9674005 100644 ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -186,7 +186,12 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { - - MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); - --static int rx_copybreak = 200; -+/* -+ * we set our copybreak very high so that we don't have -+ * to allocate 16k frames all the time (see note in -+ * rtl8169_open() -+ */ -+static int rx_copybreak = 16383; - static int use_dac; - static struct { - u32 msg_enable; -@@ -3217,9 +3222,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) - } - - static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, -- struct net_device *dev) -+ unsigned int mtu) - { -- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; -+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; -+ -+ if (max_frame != 16383) -+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC" -+ "May lead to frame reception errors!\n"); - - tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE; - } -@@ -3231,7 +3240,17 @@ static int rtl8169_open(struct net_device *dev) - int retval = -ENOMEM; - - -- rtl8169_set_rxbufsize(tp, dev); -+ /* -+ * Note that we use a magic value here, its wierd I know -+ * its done because, some subset of rtl8169 hardware suffers from -+ * a problem in which frames received that are longer than -+ * the size set in RxMaxSize register return garbage sizes -+ * when received. To avoid this we need to turn off filtering, -+ * which is done by setting a value of 16383 in the RxMaxSize register -+ * and allocating 16k frames to handle the largest possible rx value -+ * thats what the magic math below does. -+ */ -+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN); - - /* - * Rx and Tx desscriptors needs 256 bytes alignment. -@@ -3884,7 +3903,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu) - - rtl8169_down(dev); - -- rtl8169_set_rxbufsize(tp, dev); -+ rtl8169_set_rxbufsize(tp, dev->mtu); - - ret = rtl8169_init_ring(dev); - if (ret < 0) --- -1.7.0.3 - diff --git a/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch b/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch new file mode 100644 index 000000000..bd111e877 --- /dev/null +++ b/main/linux-pae/r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch @@ -0,0 +1,56 @@ +From patchwork Wed Jun 9 05:22:10 2010 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: r8169: fix mdio_read and update mdio_write according to hw specs +Date: Tue, 08 Jun 2010 19:22:10 -0000 +From: =?utf-8?b?VGltbyBUZXLDpHMgPHRpbW8udGVyYXNAaWtpLmZpPg==?= +X-Patchwork-Id: 55049 +Message-Id: <1276060930-15697-1-git-send-email-timo.teras@iki.fi> +To: netdev@vger.kernel.org +Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, + Francois Romieu <romieu@fr.zoreil.com>, Hayeswang <hayeswang@realtek.com> + +Realtek confirmed that a 20us delay is needed after mdio_read and +mdio_write operations. Reduce the delay in mdio_write, and add it +to mdio_read too. Also add a comment that the 20us is from hw specs. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Cc: Francois Romieu <romieu@fr.zoreil.com> +Cc: Hayeswang <hayeswang@realtek.com> + +--- +drivers/net/r8169.c | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 03a8318..96b6cfb 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -560,10 +560,10 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) + udelay(25); + } + /* +- * Some configurations require a small delay even after the write +- * completed indication or the next write might fail. ++ * According to hardware specs a 20us delay is required after write ++ * complete indication, but before sending next command. + */ +- udelay(25); ++ udelay(20); + } + + static int mdio_read(void __iomem *ioaddr, int reg_addr) +@@ -583,6 +583,12 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr) + } + udelay(25); + } ++ /* ++ * According to hardware specs a 20us delay is required after read ++ * complete indication, but before sending next command. ++ */ ++ udelay(20); ++ + return value; + } + diff --git a/main/linux-pae/r8169-fix-random-mdio_write-failures.patch b/main/linux-pae/r8169-fix-random-mdio_write-failures.patch new file mode 100644 index 000000000..1e2beadd0 --- /dev/null +++ b/main/linux-pae/r8169-fix-random-mdio_write-failures.patch @@ -0,0 +1,48 @@ +From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Sun, 6 Jun 2010 15:38:47 -0700 +Subject: [PATCH 1/1] r8169: fix random mdio_write failures +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Some configurations need delay between the "write completed" indication +and new write to work reliably. + +Realtek driver seems to use longer delay when polling the "write complete" +bit, so it waits long enough between writes with high probability (but +could probably break too). This patch adds a new udelay to make sure we +wait unconditionally some time after the write complete indication. + +This caused a regression with XID 18000000 boards when the board specific +phy configuration writing many mdio registers was added in commit +2e955856ff (r8169: phy init for the 8169scd). Some of the configration +mdio writes would almost always fail, and depending on failure might leave +the PHY in non-working state. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +Acked-off-by: Francois Romieu <romieu@fr.zoreil.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/r8169.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 217e709..03a8318 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value) + break; + udelay(25); + } ++ /* ++ * Some configurations require a small delay even after the write ++ * completed indication or the next write might fail. ++ */ ++ udelay(25); + } + + static int mdio_read(void __iomem *ioaddr, int reg_addr) +-- +1.7.1 + diff --git a/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch b/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch new file mode 100644 index 000000000..a4f94d7fa --- /dev/null +++ b/main/linux-pae/x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch @@ -0,0 +1,48 @@ +From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001 +From: H. Peter Anvin <hpa@zytor.com> +Date: Wed, 17 Feb 2010 18:32:06 -0800 +Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info + +When we restore the screen content after a mode change, we return the +cursor to its former position. However, we need to also update +boot_params.screen_info accordingly, so that the decompression code +knows where on the screen the cursor is. Just in case the video BIOS +does something extra screwy, read the cursor position back from the +BIOS instead of relying on it doing the right thing. + +While we're at it, make sure we cap the cursor position to the new +screen coordinates. + +Reported-by: Wim Osterholt <wim@djo.tudelft.nl> +Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 +Signed-off-by: H. Peter Anvin <hpa@zytor.com> +--- + arch/x86/boot/video.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c +index f767164..43eda28 100644 +--- a/arch/x86/boot/video.c ++++ b/arch/x86/boot/video.c +@@ -298,11 +298,18 @@ static void restore_screen(void) + } + + /* Restore cursor position */ ++ if (saved.curx >= xs) ++ saved.curx = xs-1; ++ if (saved.cury >= ys) ++ saved.cury = ys-1; ++ + initregs(&ireg); + ireg.ah = 0x02; /* Set cursor position */ + ireg.dh = saved.cury; + ireg.dl = saved.curx; + intcall(0x10, &ireg, NULL); ++ ++ store_cursor_position(); + } + + void set_video(void) +-- +1.7.1 + diff --git a/main/linux-pae/xfrm-cache-size-revert.patch b/main/linux-pae/xfrm-cache-size-revert.patch deleted file mode 100644 index c8fcbd0d7..000000000 --- a/main/linux-pae/xfrm-cache-size-revert.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c -index 74fb2eb..e158860 100644 ---- a/net/ipv4/xfrm4_policy.c -+++ b/net/ipv4/xfrm4_policy.c -@@ -308,7 +308,6 @@ void __init xfrm4_init(int rt_max_size) - * That will let us store an ipsec connection per route table entry, - * and start cleaning when were 1/2 full - */ -- xfrm4_dst_ops.gc_thresh = rt_max_size/2; - #ifdef CONFIG_SYSCTL - sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path, - xfrm4_policy_table); diff --git a/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch new file mode 100644 index 000000000..25dc0dcdc --- /dev/null +++ b/main/linux-pae/xfrm-fix-policy-unreferencing-on-larval-drop.patch @@ -0,0 +1,14 @@ +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 31f4ba4..f4ea3a0 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1805,7 +1805,7 @@ restart: + /* EREMOTE tells the caller to generate + * a one-shot blackhole route. */ + dst_release(dst); +- xfrm_pols_put(pols, num_pols); ++ xfrm_pols_put(pols, drop_pols); + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); + return -EREMOTE; + } + diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 57f7ec060..39b1453de 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=2.6.32.13 +pkgver=2.6.32.15 _kernver=2.6.32 pkgrel=0 @@ -15,7 +15,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - http://vserver.13thfloor.at/Experimental/patch-2.6.32.13-vs2.3.0.36.29.4.diff + http://vserver.13thfloor.at/Experimental/patch-2.6.32.15-vs2.3.0.36.29.4.diff kernelconfig.x86 " subpackages="$pkgname-dev" @@ -50,7 +50,10 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="${CC:-gcc}" || return 1 + make CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + || return 1 + } package() { @@ -115,6 +118,6 @@ dev() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -ba6abb1ffee513a1d4f831599ddae490 patch-2.6.32.13.bz2 -ef893f851b25e3806f24f1460e11f9b5 patch-2.6.32.13-vs2.3.0.36.29.4.diff +5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 +8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff 42ce36a36e7c71ee54761e56d59d17ed kernelconfig.x86" diff --git a/main/ltrace/APKBUILD b/main/ltrace/APKBUILD new file mode 100644 index 000000000..145c2a545 --- /dev/null +++ b/main/ltrace/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=ltrace +pkgver=0.5.3 +pkgrel=0 +pkgdesc="Tracks runtime library calls in dynamically linked programs" +url="http://ltrace.alioth.debian.org/" +license="GPL" +depends= +makedepends="libelf-dev" +subpackages="$pkgname-doc" +source="http://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver.orig.tar.gz" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + || return 1 + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make install DESTDIR="$pkgdir" || return 1 +} +md5sums="3fa7fe715ab879db08bd06d1d59fd90f ltrace_0.5.3.orig.tar.gz" diff --git a/main/lua-alt-getopt/APKBUILD b/main/lua-alt-getopt/APKBUILD new file mode 100644 index 000000000..367097151 --- /dev/null +++ b/main/lua-alt-getopt/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: Natanael Copa <ncopa@alpinlinux.org> +pkgname=lua-alt-getopt +pkgver=0.7.0 +pkgrel=0 +pkgdesc="Lua module for processing options similar to getopt_long(3)" +url="http://luaforge.net/projects/alt-getopt/" +license="MIT" +depends="lua" +makedepends= +install= +subpackages= +source="http://mova.org/~cheusov/pub/lua_alt_getopt/lua-alt-getopt-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + install -Dm644 alt_getopt.lua "$pkgdir"/usr/share/lua/5.1/alt_getopt.lua +} + +md5sums="f504578b1287ea02759add231b972812 lua-alt-getopt-0.7.0.tar.gz" diff --git a/main/lua-stdlib/APKBUILD b/main/lua-stdlib/APKBUILD new file mode 100644 index 000000000..9d9f5a021 --- /dev/null +++ b/main/lua-stdlib/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: Natnae +pkgname=lua-stdlib +pkgver=13 +pkgrel=0 +pkgdesc="Lua library of modules for common programming tasks" +url="http://luaforge.net/projects/stdlib/" +license="MIT/X" +depends= +makedepends= +install= +subpackages="$pkgname-doc" +source="http://luaforge.net/frs/download.php/4581/stdlib-13.tar.gz" + +_builddir="$srcdir"/stdlib +_luashare=/usr/share/lua/5.1 +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + install -d "$pkgdir"/$_luashare + install -m644 modules/*.lua "$pkgdir"/$_luashare/ + mkdir -p "$pkgdir"/usr/share/doc/$pkgname + install -m644 modules/*.html "$pkgdir"/usr/share/doc/$pkgname/ +} + +md5sums="592cbfb622a0a9a7d8c6d7ca6657bc05 stdlib-13.tar.gz" diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index fb136497c..4be2a3f9b 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.64 -pkgrel=1 +pkgver=2.02.66 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" license="GPL" @@ -47,6 +47,6 @@ dm() { mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ } -md5sums="59fc0f7f6703a8c7f12df6b7d2e509fb LVM2.2.02.64.tgz +md5sums="59766571610a4298f8bedf9f73839050 LVM2.2.02.66.tgz 6f65f902cf19f144a42b8d6aceadf395 lvm.initd ec36d5fe4561220304e406c5c797e71f lvm.confd" diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index f37118328..fbe899324 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="http://www.selenic.com/mercurial" @@ -29,4 +29,4 @@ package() { install -Dm644 contrib/vim/HGAnnotate.vim \ "${vimpath}/syntax/HGAnnotate.vim" || return 1 } -md5sums="0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz" +md5sums="db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz" diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index 4b05196ed..d67b1b88b 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=midori -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=0 pkgdesc="A lightweight web browser based on Gtk WebKit" url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -45,4 +45,4 @@ package() { # PAX does not like the JIT paxctl -c -m -p "$pkgdir"/usr/bin/midori } -md5sums="3aeacd04d4d3e5c3bc16824696ff57b2 midori-0.2.5.tar.bz2" +md5sums="249ddb3485d8246e0fda25dd735953f0 midori-0.2.6.tar.bz2" diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index a549978c6..3046c0002 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=mpd -pkgver=0.15.9 -pkgrel=2 +pkgver=0.15.10 +pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" @@ -47,6 +47,6 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="88f7bc0b17eac81d03b24929d12b8aa1 mpd-0.15.9.tar.bz2 +md5sums="fb18fa3ed5ff7e3719536a6603098df5 mpd-0.15.10.tar.bz2 31d1515232d688d610d1664a0fb2a6a0 mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index ff1776fde..492767901 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.46 -pkgrel=1 +pkgver=5.1.47 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" license='GPL' @@ -77,6 +77,6 @@ client() { done } -md5sums="04f7c1422199c73a88a3d408b9161b63 mysql-5.1.46.tar.gz +md5sums="02b9964b3966832f3d6bc87524bfd73f mysql-5.1.47.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD new file mode 100644 index 000000000..37ac05db4 --- /dev/null +++ b/main/nagios/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: Carlo Landmeter <clandmeter at gmail> +# Maintainer: Carlo Landmeter <clandmeter at gmail> +pkgname=nagios +pkgver=3.2.1 +pkgrel=1 +pkgdesc="Popular monitoring tool" +url="http://www.nagios.org/" +license="GPL-2" +depends="perl" +makedepends="gd-dev pkgconfig perl-dev" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +nagios.confd +nagios.initd +lighttpd-nagios.conf" +subpackages="${pkgname}-web" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc/nagios \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --datadir=/usr/share/nagios \ + --localstatedir=/var \ + --bindir=/usr/sbin \ + --sbindir=/usr/lib/nagios/cgi-bin \ + --datadir=/usr/share/nagios/htdocs \ + --libexecdir=/usr/lib/nagios/plugins \ + --localstatedir=/var/nagios \ + --with-nagios-user=nobody \ + --with-nagios-group=nobody \ + --enable-embedded-perl \ + --with-perlcache + make all || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install-config + make DESTDIR="$pkgdir" install-commandmode + + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + + +web() { + #depends="php lighttpd" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/share "$subpkgdir"/usr/ + install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd/nagios.conf +} + +md5sums="d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz +431dfe7403323e247a88b97beade5d78 nagios.confd +2ead8695b32222abe922692664aa9de1 nagios.initd +d63c36f47d26f1f71ae2faf272eec640 lighttpd-nagios.conf" diff --git a/main/nagios/lighttpd-nagios.conf b/main/nagios/lighttpd-nagios.conf new file mode 100644 index 000000000..cb7081d84 --- /dev/null +++ b/main/nagios/lighttpd-nagios.conf @@ -0,0 +1,29 @@ +### +# Sample nagios lighttpd config +### + +server.modules += ("mod_cgi") +server.modules += ("mod_auth") +server.modules += ("mod_alias") + +auth.require += ( "/nagios" => + ( + "method" => "digest", + "realm" => "nagios", + "require" => "valid-user" + ) +) + +$HTTP["url"] =~ "^/nagios/cgi-bin/" { + dir-listing.activate = "disable" + cgi.assign = ( + ".pl" => "/usr/bin/perl", + ".cgi" => "" + ) +} + +alias.url += ( + "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", + "/nagios" => "/usr/share/nagios/htdocs" +) + diff --git a/main/nagios/nagios.confd b/main/nagios/nagios.confd new file mode 100644 index 000000000..0abb80c6e --- /dev/null +++ b/main/nagios/nagios.confd @@ -0,0 +1,9 @@ +# Sample conf.d file for alpine linux + +# +# Specify daemon $OPTS here. +# + +OPTS="" +USER="nobody" +GROUP="nobody" diff --git a/main/nagios/nagios.initd b/main/nagios/nagios.initd new file mode 100644 index 000000000..e0b3bcf0c --- /dev/null +++ b/main/nagios/nagios.initd @@ -0,0 +1,39 @@ +#!/sbin/runscript + +# Sample init.d file for alpine linux. + +NAME=nagios +DAEMON=/usr/sbin/$NAME + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting ${NAME}" + start-stop-daemon --start --quiet --background \ + --make-pidfile --pidfile /var/run/${NAME}.pid \ + --exec ${DAEMON} -- ${OPTS} /etc/nagios/nagios.cfg + eend $? +} + +stop() { + ebegin "Stopping ${NAME}" + start-stop-daemon --stop --quiet \ + --exec ${DAEMON} \ + --pidfile /var/run/${NAME}.pid \ + eend $? +} + +reload() { + ebegin "Reloading ${NAME}" + if ! service_started "${NAME}" ; then + eend 1 "${NAME} is not started" + return 1 + fi + start-stop-daemon --stop --oknodo --signal HUP \ + --exec ${DAEMON} --pidfile /var/run/${NAME}.pid + eend $? +} + diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index 67e6ce8db..1c12ef0c4 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=nano -pkgver=2.2.3 -pkgrel=1 +pkgver=2.2.4 +pkgrel=0 pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." url="http://www.nano-editor.org/" license="GPL" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="91918a484f54f94fedaebe00dc393a50 nano-2.2.3.tar.gz" +md5sums="6304308afb1f7ef4a5e93eb99206632a nano-2.2.4.tar.gz" diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD index 3b6dce216..dfe18d979 100644 --- a/main/ngircd/APKBUILD +++ b/main/ngircd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ngircd -pkgver=15 -pkgrel=2 +pkgver=16 +pkgrel=0 pkgdesc="Next Generation IRC Daemon" url="http://ngircd.barton.de/" license="GPL" @@ -34,5 +34,5 @@ package() { install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -md5sums="c183a85eba6fe51255983848f099c8ae ngircd-15.tar.gz +md5sums="8c9e0382cd982b0ca77c05528ebe28eb ngircd-16.tar.gz 50d8388540a2e3eb0630e8ac6369f394 ngircd.initd" diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD new file mode 100644 index 000000000..38f9d9c4d --- /dev/null +++ b/main/nspr/APKBUILD @@ -0,0 +1,64 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=nspr +pkgver=4.8.4 +pkgrel=0 +pkgdesc="Netscape Portable Runtime" +url="http://www.mozilla.org/projects/nspr/" +license="MPL-1.1 GPL-2 LGPL-2.1" +depends= +subpackages="$pkgname-dev" +source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz + nspr-4.6.1-config-1.patch + nspr-4.7.0-prtime.patch + nspr-4.8-config.patch + nspr-4.8-pkgconfig-gentoo-3.patch + " + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + mkdir build inst + for i in "$srcdir"/*.patch; do + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done + # respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + mozilla/nsprpub/config/rules.mk +} + +build() { + cd "$_builddir"/build + ../mozilla/nsprpub/configure --prefix=/usr \ + || return 1 + make CC="${CC:-gcc}" CXX="${CXX:-g++}" || return 1 +} + +package() { + local file= minor_version=${pkgver#*.} + minor_version=${minor_version%.*} + + cd "$_builddir"/build + make DESTDIR="$pkgdir" install || die "emake install failed" + + cd "$pkgdir"/usr/lib + rm -f *.a + for file in *.so; do + mv ${file} ${file}.${minor_version} || return 1 + ln -s ${file}.${minor_version} ${file} || return 1 + done + + cd "$_builddir"/build/config + install -Dm755 nspr-config "$pkgdir"/usr/bin/nspr-config || return 1 + install -Dm644 nspr.pc "$pkgdir"/usr/lib/pkgconfig/nspr.pc || return 1 + rm -rf "$pkgdir"/usr/bin/prerr.properties \ + "$pkgdir"/usr/bin/compile-et.pl \ + "$pkgdir"/usr/share/aclocal/nspr.m4 \ + "$pkgdir"/usr/include/nspr/md +} + +md5sums="a85bdbe1eb646aa32c785a37d8e3a2f5 nspr-4.8.4.tar.gz +d204a641dd7cbf6751d14dc6b98835f1 nspr-4.6.1-config-1.patch +c48e1f47799c1cff7e3bf46dc0e653f1 nspr-4.7.0-prtime.patch +c790c638a7c9fd1d731272f464f065c6 nspr-4.8-config.patch +5b67b4339be94d0dbc4337a55eabe73a nspr-4.8-pkgconfig-gentoo-3.patch" diff --git a/main/nspr/nspr-4.6.1-config-1.patch b/main/nspr/nspr-4.6.1-config-1.patch new file mode 100644 index 000000000..b919c7930 --- /dev/null +++ b/main/nspr/nspr-4.6.1-config-1.patch @@ -0,0 +1,11 @@ +--- a/mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 ++++ b/mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 +@@ -3893,7 +3893,7 @@ + PR_MD_CSRCS=linux.c + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + # combo is not yet good at debugging inlined diff --git a/main/nspr/nspr-4.7.0-prtime.patch b/main/nspr/nspr-4.7.0-prtime.patch new file mode 100644 index 000000000..74d5534d5 --- /dev/null +++ b/main/nspr/nspr-4.7.0-prtime.patch @@ -0,0 +1,26 @@ +--- a/mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 ++++ b/mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 +@@ -1536,7 +1536,7 @@ + case TT_EET: zone_offset = 2 * 60; break; + case TT_JST: zone_offset = 9 * 60; break; + default: +- PR_ASSERT (0); ++ return PR_FAILURE; + break; + } + } +@@ -1578,11 +1578,12 @@ + struct tm localTime; + time_t secs; + +- PR_ASSERT(result->tm_month > -1 && ++ if (!(result->tm_month > -1 && + result->tm_mday > 0 && + result->tm_hour > -1 && + result->tm_min > -1 && +- result->tm_sec > -1); ++ result->tm_sec > -1)) ++ return PR_FAILURE; + + /* + * To obtain time_t from a tm structure representing the local diff --git a/main/nspr/nspr-4.8-config.patch b/main/nspr/nspr-4.8-config.patch new file mode 100644 index 000000000..4db2517e4 --- /dev/null +++ b/main/nspr/nspr-4.8-config.patch @@ -0,0 +1,47 @@ +--- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ b/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ b/mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ b/mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- a/mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi diff --git a/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch new file mode 100644 index 000000000..2525928db --- /dev/null +++ b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch @@ -0,0 +1,126 @@ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 +@@ -162,3 +162,4 @@ + RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include + RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin + RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib ++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in +--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 +@@ -52,9 +52,10 @@ + + # autoconf.mk must be deleted last (from the top-level directory) + # because it is included by every makefile. +-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config ++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc + + RELEASE_BINS = nspr-config ++RELEASE_PC = nspr.pc + + include $(topsrcdir)/config/config.mk + +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 +@@ -92,13 +92,13 @@ + + # Set variables that may be dependent upon other variables + if test -z "$exec_prefix"; then +- exec_prefix=@exec_prefix@ ++ exec_prefix=`pkg-config --variable=exec_prefix nspr` + fi + if test -z "$includedir"; then +- includedir=@includedir@ ++ includedir=`pkg-config --variable=includedir nspr` + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir} ++Cflags: -I${includedir} ++ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 +@@ -211,7 +211,7 @@ + rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) + +$(LOOP_OVER_DIRS) + +-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) ++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) + ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) + endif +@@ -221,6 +221,9 @@ + ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + endif ++ifdef RELEASE_PC ++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ ++endif + +$(LOOP_OVER_DIRS) + + release:: export +@@ -272,6 +275,23 @@ + fi + cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) + endif ++ifdef RELEASE_PC ++ @echo "Copying pkg-config files to release directory" ++ @if test -z "$(BUILD_NUMBER)"; then \ ++ echo "BUILD_NUMBER must be defined"; \ ++ false; \ ++ else \ ++ true; \ ++ fi ++ @if test ! -d $(RELEASE_PC_DEST); then \ ++ rm -rf $(RELEASE_PC_DEST); \ ++ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ ++ else \ ++ true; \ ++ fi ++ cp $(RELEASE_PC) $(RELEASE_PC_DEST) ++endif ++ + +$(LOOP_OVER_DIRS) + + alltags: +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure +--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 +@@ -6037,6 +6037,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in +--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 +@@ -2871,6 +2871,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD new file mode 100644 index 000000000..c795669ea --- /dev/null +++ b/main/nss/APKBUILD @@ -0,0 +1,119 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=nss +pkgver=3.12.6 +_ver=3_12_6 +pkgrel=0 +pkgdesc="Mozilla Network Security Services" +url="http://www.mozilla.org/projects/security/pki/nss/" +license="MPL GPL" +depends= +makedepends="nspr-dev sqlite-dev zlib-dev perl" +subpackages="$pkgname-dev libnss" +source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz + nss-nolocalsql.patch + nss-no-rpath.patch + nss.pc.in + nss-config.in + add_spi+cacert_ca_certs.patch + ssl-renegotiate-transitional.patch" +depends_dev="nspr-dev" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -Np1 -i ""$srcdir"/add_spi+cacert_ca_certs.patch" || return 1 + patch -Np1 -i ""$srcdir"/ssl-renegotiate-transitional.patch" || return 1 + patch -Np0 -i ""$srcdir"/nss-nolocalsql.patch" || return 1 + patch -Np0 -i ""$srcdir"/nss-no-rpath.patch" || return 1 + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ + mozilla/security/coreconf/rules.mk + +} + +build() { + cd "$_builddir" + unset CFLAGS + unset CXXFLAGS + export BUILD_OPT=1 + export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` + export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + export XCFLAGS="${CFLAGS}" + make -j 1 -C mozilla/security/coreconf || return 1 + make -j 1 -C mozilla/security/dbm || return 1 + make -j 1 -C mozilla/security/nss || return 1 +} + +package() { + cd "$_builddir" + install -m755 -d "$pkgdir"/usr/lib/pkgconfig + install -m755 -d "$pkgdir"/usr/bin + install -m755 -d "$pkgdir"/usr/include/nss + + NSS_VMAJOR=`awk '/#define.*NSS_VMAJOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h ` + msg "DEBUG: $NSS_VMAJOR" + NSS_VMINOR=`awk '/#define.*NSS_VMINOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h` + NSS_VPATCH=`awk '/#define.*NSS_VPATCH"/ {print $3}' mozilla/security/nss/lib/nss/nss.h` + + # pkgconfig files + sed "$srcdir"/nss.pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,$pkgver,g" \ + -e "s,%NSS_VERSION%,$pkgver,g" \ + > "$pkgdir"/usr/lib/pkgconfig/nss.pc \ + || return 1 + ln -sf nss.pc "$pkgdir"/usr/lib/pkgconfig/mozilla-nss.pc || return 1 + chmod 644 "$pkgdir"/usr/lib/pkgconfig/*.pc || return 1 + + # nss-config + sed "$srcdir"/nss-config.in \ + -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > "$pkgdir"/usr/bin/nss-config || return 1 + chmod 755 "$pkgdir"/usr/bin/nss-config || return 1 + local minor=${pkgver#*.} + minor=${minor%.*} + for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ + libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do + install -m755 mozilla/dist/*.OBJ/lib/${file} \ + "$pkgdir"/usr/lib/${file}.$minor || return 1 + ln -s $file.$minor "$pkgdir"/usr/lib/$file + done + install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "$pkgdir"/usr/lib/ \ + || return 1 + install -m644 mozilla/dist/*.OBJ/lib/*.chk "$pkgdir"/usr/lib/ \ + || return 1 + + for file in certutil cmsutil crlutil modutil pk12util shlibsign \ + signtool signver ssltap; do + install -m755 mozilla/dist/*.OBJ/bin/${file} "$pkgdir"/usr/bin/\ + || return 1 + done + install -m644 mozilla/dist/public/nss/*.h "$pkgdir"/usr/include/nss/ \ + || return 1 +} + +libnss() { + pkgdesc="Mozilla Network Security Service libraries" + mkdir -p "$subpkgdir"/usr/ + mv "$pkgdir"/usr/lib "$subpkgdir"/usr +} + +md5sums="da42596665f226de5eb3ecfc1ec57cd1 nss-3.12.6.tar.gz +1d8305dc458d28c6f32746d9132b9873 nss-nolocalsql.patch +e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch +c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in +46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in +a744b499e7da252acd9ac8ff09af3d48 add_spi+cacert_ca_certs.patch +d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch" diff --git a/main/nss/add_spi+cacert_ca_certs.patch b/main/nss/add_spi+cacert_ca_certs.patch new file mode 100644 index 000000000..a8969ee43 --- /dev/null +++ b/main/nss/add_spi+cacert_ca_certs.patch @@ -0,0 +1,1168 @@ +## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds the SPI Inc. and CAcert.org CA certificates + +diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +index 2c6fdab..2fb754c 100644 +--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c ++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -1020,6 +1020,24 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = { + static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_326 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { + { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -1028,7 +1046,7 @@ static const NSSItem nss_builtins_items_0 [] = { + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -21537,6 +21555,531 @@ static const NSSItem nss_builtins_items_321 [] = { + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; ++static const NSSItem nss_builtins_items_322 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" ++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" ++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" ++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" ++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" ++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" ++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" ++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063" ++"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060" ++"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016" ++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" ++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" ++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" ++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" ++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" ++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" ++"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" ++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" ++"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007" ++"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002" ++"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011" ++"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315" ++"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230" ++"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272" ++"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016" ++"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052" ++"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262" ++"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140" ++"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150" ++"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273" ++"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022" ++"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234" ++"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334" ++"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070" ++"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232" ++"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044" ++"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355" ++"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252" ++"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352" ++"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276" ++"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306" ++"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320" ++"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167" ++"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335" ++"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324" ++"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246" ++"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106" ++"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272" ++"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334" ++"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304" ++"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060" ++"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265" ++"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071" ++"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230" ++"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260" ++"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016" ++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" ++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" ++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" ++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" ++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" ++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" ++"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001" ++"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037" ++"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160" ++"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157" ++"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006" ++"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164" ++"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060" ++"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045" ++"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162" ++"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" ++"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102" ++"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165" ++"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164" ++"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040" ++"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167" ++"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006" ++"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001" ++"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201" ++"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275" ++"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234" ++"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323" ++"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073" ++"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140" ++"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353" ++"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160" ++"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334" ++"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231" ++"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116" ++"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145" ++"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031" ++"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363" ++"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330" ++"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367" ++"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260" ++"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223" ++"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335" ++"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026" ++"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005" ++"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361" ++"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371" ++"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246" ++"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206" ++"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153" ++"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344" ++"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143" ++"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362" ++"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226" ++"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175" ++"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305" ++"\103" ++, (PRUint32)1857 } ++}; ++static const NSSItem nss_builtins_items_323 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, ++ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106" ++"\166\316\217\063" ++, (PRUint32)20 }, ++ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153" ++, (PRUint32)16 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_324 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143" ++"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004" ++"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101" ++"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004" ++"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040" ++"\063\040\122\157\157\164" ++, (PRUint32)86 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\001" ++, (PRUint32)3 }, ++ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" ++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" ++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" ++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" ++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" ++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" ++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" ++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065" ++"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060" ++"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022" ++"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156" ++"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164" ++"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157" ++"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143" ++"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164" ++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" ++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" ++"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335" ++"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175" ++"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163" ++"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144" ++"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001" ++"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171" ++"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313" ++"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011" ++"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353" ++"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277" ++"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331" ++"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205" ++"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073" ++"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161" ++"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371" ++"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047" ++"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252" ++"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102" ++"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064" ++"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133" ++"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242" ++"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137" ++"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325" ++"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150" ++"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230" ++"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140" ++"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347" ++"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321" ++"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206" ++"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257" ++"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164" ++"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373" ++"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003" ++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006" ++"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006" ++"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" ++"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162" ++"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034" ++"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162" ++"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003" ++"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001" ++"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002" ++"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101" ++"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160" ++"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206" ++"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241" ++"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072" ++"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135" ++"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253" ++"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364" ++"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172" ++"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302" ++"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214" ++"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074" ++"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154" ++"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025" ++"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352" ++"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231" ++"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213" ++"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325" ++"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242" ++"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214" ++"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027" ++"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057" ++"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224" ++"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134" ++"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356" ++"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005" ++"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355" ++"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143" ++"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123" ++"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243" ++"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005" ++"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156" ++"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317" ++"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360" ++"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101" ++"\322\156\245\033\231\047\200\347\013\251\250\000" ++, (PRUint32)1548 } ++}; ++static const NSSItem nss_builtins_items_325 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, ++ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304" ++"\030\116\052\055" ++, (PRUint32)20 }, ++ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266" ++, (PRUint32)16 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\001" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_326 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" ++, (PRUint32)11 }, ++ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000" ++"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206" ++"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003" ++"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010" ++"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125" ++"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163" ++"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167" ++"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151" ++"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003" ++"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061" ++"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146" ++"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061" ++"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026" ++"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151" ++"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063" ++"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060" ++"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125" ++"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023" ++"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004" ++"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061" ++"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141" ++"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143" ++"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125" ++"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036" ++"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151" ++"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045" ++"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150" ++"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156" ++"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" ++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" ++"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051" ++"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074" ++"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271" ++"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240" ++"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321" ++"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265" ++"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175" ++"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375" ++"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161" ++"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342" ++"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172" ++"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056" ++"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247" ++"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310" ++"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361" ++"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356" ++"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110" ++"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151" ++"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316" ++"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307" ++"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320" ++"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205" ++"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123" ++"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154" ++"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275" ++"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356" ++"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250" ++"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204" ++"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147" ++"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305" ++"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057" ++"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124" ++"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060" ++"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161" ++"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122" ++"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346" ++"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102" ++"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061" ++"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016" ++"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025" ++"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141" ++"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037" ++"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040" ++"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061" ++"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141" ++"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103" ++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" ++"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015" ++"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100" ++"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216" ++"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377" ++"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206" ++"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035" ++"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102" ++"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151" ++"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164" ++"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102" ++"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141" ++"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055" ++"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206" ++"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057" ++"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143" ++"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125" ++"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164" ++"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016" ++"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015" ++"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002" ++"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162" ++"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030" ++"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255" ++"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065" ++"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014" ++"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306" ++"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051" ++"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017" ++"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302" ++"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213" ++"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017" ++"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162" ++"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152" ++"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357" ++"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266" ++"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104" ++"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177" ++"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253" ++"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206" ++"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217" ++"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265" ++"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225" ++"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140" ++"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207" ++"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252" ++"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340" ++"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254" ++"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275" ++"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132" ++"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151" ++"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005" ++"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004" ++"\243\140" ++, (PRUint32)2066 } ++}; ++static const NSSItem nss_builtins_items_327 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, ++ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044" ++"\251\220\103\034" ++, (PRUint32)20 }, ++ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170" ++, (PRUint32)16 }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" ++, (PRUint32)11 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; + + builtinsInternalObject + nss_builtins_data[] = { +@@ -21863,11 +22406,17 @@ nss_builtins_data[] = { + { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} }, + { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} }, + { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} }, +- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} } ++ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }, ++ { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} }, ++ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} }, ++ { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, ++ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, ++ { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, ++ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +- nss_builtins_nObjects = 321+1; ++ nss_builtins_nObjects = 327+1; + #else +- nss_builtins_nObjects = 321; ++ nss_builtins_nObjects = 327; + #endif /* DEBUG */ +diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +index 22ed023..a8b94dd 100644 +--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt ++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +@@ -22200,3 +22200,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 1 Root CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 ++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 ++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 ++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 ++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 ++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 ++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 ++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 ++\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 ++\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 ++\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 ++\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 ++\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 ++\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 ++\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 ++\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 ++\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 ++\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 ++\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 ++\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 ++\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 ++\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 ++\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 ++\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 ++\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 ++\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 ++\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 ++\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 ++\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 ++\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 ++\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 ++\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 ++\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 ++\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 ++\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 ++\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 ++\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 ++\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 ++\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 ++\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 ++\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 ++\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 ++\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 ++\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 ++\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 ++\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 ++\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 ++\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 ++\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 ++\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 ++\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 ++\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 ++\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 ++\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 ++\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 ++\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 ++\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 ++\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 ++\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 ++\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 ++\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 ++\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 ++\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 ++\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 ++\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 ++\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 ++\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 ++\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 ++\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 ++\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 ++\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 ++\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 ++\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 ++\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 ++\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 ++\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 ++\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 ++\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 ++\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 ++\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 ++\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 ++\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 ++\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 ++\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 ++\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 ++\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 ++\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 ++\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 ++\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 ++\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 ++\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 ++\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 ++\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 ++\103 ++END ++ ++# Trust for Certificate "CAcert.org Class 1 Root CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 ++\166\316\217\063 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 3 Root CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 ++\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 ++\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 ++\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 ++\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 ++\063\040\122\157\157\164 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\001 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 ++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 ++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 ++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 ++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 ++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 ++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 ++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 ++\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 ++\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 ++\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 ++\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 ++\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 ++\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 ++\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 ++\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 ++\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 ++\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 ++\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 ++\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 ++\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 ++\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 ++\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 ++\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 ++\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 ++\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 ++\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 ++\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 ++\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 ++\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 ++\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 ++\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 ++\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 ++\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 ++\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 ++\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 ++\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 ++\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 ++\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 ++\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 ++\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 ++\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 ++\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 ++\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 ++\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 ++\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 ++\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 ++\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 ++\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 ++\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 ++\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 ++\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 ++\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 ++\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 ++\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 ++\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 ++\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 ++\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 ++\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 ++\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 ++\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 ++\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 ++\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 ++\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 ++\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 ++\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 ++\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 ++\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 ++\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 ++\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 ++\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 ++\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 ++\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 ++\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 ++\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 ++\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 ++\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 ++\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 ++\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 ++\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 ++\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 ++\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 ++\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 ++\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 ++\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 ++\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 ++\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 ++\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 ++\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 ++\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 ++\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 ++\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 ++\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 ++\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 ++\322\156\245\033\231\047\200\347\013\251\250\000 ++END ++ ++# Trust for Certificate "CAcert.org Class 3 Root CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 ++\030\116\052\055 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\001 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 ++\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 ++\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 ++\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 ++\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 ++\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 ++\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 ++\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 ++\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 ++\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 ++\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 ++\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 ++\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 ++\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 ++\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 ++\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 ++\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 ++\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 ++\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 ++\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 ++\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 ++\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 ++\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 ++\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 ++\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 ++\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 ++\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 ++\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 ++\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 ++\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 ++\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 ++\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 ++\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 ++\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 ++\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 ++\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 ++\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 ++\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 ++\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 ++\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 ++\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 ++\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 ++\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 ++\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 ++\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 ++\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 ++\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 ++\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 ++\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 ++\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 ++\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 ++\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 ++\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 ++\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 ++\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 ++\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 ++\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 ++\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 ++\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 ++\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 ++\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 ++\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 ++\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 ++\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 ++\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 ++\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 ++\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 ++\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 ++\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 ++\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 ++\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 ++\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 ++\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 ++\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 ++\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 ++\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 ++\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 ++\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 ++\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 ++\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 ++\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 ++\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 ++\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 ++\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 ++\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 ++\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 ++\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 ++\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 ++\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 ++\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 ++\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 ++\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 ++\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 ++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 ++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 ++\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 ++\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 ++\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 ++\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 ++\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 ++\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 ++\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 ++\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 ++\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 ++\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 ++\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 ++\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 ++\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 ++\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 ++\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 ++\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 ++\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 ++\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 ++\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 ++\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 ++\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 ++\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 ++\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 ++\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 ++\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 ++\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 ++\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 ++\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 ++\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 ++\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 ++\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 ++\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 ++\243\140 ++END ++ ++# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 ++\251\220\103\034 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/main/nss/nss-config.in b/main/nss/nss-config.in new file mode 100644 index 000000000..f8f893e71 --- /dev/null +++ b/main/nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nss + nssutil + ssl + smime +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + nssutil) + lib_nssutil=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version}" + fi + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/main/nss/nss-no-rpath.patch b/main/nss/nss-no-rpath.patch new file mode 100644 index 000000000..35ea57315 --- /dev/null +++ b/main/nss/nss-no-rpath.patch @@ -0,0 +1,14 @@ +--- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 ++++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 +@@ -52,9 +52,9 @@ + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' + endif + endif + diff --git a/main/nss/nss-nolocalsql.patch b/main/nss/nss-nolocalsql.patch new file mode 100644 index 000000000..dc75a223f --- /dev/null +++ b/main/nss/nss-nolocalsql.patch @@ -0,0 +1,52 @@ +diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile +--- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 ++++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 +@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB + ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. + endif + +-ifndef MOZILLA_CLIENT +-ifndef NSS_USE_SYSTEM_SQLITE +-SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. +-endif +-endif ++#ifndef MOZILLA_CLIENT ++#ifndef NSS_USE_SYSTEM_SQLITE ++#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. ++#endif ++#endif + + ifndef MOZILLA_CLIENT + ifeq ($(OS_ARCH),Linux) +diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn +--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 ++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 +@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def + + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" + +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif + + CSRCS = \ + dbmshim.c \ +diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn +--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 ++++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 +@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def + + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" + +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif + + EXPORTS = \ + secmodt.h \ diff --git a/main/nss/nss.pc.in b/main/nss/nss.pc.in new file mode 100644 index 000000000..d47b9e146 --- /dev/null +++ b/main/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} diff --git a/main/nss/ssl-renegotiate-transitional.patch b/main/nss/ssl-renegotiate-transitional.patch new file mode 100644 index 000000000..f457c5551 --- /dev/null +++ b/main/nss/ssl-renegotiate-transitional.patch @@ -0,0 +1,21 @@ +Enable transitional scheme for ssl renegotiation: + +(from mozilla/security/nss/lib/ssl/ssl.h) +Disallow unsafe renegotiation in server sockets only, but allow clients +to continue to renegotiate with vulnerable servers. +This value should only be used during the transition period when few +servers have been upgraded. + +diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c +index f1d1921..c074360 100644 +--- a/mozilla/security/nss/lib/ssl/sslsock.c ++++ b/mozilla/security/nss/lib/ssl/sslsock.c +@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { + PR_FALSE, /* noLocks */ + PR_FALSE, /* enableSessionTickets */ + PR_FALSE, /* enableDeflate */ +- 2, /* enableRenegotiation (default: requires extension) */ ++ 3, /* enableRenegotiation (default: transitional) */ + PR_FALSE, /* requireSafeNegotiation */ + }; + diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 3fc470ae0..f34efa31e 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssh -pkgver=5.4_p1 +pkgver=5.5_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=2 +pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" license="as-is" @@ -62,6 +62,6 @@ client() { "$subpkgdir"/etc/ssh/ } -md5sums="da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz +md5sums="88633408f4cb1eb11ec7e2ec58b519eb openssh-5.5p1.tar.gz d993cc91e9fab6c6012390874c28af0a sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch b/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch new file mode 100644 index 000000000..514ed0d83 --- /dev/null +++ b/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch @@ -0,0 +1,82 @@ +From 16a40910dd3ae5ab702ee1274f9e2f08362e4474 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 4 Jun 2010 09:48:39 +0300 +Subject: [PATCH 1/3] crypto/hmac: support EVP_MD_CTX_FLAG_ONESHOT and set it properly + +Some engines (namely VIA C7 Padlock) work only if EVP_MD_CTX_FLAG_ONESHOT +is set before final update. This is because some crypto accelerators cannot +perform non-finalizing transform of the digest. + +The usage of EVP_MD_CTX_FLAG_ONESHOT is used semantically slightly +differently here. It is set before the final EVP_DigestUpdate call, not +necessarily before EVP_DigestInit call. This will not cause any problems +though. +--- + crypto/hmac/hmac.c | 14 +++++++++++--- + 1 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c +index 45015fe..7ce2a50 100644 +--- a/crypto/hmac/hmac.c ++++ b/crypto/hmac/hmac.c +@@ -66,6 +66,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, + { + int i,j,reset=0; + unsigned char pad[HMAC_MAX_MD_CBLOCK]; ++ unsigned long flags; + + if (md != NULL) + { +@@ -82,6 +83,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, + OPENSSL_assert(j <= (int)sizeof(ctx->key)); + if (j < len) + { ++ EVP_MD_CTX_set_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT); + if (!EVP_DigestInit_ex(&ctx->md_ctx,md, impl)) + goto err; + if (!EVP_DigestUpdate(&ctx->md_ctx,key,len)) +@@ -105,17 +107,22 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, + { + for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) + pad[i]=0x36^ctx->key[i]; ++ flags = EVP_MD_CTX_test_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT); ++ EVP_MD_CTX_clear_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT); + if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl)) + goto err; + if (!EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md))) + goto err; ++ EVP_MD_CTX_set_flags(&ctx->i_ctx, flags); + + for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) + pad[i]=0x5c^ctx->key[i]; ++ EVP_MD_CTX_clear_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT); + if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl)) + goto err; + if (!EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md))) + goto err; ++ EVP_MD_CTX_set_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT); + } + if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx)) + goto err; +@@ -197,7 +204,8 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, + + if (md == NULL) md=m; + HMAC_CTX_init(&c); +- if (!HMAC_Init(&c,key,key_len,evp_md)) ++ HMAC_CTX_set_flags(&c, EVP_MD_CTX_FLAG_ONESHOT); ++ if (!HMAC_Init_ex(&c,key,key_len,evp_md,NULL)) + goto err; + if (!HMAC_Update(&c,d,n)) + goto err; +@@ -212,6 +220,6 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, + void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) + { + EVP_MD_CTX_set_flags(&ctx->i_ctx, flags); +- EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); +- EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); ++ EVP_MD_CTX_set_flags(&ctx->o_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT); ++ EVP_MD_CTX_set_flags(&ctx->md_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT); + } +-- +1.7.0.4 + diff --git a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch new file mode 100644 index 000000000..8859f4060 --- /dev/null +++ b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch @@ -0,0 +1,392 @@ +From de61d5881a12b359dfb1b4fbbb53412460196553 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 3 Jun 2010 09:02:13 +0300 +Subject: [PATCH 2/3] apps/speed: fix digest speed measurement and add hmac-sha1 test + +Merge the common code of testing digest speed, and make it reuse +existing context. Context creation can be heavy operation, and it's +speed depends on if engine is used or not. As we are measuring the +digest speed, the context creation overhead should not be included +like hmac tests do. + +This also adds test for hmac-sha1 speed. +--- + apps/speed.c | 243 +++++++++++++++++++++------------------------------------- + 1 files changed, 86 insertions(+), 157 deletions(-) + +diff --git a/apps/speed.c b/apps/speed.c +index 539bfff..f64289e 100644 +--- a/apps/speed.c ++++ b/apps/speed.c +@@ -214,7 +214,7 @@ static void print_result(int alg,int run_no,int count,double time_used); + static int do_multi(int multi); + #endif + +-#define ALGOR_NUM 29 ++#define ALGOR_NUM 30 + #define SIZE_NUM 5 + #define RSA_NUM 4 + #define DSA_NUM 3 +@@ -229,9 +229,11 @@ static const char *names[ALGOR_NUM]={ + "aes-128 cbc","aes-192 cbc","aes-256 cbc", + "camellia-128 cbc","camellia-192 cbc","camellia-256 cbc", + "evp","sha256","sha512","whirlpool", +- "aes-128 ige","aes-192 ige","aes-256 ige"}; ++ "aes-128 ige","aes-192 ige","aes-256 ige","hmac(sha1)"}; + static double results[ALGOR_NUM][SIZE_NUM]; + static int lengths[SIZE_NUM]={16,64,256,1024,8*1024}; ++static unsigned char *buf=NULL,*buf2=NULL; ++static long c[ALGOR_NUM][SIZE_NUM]; + #ifndef OPENSSL_NO_RSA + static double rsa_results[RSA_NUM][2]; + #endif +@@ -329,6 +331,66 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen) + } + #endif /* OPENSSL_NO_ECDH */ + ++#ifndef SIGALRM ++#define COND(d) (count < (d)) ++#else ++#define COND(c) (run) ++#endif /* SIGALRM */ ++ ++static void Test_Digest(int digest, const EVP_MD *type) ++{ ++ unsigned char md[EVP_MAX_MD_SIZE]; ++ int j, count; ++ double d=0.0; ++ EVP_MD_CTX ctx; ++ ++ EVP_MD_CTX_init(&ctx); ++ EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_ONESHOT); ++ ++ for (j=0; j<SIZE_NUM; j++) ++ { ++ print_message(names[digest],c[digest][j],lengths[j]); ++ Time_F(START); ++ for (count=0,run=1; COND(c[digest][j]); count++) ++ { ++ EVP_DigestInit_ex(&ctx, type, NULL); ++ EVP_DigestUpdate(&ctx, buf, (unsigned long)lengths[j]); ++ EVP_DigestFinal_ex(&ctx, md, NULL); ++ } ++ d=Time_F(STOP); ++ print_result(digest,j,count,d); ++ } ++ ++ EVP_MD_CTX_cleanup(&ctx); ++} ++ ++static void Test_HMAC(int digest, const EVP_MD *type) ++{ ++ unsigned char md[EVP_MAX_MD_SIZE]; ++ HMAC_CTX hctx; ++ int j, count; ++ double d=0.0; ++ ++ HMAC_CTX_init(&hctx); ++ HMAC_CTX_set_flags(&hctx, EVP_MD_CTX_FLAG_ONESHOT); ++ HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...", ++ 16,type, NULL); ++ ++ for (j=0; j<SIZE_NUM; j++) ++ { ++ print_message(names[digest],c[digest][j],lengths[j]); ++ Time_F(START); ++ for (count=0,run=1; COND(c[digest][j]); count++) ++ { ++ HMAC_Init_ex(&hctx,NULL,0,NULL,NULL); ++ HMAC_Update(&hctx,buf,lengths[j]); ++ HMAC_Final(&hctx,md,NULL); ++ } ++ d=Time_F(STOP); ++ print_result(digest,j,count,d); ++ } ++ HMAC_CTX_cleanup(&hctx); ++} + + int MAIN(int, char **); + +@@ -337,7 +399,6 @@ int MAIN(int argc, char **argv) + #ifndef OPENSSL_NO_ENGINE + ENGINE *e = NULL; + #endif +- unsigned char *buf=NULL,*buf2=NULL; + int mret=1; + long count=0,save_count=0; + int i,j,k; +@@ -348,34 +409,6 @@ int MAIN(int argc, char **argv) + unsigned rsa_num; + #endif + unsigned char md[EVP_MAX_MD_SIZE]; +-#ifndef OPENSSL_NO_MD2 +- unsigned char md2[MD2_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_MDC2 +- unsigned char mdc2[MDC2_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_MD4 +- unsigned char md4[MD4_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_MD5 +- unsigned char md5[MD5_DIGEST_LENGTH]; +- unsigned char hmac[MD5_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_SHA +- unsigned char sha[SHA_DIGEST_LENGTH]; +-#ifndef OPENSSL_NO_SHA256 +- unsigned char sha256[SHA256_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_SHA512 +- unsigned char sha512[SHA512_DIGEST_LENGTH]; +-#endif +-#endif +-#ifndef OPENSSL_NO_WHIRLPOOL +- unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH]; +-#endif +-#ifndef OPENSSL_NO_RIPEMD +- unsigned char rmd160[RIPEMD160_DIGEST_LENGTH]; +-#endif + #ifndef OPENSSL_NO_RC4 + RC4_KEY rc4_ks; + #endif +@@ -473,8 +506,8 @@ int MAIN(int argc, char **argv) + #define D_IGE_128_AES 26 + #define D_IGE_192_AES 27 + #define D_IGE_256_AES 28 ++#define D_HMAC_SHA1 29 + double d=0.0; +- long c[ALGOR_NUM][SIZE_NUM]; + #define R_DSA_512 0 + #define R_DSA_1024 1 + #define R_DSA_2048 2 +@@ -783,6 +816,8 @@ int MAIN(int argc, char **argv) + doit[D_SHA256]=1, + doit[D_SHA512]=1; + else ++ if (strcmp(*argv,"hmac-sha1") == 0) doit[D_HMAC_SHA1]=1; ++ else + #ifndef OPENSSL_NO_SHA256 + if (strcmp(*argv,"sha256") == 0) doit[D_SHA256]=1; + else +@@ -1000,6 +1035,9 @@ int MAIN(int argc, char **argv) + #endif + #ifndef OPENSSL_NO_SHA1 + BIO_printf(bio_err,"sha1 "); ++#ifndef OPENSSL_NO_HMAC ++ BIO_printf(bio_err,"hmac-sha1 "); ++#endif + #endif + #ifndef OPENSSL_NO_SHA256 + BIO_printf(bio_err,"sha256 "); +@@ -1270,6 +1308,7 @@ int MAIN(int argc, char **argv) + c[D_IGE_128_AES][0]=count; + c[D_IGE_192_AES][0]=count; + c[D_IGE_256_AES][0]=count; ++ c[D_HMAC_SHA1][0]=count; + + for (i=1; i<SIZE_NUM; i++) + { +@@ -1283,6 +1322,7 @@ int MAIN(int argc, char **argv) + c[D_SHA256][i]=c[D_SHA256][0]*4*lengths[0]/lengths[i]; + c[D_SHA512][i]=c[D_SHA512][0]*4*lengths[0]/lengths[i]; + c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*lengths[0]/lengths[i]; ++ c[D_HMAC_SHA1][i]=c[D_HMAC_SHA1][0]*4*lengths[0]/lengths[i]; + } + for (i=1; i<SIZE_NUM; i++) + { +@@ -1457,15 +1497,11 @@ int MAIN(int argc, char **argv) + } + #endif + +-#define COND(d) (count < (d)) +-#define COUNT(d) (d) + #else + /* not worth fixing */ + # error "You cannot disable DES on systems without SIGALRM." + #endif /* OPENSSL_NO_DES */ + #else +-#define COND(c) (run) +-#define COUNT(d) (count) + #ifndef _WIN32 + signal(SIGALRM,sig_done); + #endif +@@ -1473,161 +1509,54 @@ int MAIN(int argc, char **argv) + + #ifndef OPENSSL_NO_MD2 + if (doit[D_MD2]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_MD2],c[D_MD2][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_MD2][j]); count++) +- EVP_Digest(buf,(unsigned long)lengths[j],&(md2[0]),NULL,EVP_md2(),NULL); +- d=Time_F(STOP); +- print_result(D_MD2,j,count,d); +- } +- } ++ Test_Digest(D_MD2, EVP_md2()); + #endif + #ifndef OPENSSL_NO_MDC2 + if (doit[D_MDC2]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_MDC2],c[D_MDC2][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_MDC2][j]); count++) +- EVP_Digest(buf,(unsigned long)lengths[j],&(mdc2[0]),NULL,EVP_mdc2(),NULL); +- d=Time_F(STOP); +- print_result(D_MDC2,j,count,d); +- } +- } ++ Test_Digest(D_MDC2, EVP_mdc2()); + #endif + + #ifndef OPENSSL_NO_MD4 + if (doit[D_MD4]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_MD4],c[D_MD4][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_MD4][j]); count++) +- EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md4[0]),NULL,EVP_md4(),NULL); +- d=Time_F(STOP); +- print_result(D_MD4,j,count,d); +- } +- } ++ Test_Digest(D_MD4, EVP_md4()); + #endif + + #ifndef OPENSSL_NO_MD5 + if (doit[D_MD5]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_MD5],c[D_MD5][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_MD5][j]); count++) +- EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md5[0]),NULL,EVP_get_digestbyname("md5"),NULL); +- d=Time_F(STOP); +- print_result(D_MD5,j,count,d); +- } +- } ++ Test_Digest(D_MD5, EVP_md5()); + #endif + + #if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_HMAC) + if (doit[D_HMAC]) +- { +- HMAC_CTX hctx; +- +- HMAC_CTX_init(&hctx); +- HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...", +- 16,EVP_md5(), NULL); +- +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_HMAC],c[D_HMAC][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_HMAC][j]); count++) +- { +- HMAC_Init_ex(&hctx,NULL,0,NULL,NULL); +- HMAC_Update(&hctx,buf,lengths[j]); +- HMAC_Final(&hctx,&(hmac[0]),NULL); +- } +- d=Time_F(STOP); +- print_result(D_HMAC,j,count,d); +- } +- HMAC_CTX_cleanup(&hctx); +- } ++ Test_HMAC(D_HMAC, EVP_md5()); ++#endif ++#if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_HMAC) ++ if (doit[D_HMAC_SHA1]) ++ Test_HMAC(D_HMAC_SHA1, EVP_sha1()); + #endif + #ifndef OPENSSL_NO_SHA + if (doit[D_SHA1]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_SHA1],c[D_SHA1][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_SHA1][j]); count++) +- EVP_Digest(buf,(unsigned long)lengths[j],&(sha[0]),NULL,EVP_sha1(),NULL); +- d=Time_F(STOP); +- print_result(D_SHA1,j,count,d); +- } +- } ++ Test_Digest(D_SHA1, EVP_sha1()); + + #ifndef OPENSSL_NO_SHA256 + if (doit[D_SHA256]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_SHA256],c[D_SHA256][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_SHA256][j]); count++) +- SHA256(buf,lengths[j],sha256); +- d=Time_F(STOP); +- print_result(D_SHA256,j,count,d); +- } +- } ++ Test_Digest(D_SHA256, EVP_sha256()); + #endif + + #ifndef OPENSSL_NO_SHA512 + if (doit[D_SHA512]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_SHA512],c[D_SHA512][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_SHA512][j]); count++) +- SHA512(buf,lengths[j],sha512); +- d=Time_F(STOP); +- print_result(D_SHA512,j,count,d); +- } +- } ++ Test_Digest(D_SHA512, EVP_sha512()); + #endif + #endif + + #ifndef OPENSSL_NO_WHIRLPOOL + if (doit[D_WHIRLPOOL]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_WHIRLPOOL],c[D_WHIRLPOOL][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_WHIRLPOOL][j]); count++) +- WHIRLPOOL(buf,lengths[j],whirlpool); +- d=Time_F(STOP); +- print_result(D_WHIRLPOOL,j,count,d); +- } +- } ++ Test_Digest(D_WHIRLPOOL, EVP_whirlpool()); + #endif + + #ifndef OPENSSL_NO_RIPEMD + if (doit[D_RMD160]) +- { +- for (j=0; j<SIZE_NUM; j++) +- { +- print_message(names[D_RMD160],c[D_RMD160][j],lengths[j]); +- Time_F(START); +- for (count=0,run=1; COND(c[D_RMD160][j]); count++) +- EVP_Digest(buf,(unsigned long)lengths[j],&(rmd160[0]),NULL,EVP_ripemd160(),NULL); +- d=Time_F(STOP); +- print_result(D_RMD160,j,count,d); +- } +- } ++ Test_Digest(D_RMD160, EVP_ripemd160()); + #endif + #ifndef OPENSSL_NO_RC4 + if (doit[D_RC4]) +-- +1.7.0.4 + diff --git a/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch b/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch new file mode 100644 index 000000000..b25de7c16 --- /dev/null +++ b/main/openssl/0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch @@ -0,0 +1,701 @@ +From 11e9d19d7c6c3461cbab5e5670d66974cd7cf819 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 4 Jun 2010 15:48:16 +0300 +Subject: [PATCH 3/3] engine/padlock: implement sha1/sha224/sha256 acceleration + +Limited support for VIA C7 that works only when EVP_MD_CTX_FLAG_ONESHOT +is used appropriately (as done by EVP_Digest, and my previous HMAC patch). + +Full support for VIA Nano including partial transformation. + +Benchmarks from VIA Nano 1.6GHz, done with including the previous HMAC and +apps/speed patches done. From single run, error margin of about 100-200k. + +No padlock + +type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes +sha1 20057.60k 51514.05k 99721.39k 130167.81k 142811.14k +sha256 7757.72k 16907.18k 28937.05k 35181.23k 37568.51k +hmac(sha1) 8582.53k 27644.69k 70402.30k 114602.67k 140167.85k + +With the patch + +sha1 37713.77k 114562.71k 259637.33k 379907.41k 438818.13k +sha256 34262.86k 103233.75k 232476.07k 338386.60k 389860.01k +hmac(sha1) 8424.70k 31475.11k 104036.10k 245559.30k 406667.26k +--- + engines/e_padlock.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 553 insertions(+), 43 deletions(-) + +diff --git a/engines/e_padlock.c b/engines/e_padlock.c +index 381a746..2f8c72a 100644 +--- a/engines/e_padlock.c ++++ b/engines/e_padlock.c +@@ -3,6 +3,9 @@ + * Written by Michal Ludvig <michal@logix.cz> + * http://www.logix.cz/michal + * ++ * SHA support by Timo Teras <timo.teras@iki.fi>. Portions based on ++ * code originally written by Michal Ludvig. ++ * + * Big thanks to Andy Polyakov for a help with optimization, + * assembler fixes, port to MS Windows and a lot of other + * valuable work on this engine! +@@ -74,12 +77,23 @@ + #ifndef OPENSSL_NO_AES + #include <openssl/aes.h> + #endif ++#ifndef OPENSSL_NO_SHA ++#include <openssl/sha.h> ++#endif + #include <openssl/rand.h> + #include <openssl/err.h> + + #ifndef OPENSSL_NO_HW + #ifndef OPENSSL_NO_HW_PADLOCK + ++/* PadLock RNG is disabled by default */ ++#define PADLOCK_NO_RNG 1 ++ ++/* No ASM routines for SHA in MSC yet */ ++#ifdef _MSC_VER ++#define OPENSSL_NO_SHA ++#endif ++ + /* Attempt to have a single source for both 0.9.7 and 0.9.8 :-) */ + #if (OPENSSL_VERSION_NUMBER >= 0x00908000L) + # ifndef OPENSSL_NO_DYNAMIC_ENGINE +@@ -140,58 +154,40 @@ static int padlock_available(void); + static int padlock_init(ENGINE *e); + + /* RNG Stuff */ ++#ifndef PADLOCK_NO_RNG + static RAND_METHOD padlock_rand; +- +-/* Cipher Stuff */ +-#ifndef OPENSSL_NO_AES +-static int padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid); + #endif + + /* Engine names */ + static const char *padlock_id = "padlock"; + static char padlock_name[100]; + +-/* Available features */ +-static int padlock_use_ace = 0; /* Advanced Cryptography Engine */ +-static int padlock_use_rng = 0; /* Random Number Generator */ +-#ifndef OPENSSL_NO_AES +-static int padlock_aes_align_required = 1; +-#endif ++static int padlock_bind_helper(ENGINE *e); + +-/* ===== Engine "management" functions ===== */ +- +-/* Prepare the ENGINE structure for registration */ +-static int +-padlock_bind_helper(ENGINE *e) +-{ +- /* Check available features */ +- padlock_available(); +- +-#if 1 /* disable RNG for now, see commentary in vicinity of RNG code */ +- padlock_use_rng=0; +-#endif +- +- /* Generate a nice engine name with available features */ +- BIO_snprintf(padlock_name, sizeof(padlock_name), +- "VIA PadLock (%s, %s)", +- padlock_use_rng ? "RNG" : "no-RNG", +- padlock_use_ace ? "ACE" : "no-ACE"); ++ /* Available features */ ++enum padlock_flags { ++ PADLOCK_RNG = 0x01, ++ PADLOCK_ACE = 0x02, ++ PADLOCK_ACE2 = 0x04, ++ PADLOCK_PHE = 0x08, ++ PADLOCK_PMM = 0x10, ++ PADLOCK_NANO = 0x20, ++}; ++enum padlock_flags padlock_flags; + +- /* Register everything or return with an error */ +- if (!ENGINE_set_id(e, padlock_id) || +- !ENGINE_set_name(e, padlock_name) || ++#define PADLOCK_HAVE_RNG (padlock_flags & PADLOCK_RNG) ++#define PADLOCK_HAVE_ACE (padlock_flags & (PADLOCK_ACE|PADLOCK_ACE2)) ++#define PADLOCK_HAVE_ACE1 (padlock_flags & PADLOCK_ACE) ++#define PADLOCK_HAVE_ACE2 (padlock_flags & PADLOCK_ACE2) ++#define PADLOCK_HAVE_PHE (padlock_flags & PADLOCK_PHE) ++#define PADLOCK_HAVE_PMM (padlock_flags & PADLOCK_PMM) ++#define PADLOCK_HAVE_NANO (padlock_flags & PADLOCK_NANO) + +- !ENGINE_set_init_function(e, padlock_init) || + #ifndef OPENSSL_NO_AES +- (padlock_use_ace && !ENGINE_set_ciphers (e, padlock_ciphers)) || ++static int padlock_aes_align_required = 1; + #endif +- (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) { +- return 0; +- } + +- /* Everything looks good */ +- return 1; +-} ++/* ===== Engine "management" functions ===== */ + + /* Constructor */ + static ENGINE * +@@ -215,7 +211,7 @@ ENGINE_padlock(void) + static int + padlock_init(ENGINE *e) + { +- return (padlock_use_rng || padlock_use_ace); ++ return padlock_flags; + } + + /* This stuff is needed if this ENGINE is being compiled into a self-contained +@@ -367,10 +363,20 @@ padlock_available(void) + : "+a"(eax), "=d"(edx) : : "ecx"); + + /* Fill up some flags */ +- padlock_use_ace = ((edx & (0x3<<6)) == (0x3<<6)); +- padlock_use_rng = ((edx & (0x3<<2)) == (0x3<<2)); ++ padlock_flags |= ((edx & (0x3<<3)) ? PADLOCK_RNG : 0); ++ padlock_flags |= ((edx & (0x3<<7)) ? PADLOCK_ACE : 0); ++ padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0); ++ padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0); ++ padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0); ++ ++ /* Check for VIA Nano CPU */ ++ eax = 0x00000001; ++ asm volatile ("pushl %%ebx; cpuid; popl %%ebx" ++ : "+a"(eax) : : "ecx", "edx"); ++ if ((eax | 0x000F) == 0x06FF) ++ padlock_flags |= PADLOCK_NANO; + +- return padlock_use_ace + padlock_use_rng; ++ return padlock_flags; + } + + #ifndef OPENSSL_NO_AES +@@ -1159,6 +1165,454 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, + + #endif /* OPENSSL_NO_AES */ + ++#ifndef OPENSSL_NO_SHA ++ ++static inline void ++padlock_copy_bswap(void *dst, void *src, size_t count) ++{ ++ uint32_t *udst = dst, *usrc = src; ++ unsigned int reg; ++ int i = 0; ++ ++ for (i = 0; i < count; i++) { ++ reg = usrc[i]; ++ asm volatile("bswapl %0" : "+&r"(reg)); ++ udst[i] = reg; ++ } ++} ++ ++#define PADLOCK_SHA_ALIGN(dd) (uint32_t*)(((uintptr_t)(dd) + 15) & ~15) ++#define PADLOCK_SHA_HWCTX (128+16) ++ ++static void ++padlock_sha1(void *hwctx, const void *buf, uint32_t total, uint32_t now) ++{ ++ uint32_t pos = total - now; ++ ++ asm volatile ("xsha1" ++ : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total) ++ : : "memory"); ++} ++ ++static void ++padlock_sha1_partial(void *hwctx, const void *buf, uint32_t blocks) ++{ ++ asm volatile ("xsha1" ++ : "+S"(buf), "+D"(hwctx), "+c"(blocks) ++ : "a"(-1) : "memory"); ++} ++ ++static int padlock_sha1_init(EVP_MD_CTX *ctx) ++{ ++ return SHA1_Init(ctx->md_data); ++} ++ ++static int padlock_sha1_update(EVP_MD_CTX *ctx, const void *data, ++ size_t len) ++{ ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ SHA_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ const unsigned char *p = data; ++ unsigned int l = 0; ++ ++ /* Calculate total length (Nl,Nh) is length in bits */ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ total += len; ++ ++ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && ++ (total <= 0xfffffffe)) { ++ if (c->num != 0) { ++ l = (len < SHA_CBLOCK) ? len : SHA_CBLOCK; ++ if (!SHA1_Update(c, data, l)) ++ return 0; ++ p += l; ++ if (c->num != 0) { ++ p = (unsigned char *) c->data; ++ len = c->num; ++ l = 0; ++ } ++ } ++ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); ++ padlock_sha1(aligned, p, total, len - l); ++ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); ++ c->num = -1; ++ return 1; ++ } ++ ++ return SHA1_Update(c, data, len); ++} ++ ++static int padlock_nano_sha1_update(EVP_MD_CTX *ctx, const void *data, ++ size_t len) ++{ ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ SHA_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ unsigned char *p; ++ unsigned int n; ++ ++ /* Calculate total length (Nl,Nh) is length in bits */ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ total += len; ++ c->Nh = total >> 29; ++ c->Nl = (total << 3) & 0xffffffffUL; ++ ++ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); ++ ++ /* Check partial data */ ++ n = c->num; ++ if (n) { ++ p = (unsigned char *) c->data; ++ if (len >= SHA_CBLOCK || len+n >= SHA_CBLOCK) { ++ memcpy(p+n, data, SHA_CBLOCK-n); ++ padlock_sha1_partial(aligned, p, 1); ++ n = SHA_CBLOCK - n; ++ data += n; ++ len -= n; ++ c->num = 0; ++ memset(p, 0, SHA_CBLOCK); ++ } else { ++ memcpy(p+n, data, len); ++ c->num += (unsigned int)len; ++ return 1; ++ } ++ } ++ ++ /* Can we finalize straight away? */ ++ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && ++ (total <= 0xfffffffe)) { ++ padlock_sha1(aligned, data, total, len); ++ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); ++ c->num = -1; ++ return 1; ++ } ++ ++ /* Use nonfinalizing update */ ++ n = len / SHA_CBLOCK; ++ if (n != 0) { ++ padlock_sha1_partial(aligned, data, n); ++ data += n * SHA_CBLOCK; ++ len -= n * SHA_CBLOCK; ++ } ++ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG)); ++ ++ /* Buffer remaining bytes */ ++ if (len) { ++ memcpy(c->data, data, len); ++ c->num = len; ++ } ++ ++ return 1; ++} ++ ++static int padlock_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) ++{ ++ SHA_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ ++ if (c->num == -1) { ++ padlock_copy_bswap(md, &c->h0, 5); ++ c->num = 0; ++ return 1; ++ } ++ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ if (total <= 0xfffffffe) { ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ ++ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG)); ++ padlock_sha1(aligned, c->data, total, c->num); ++ padlock_copy_bswap(md, aligned, 5); ++ c->num = 0; ++ return 1; ++ } ++ ++ return SHA1_Final(md, c); ++} ++ ++static EVP_MD padlock_sha1_md = { ++ NID_sha1, ++ NID_sha1WithRSAEncryption, ++ SHA_DIGEST_LENGTH, ++ 0, ++ padlock_sha1_init, ++ padlock_sha1_update, ++ padlock_sha1_final, ++ NULL, ++ NULL, ++ EVP_PKEY_RSA_method, ++ SHA_CBLOCK, ++ sizeof(SHA_CTX), ++}; ++ ++static EVP_MD padlock_dss1_md = { ++ NID_dsa, ++ NID_dsaWithSHA1, ++ SHA_DIGEST_LENGTH, ++ 0, ++ padlock_sha1_init, ++ padlock_sha1_update, ++ padlock_sha1_final, ++ NULL, ++ NULL, ++ EVP_PKEY_DSA_method, ++ SHA_CBLOCK, ++ sizeof(SHA_CTX), ++}; ++ ++ ++#if !defined(OPENSSL_NO_SHA256) ++ ++static void ++padlock_sha256(void *hwctx, const void *buf, uint32_t total, uint32_t now) ++{ ++ uint32_t pos = total - now; ++ ++ asm volatile ("xsha256" ++ : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total) ++ : : "memory"); ++} ++ ++static void ++padlock_sha256_partial(void *hwctx, const void *buf, uint32_t blocks) ++{ ++ asm volatile ("xsha256" ++ : "+S"(buf), "+D"(hwctx), "+c"(blocks) ++ : "a"(-1) : "memory"); ++} ++ ++static int padlock_sha256_update(EVP_MD_CTX *ctx, const void *data, ++ size_t len) ++{ ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ SHA256_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ const unsigned char *p = data; ++ unsigned int l = 0; ++ ++ /* Calculate total length (Nl,Nh) is length in bits */ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ total += len; ++ ++ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && ++ (total <= 0xfffffffe)) { ++ if (c->num != 0) { ++ l = (len < SHA256_CBLOCK) ? len : SHA256_CBLOCK; ++ if (!SHA256_Update(c, data, l)) ++ return 0; ++ p += l; ++ if (c->num != 0) { ++ p = (unsigned char *) c->data; ++ len = c->num; ++ l = 0; ++ } ++ } ++ memcpy(aligned, c->h, sizeof(c->h)); ++ padlock_sha256(aligned, p, total, len - l); ++ memcpy(c->h, aligned, sizeof(c->h)); ++ c->num = -1; ++ return 1; ++ } ++ ++ return SHA256_Update(c, data, len); ++} ++ ++static int padlock_nano_sha256_update(EVP_MD_CTX *ctx, const void *data, ++ size_t len) ++{ ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ SHA256_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ unsigned char *p; ++ unsigned int n; ++ ++ /* Calculate total length (Nl,Nh) is length in bits */ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ total += len; ++ c->Nh = total >> 29; ++ c->Nl = (total << 3) & 0xffffffffUL; ++ ++ memcpy(aligned, c->h, sizeof(c->h)); ++ ++ /* Check partial data */ ++ n = c->num; ++ if (n) { ++ p = (unsigned char *) c->data; ++ if (len >= SHA256_CBLOCK || len+n >= SHA256_CBLOCK) { ++ memcpy(p+n, data, SHA256_CBLOCK-n); ++ padlock_sha256_partial(aligned, p, 1); ++ n = SHA256_CBLOCK - n; ++ data += n; ++ len -= n; ++ c->num = 0; ++ memset(p, 0, SHA256_CBLOCK); ++ } else { ++ memcpy(p+n, data, len); ++ c->num += (unsigned int)len; ++ return 1; ++ } ++ } ++ ++ /* Can we finalize straight away? */ ++ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) && ++ (total <= 0xfffffffe)) { ++ padlock_sha256(aligned, data, total, len); ++ memcpy(c->h, aligned, sizeof(c->h)); ++ c->num = -1; ++ return 1; ++ } ++ ++ /* Use nonfinalizing update */ ++ n = len / SHA256_CBLOCK; ++ if (n != 0) { ++ padlock_sha256_partial(aligned, data, n); ++ data += n * SHA256_CBLOCK; ++ len -= n * SHA256_CBLOCK; ++ } ++ memcpy(c->h, aligned, sizeof(c->h)); ++ ++ /* Buffer remaining bytes */ ++ if (len) { ++ memcpy(c->data, data, len); ++ c->num = len; ++ } ++ ++ return 1; ++} ++ ++static int padlock_sha256_final(EVP_MD_CTX *ctx, unsigned char *md) ++{ ++ SHA256_CTX *c = ctx->md_data; ++ uint_fast64_t total; ++ ++ if (c->num == -1) { ++ padlock_copy_bswap(md, c->h, sizeof(c->h)/sizeof(c->h[0])); ++ c->num = 0; ++ return 1; ++ } ++ ++ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3); ++ if (total <= 0xfffffffe) { ++ unsigned char hwctx[PADLOCK_SHA_HWCTX]; ++ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx); ++ ++ memcpy(aligned, c->h, sizeof(c->h)); ++ padlock_sha256(aligned, c->data, total, c->num); ++ padlock_copy_bswap(md, aligned, sizeof(c->h)/sizeof(c->h[0])); ++ c->num = 0; ++ return 1; ++ } ++ ++ return SHA256_Final(md, c); ++} ++ ++#if !defined(OPENSSL_NO_SHA224) ++ ++static int padlock_sha224_init(EVP_MD_CTX *ctx) ++{ ++ return SHA224_Init(ctx->md_data); ++} ++ ++static EVP_MD padlock_sha224_md = { ++ NID_sha224, ++ NID_sha224WithRSAEncryption, ++ SHA224_DIGEST_LENGTH, ++ 0, ++ padlock_sha224_init, ++ padlock_sha256_update, ++ padlock_sha256_final, ++ NULL, ++ NULL, ++ EVP_PKEY_RSA_method, ++ SHA_CBLOCK, ++ sizeof(SHA256_CTX), ++}; ++#endif /* !OPENSSL_NO_SHA224 */ ++ ++static int padlock_sha256_init(EVP_MD_CTX *ctx) ++{ ++ return SHA256_Init(ctx->md_data); ++} ++ ++static EVP_MD padlock_sha256_md = { ++ NID_sha256, ++ NID_sha256WithRSAEncryption, ++ SHA256_DIGEST_LENGTH, ++ 0, ++ padlock_sha256_init, ++ padlock_sha256_update, ++ padlock_sha256_final, ++ NULL, ++ NULL, ++ EVP_PKEY_RSA_method, ++ SHA_CBLOCK, ++ sizeof(SHA256_CTX), ++}; ++#endif /* !OPENSSL_NO_SHA256 */ ++ ++static int padlock_digest_nids[] = { ++#if !defined(OPENSSL_NO_SHA) ++ NID_sha1, ++ NID_dsa, ++#endif ++#if !defined(OPENSSL_NO_SHA256) ++#if !defined(OPENSSL_NO_SHA224) ++ NID_sha224, ++#endif ++ NID_sha256, ++#endif ++}; ++ ++static int padlock_digest_nids_num = sizeof(padlock_digest_nids)/sizeof(padlock_digest_nids[0]); ++ ++static int ++padlock_digests (ENGINE *e, const EVP_MD **digest, const int **nids, int nid) ++{ ++ /* No specific digest => return a list of supported nids ... */ ++ if (!digest) { ++ *nids = padlock_digest_nids; ++ return padlock_digest_nids_num; ++ } ++ ++ /* ... or the requested "digest" otherwise */ ++ switch (nid) { ++#if !defined(OPENSSL_NO_SHA) ++ case NID_sha1: ++ *digest = &padlock_sha1_md; ++ break; ++ case NID_dsa: ++ *digest = &padlock_dss1_md; ++ break; ++#endif ++#if !defined(OPENSSL_NO_SHA256) ++#if !defined(OPENSSL_NO_SHA224) ++ case NID_sha224: ++ *digest = &padlock_sha224_md; ++ break; ++#endif /* OPENSSL_NO_SHA224 */ ++ case NID_sha256: ++ *digest = &padlock_sha256_md; ++ break; ++#endif /* OPENSSL_NO_SHA256 */ ++ default: ++ /* Sorry, we don't support this NID */ ++ *digest = NULL; ++ return 0; ++ } ++ ++ return 1; ++} ++ ++#endif /* OPENSSL_NO_SHA */ ++ ++#ifndef PADLOCK_NO_RNG ++ + /* ===== Random Number Generator ===== */ + /* + * This code is not engaged. The reason is that it does not comply +@@ -1215,6 +1669,62 @@ static RAND_METHOD padlock_rand = { + padlock_rand_status, /* rand status */ + }; + ++#endif /* PADLOCK_NO_RNG */ ++ ++/* Prepare the ENGINE structure for registration */ ++static int ++padlock_bind_helper(ENGINE *e) ++{ ++ /* Check available features */ ++ padlock_available(); ++ ++ /* Generate a nice engine name with available features */ ++ BIO_snprintf(padlock_name, sizeof(padlock_name), ++ "VIA PadLock: %s%s%s%s%s%s", ++ padlock_flags ? "" : "not supported", ++ PADLOCK_HAVE_RNG ? "RNG " : "", ++ PADLOCK_HAVE_ACE ? (PADLOCK_HAVE_ACE2 ? "ACE2 " : "ACE ") : "", ++ PADLOCK_HAVE_PHE ? "PHE " : "", ++ PADLOCK_HAVE_PMM ? "PMM " : "", ++ PADLOCK_HAVE_NANO ? "NANO " : "" ++ ); ++ ++#ifndef OPENSSL_NO_SHA ++ /* Use Nano SHA acceleration? */ ++ if (PADLOCK_HAVE_NANO) { ++ padlock_sha1_md.update = padlock_nano_sha1_update; ++ padlock_dss1_md.update = padlock_nano_sha1_update; ++#if !defined(OPENSSL_NO_SHA256) ++#if !defined(OPENSSL_NO_SHA224) ++ padlock_sha224_md.update = padlock_nano_sha256_update; ++#endif ++ padlock_sha256_md.update = padlock_nano_sha256_update; ++#endif ++ } ++#endif ++ ++ /* Register everything or return with an error */ ++ if (!ENGINE_set_id(e, padlock_id) || ++ !ENGINE_set_name(e, padlock_name) || ++ ++ !ENGINE_set_init_function(e, padlock_init) ++#ifndef OPENSSL_NO_AES ++ || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers)) ++#endif ++#ifndef OPENSSL_NO_SHA ++ || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests)) ++#endif ++#ifndef PADLOCK_NO_RNG ++ || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand)) ++#endif ++ ) { ++ return 0; ++ } ++ ++ /* Everything looks good */ ++ return 1; ++} ++ + #else /* !COMPILE_HW_PADLOCK */ + #ifndef OPENSSL_NO_DYNAMIC_ENGINE + OPENSSL_EXPORT +-- +1.7.0.4 + diff --git a/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch new file mode 100644 index 000000000..c41d860ea --- /dev/null +++ b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch @@ -0,0 +1,33 @@ +From f6a5204b8dc94d73521f962183ee302533b2a196 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 4 Jun 2010 18:02:39 +0300 +Subject: [PATCH 4/4] crypto/engine: autoload padlock dynamic engine + +--- + crypto/engine/eng_all.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c +index 22c1204..827e447 100644 +--- a/crypto/engine/eng_all.c ++++ b/crypto/engine/eng_all.c +@@ -112,6 +112,16 @@ void ENGINE_load_builtin_engines(void) + ENGINE_load_capi(); + #endif + #endif ++#ifdef OPENSSL_NO_STATIC_ENGINE ++ { ++ ENGINE *e; ++ e = ENGINE_by_id("padlock"); ++ if (e != NULL) { ++ ENGINE_add(e); ++ ENGINE_free(e); ++ } ++ } ++#endif + } + + #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) +-- +1.7.0.4 + diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 4a0f45f1a..eb23f31fc 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssl -pkgver=1.0.0 -pkgrel=0 +pkgver=1.0.0a +pkgrel=1 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" depends= @@ -13,6 +13,10 @@ subpackages="$pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz fix-manpages.patch openssl-bb-basename.patch + 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch + 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch + 0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch + 0004-crypto-engine-autoload-padlock-dynamic-engine.patch " # openssl-0.9.8k-padlock-sha.patch @@ -41,13 +45,6 @@ package() { make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install } -dev() { - replaces="libcrypto openssl" - default_dev - # move symlinks - #mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ -} - libcrypto() { pkgdesc="Crypto library from openssl" replaces="openssl libcrypto" @@ -69,6 +66,10 @@ libssl() { done } -md5sums="89eaa86e25b2845f920ec00ae4c864ed openssl-1.0.0.tar.gz +md5sums="e3873edfffc783624cfbdb65e2249cbd openssl-1.0.0a.tar.gz 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch -c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch" +c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch +ceae7d6166a455ecc41adc8f44f1a07e 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch +383c0c0305532f471bf583d6e05cbea9 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch +f687ab90b23587dc445eb0803a6eb1fb 0003-engine-padlock-implement-sha1-sha224-sha256-accelera.patch +f197ac9a2748e64b1cb15a12ddca3d61 0004-crypto-engine-autoload-padlock-dynamic-engine.patch" diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD index 6a80beb21..fa102eedd 100644 --- a/main/orage/APKBUILD +++ b/main/orage/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=orage pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A simple calendar application with reminders for Xfce" url="http://www.xfce.org/projects/orage/" license="GPL-2" @@ -9,12 +9,10 @@ subpackages="$pkgname-doc" depends="hicolor-icon-theme" makedepends="pkgconfig xfce4-panel-dev libnotify-dev intltool gettext-dev libiconv-dev libsm-dev expat-dev e2fsprogs-dev" -install="orage.post-install orage.post-deinstall" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 - $install" +install= +source="http://archive.xfce.org/src/apps/orage/${pkgver%.*}/orage-$pkgver.tar.bz2" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,9 +20,11 @@ build () --localstatedir=/var \ --disable-static || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="24fa43dd86ec5af5a4766620fd972cf2 orage-4.6.1.tar.bz2 -db51db79681eadc47be4932355a77c25 orage.post-install -db51db79681eadc47be4932355a77c25 orage.post-deinstall" +md5sums="24fa43dd86ec5af5a4766620fd972cf2 orage-4.6.1.tar.bz2" diff --git a/main/orage/orage.post-deinstall b/main/orage/orage.post-deinstall deleted file mode 120000 index eef6db267..000000000 --- a/main/orage/orage.post-deinstall +++ /dev/null @@ -1 +0,0 @@ -orage.post-install
\ No newline at end of file diff --git a/main/orage/orage.post-install b/main/orage/orage.post-install deleted file mode 100644 index c523d78da..000000000 --- a/main/orage/orage.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - diff --git a/main/osmo/APKBUILD b/main/osmo/APKBUILD new file mode 100644 index 000000000..141309680 --- /dev/null +++ b/main/osmo/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=osmo +pkgver=0.2.10 +pkgrel=1 +pkgdesc="A handy personal organizer" +url="http://clayo.org/osmo/" +license="GPL" +makedepends="gtk+-dev libnotify-dev libical-dev libxml2-dev autoconf automake" +install= +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz + osmo-0.2.10-build-mo.patch + " + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + msg "Applying ${i##*/}" + patch -p1 -i "$i" || return 1 + done + aclocal && autoconf && automake +} + +build() { + cd "$_builddir" + CFLAGS="$CFLAGS -I/usr/include/libical" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 +} + +md5sums="a774db748228efee96186158d553ade9 osmo-0.2.10.tar.gz +6c9939fd4df9d25e1a220585e6875c78 osmo-0.2.10-build-mo.patch" diff --git a/main/osmo/osmo-0.2.10-build-mo.patch b/main/osmo/osmo-0.2.10-build-mo.patch new file mode 100644 index 000000000..ac1b9aa23 --- /dev/null +++ b/main/osmo/osmo-0.2.10-build-mo.patch @@ -0,0 +1,20 @@ +diff --git a/po/Makefile.am b/po/Makefile.am +index b3c904a..f0ee467 100644 +--- a/po/Makefile.am ++++ b/po/Makefile.am +@@ -16,8 +16,8 @@ all: $(MOFILES) + + update-po: $(DOMAIN).pot $(POFILES) $(MOFILES) + +-%.mo: skip +- @po=$(@:.mo=.po); if test $$po -nt $@ ; then $(MSGFMT) -c --statistics $$po -o $@; echo "$@ updated."; fi ++%.mo: %.po ++ @$(MSGFMT) -c --statistics $^ -o $@; echo "$@ updated." + + %.po: $(DOMAIN).pot + $(MSGMERGE) $@ $< -o $@.in && mv $@.in $@ +@@ -41,4 +41,3 @@ uninstall-local: + clean-local: + rm -rf *.mo + +-skip: diff --git a/main/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD index 83e13d8f6..65fc2adc8 100644 --- a/main/perl-test-pod/APKBUILD +++ b/main/perl-test-pod/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-test-pod _realname=Test-Pod -pkgver=1.26 +pkgver=1.44 pkgrel=0 pkgdesc="Check for POD errors in files" url="http://search.cpan.org/~petdance/Test-Pod-1.26/" @@ -11,7 +11,7 @@ depends="perl" makedepends="perl-dev" install= subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_realname-$pkgver.tar.gz" +source="http://search.cpan.org/CPAN/authors/id/D/DW/DWHEELER/$_realname-$pkgver.tar.gz" build() { cd "$srcdir/$_realname-$pkgver" @@ -23,4 +23,4 @@ build() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="2f259135656ac4549b65a4f14f07b7c6 Test-Pod-1.26.tar.gz" +md5sums="02380af5539521524d5df17273a57ae7 Test-Pod-1.44.tar.gz" diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD new file mode 100644 index 000000000..bccd793c1 --- /dev/null +++ b/main/pidgin/APKBUILD @@ -0,0 +1,64 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=pidgin +pkgver=2.7.1 +pkgrel=0 +pkgdesc="graphical multi-protocol instant messaging client for X" +url="http://pidgin.im/" +license="GPL" +depends= +makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev + libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev + cyrus-sasl-dev ncurses-dev nss-dev" +subpackages="$pkgname-dev $pkgname-doc finch libpurple" +source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 + icq_fix.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p0 -i "$srcdir"/icq_fix.patch || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-avahi \ + --disable-doxygen \ + --disable-gnutls \ + --disable-meanwhile \ + --disable-nm \ + --disable-perl \ + --disable-schemas-install \ + --disable-screensaver \ + --disable-tcl \ + --disable-vv \ + --enable-cyrus-sasl \ + --enable-nss \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +finch() { + pkgdesc="text-based multi-protocol instant messaging client" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/lib/gnt "$pkgdir"/usr/lib/libgnt.so.* \ + "$pkgdir"/usr/lib/finch \ + "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/bin/finch "$subpkgdir"/usr/bin/ +} + +libpurple() { + pkgdesc="multi-protocol instant messaging library" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share/sounds + mv "$pkgdir"/usr/lib/*purple* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ + "$subpkgdir"/usr/share/ +} +md5sums="0dd2adb9e8214ac960f956823c84e7e2 pidgin-2.7.1.tar.bz2 +2ce887cf36e698282b9241832850defd icq_fix.patch" diff --git a/main/pidgin/icq_fix.patch b/main/pidgin/icq_fix.patch new file mode 100644 index 000000000..8bb87ef86 --- /dev/null +++ b/main/pidgin/icq_fix.patch @@ -0,0 +1,19 @@ +# +# +# patch "libpurple/protocols/oscar/oscar.c" +# from [b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702] +# to [6b8b45623896204448ac4b212a0c631655822ad1] +# +============================================================ +--- libpurple/protocols/oscar/oscar.c b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702 ++++ libpurple/protocols/oscar/oscar.c 6b8b45623896204448ac4b212a0c631655822ad1 +@@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, cons + tmp2 = purple_markup_strip_html(tmp1); + is_html = FALSE; + } else { +- tmp2 = g_strdup(tmp1); ++ /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ ++ tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1); + is_html = TRUE; + } + g_free(tmp1); diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD index 629130deb..ab6d7a90e 100644 --- a/main/pixman/APKBUILD +++ b/main/pixman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pixman -pkgver=0.18.0 +pkgver=0.18.2 pkgrel=0 pkgdesc="Pixman library" url="http://xorg.freedesktop.org" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="a1b5a0a145cab653f5c1e8cf2f98f945 pixman-0.18.0.tar.bz2" +md5sums="8f0c47bbb12a0d9c0d14242596bf6bf9 pixman-0.18.2.tar.bz2" diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index 2367e9860..a2213c269 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.6.5 -pkgrel=4 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" license="IPL-1" @@ -12,7 +12,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre $pkgname-pgsql" source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz $pkgname.initd - postfix-2.6.1-dynamicmaps.patch + postfix-2.7.0-dynamic-maps.patch dynamicmaps.cf postfix-ldap.post-install postfix-mysql.post-install @@ -145,9 +145,9 @@ mysql() { _mv_dict mysql ;} pcre() { _mv_dict pcre ; } pgsql() { _mv_dict pgsql ; } -md5sums="6b954cfb3eb6141dac1e773281211717 postfix-2.6.5.tar.gz +md5sums="df648f59421604e895cce56325f00bae postfix-2.7.0.tar.gz 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd -d45552cfdcd911d0934c0cb7816c4011 postfix-2.6.1-dynamicmaps.patch +4d9c373e8a35bfb5bfa9b899e64fb70a postfix-2.7.0-dynamic-maps.patch 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install 2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install diff --git a/main/postfix/postfix-2.6.1-dynamicmaps.patch b/main/postfix/postfix-2.6.1-dynamicmaps.patch deleted file mode 100644 index 630abedc3..000000000 --- a/main/postfix/postfix-2.6.1-dynamicmaps.patch +++ /dev/null @@ -1,5273 +0,0 @@ -diff -ruN a/conf/postfix-files b/conf/postfix-files ---- a/conf/postfix-files 2009-06-01 12:27:42.000000000 +0000 -+++ b/conf/postfix-files 2009-06-01 13:08:26.000000000 +0000 -@@ -65,6 +65,10 @@ - $queue_directory/trace:d:$mail_owner:-:700:ucr - $daemon_directory/anvil:f:root:-:755 - $daemon_directory/bounce:f:root:-:755 -+$daemon_directory/dict_ldap.so:f:root:-:755 -+$daemon_directory/dict_pcre.so:f:root:-:755 -+$daemon_directory/dict_mysql.so:f:root:-:755 -+$daemon_directory/dict_pgsql.so:f:root:-:755 - $daemon_directory/cleanup:f:root:-:755 - $daemon_directory/discard:f:root:-:755 - $daemon_directory/error:f:root:-:755 -@@ -94,6 +98,11 @@ - $daemon_directory/trivial-rewrite:f:root:-:755 - $daemon_directory/verify:f:root:-:755 - $daemon_directory/virtual:f:root:-:755 -+/usr/lib/libpostfix-dns.so.1:f:root:-:755 -+/usr/lib/libpostfix-global.so.1:f:root:-:755 -+/usr/lib/libpostfix-tls.so.1:f:root:-:755 -+/usr/lib/libpostfix-master.so.1:f:root:-:755 -+/usr/lib/libpostfix-util.so.1:f:root:-:755 - $daemon_directory/nqmgr:h:$daemon_directory/qmgr - $daemon_directory/lmtp:h:$daemon_directory/smtp - $command_directory/postalias:f:root:-:755 -@@ -117,6 +126,7 @@ - $config_directory/aliases:f:root:-:644:p1 - $config_directory/bounce.cf.default:f:root:-:644:1 - $config_directory/canonical:f:root:-:644:p1 -+$config_directory/dynamicmaps.cf:f:root:-:644:p - $config_directory/cidr_table:f:root:-:644:o - $config_directory/generic:f:root:-:644:p1 - $config_directory/generics:f:root:-:644:o -diff -ruN a/src/dns/Makefile.in b/src/dns/Makefile.in ---- a/src/dns/Makefile.in 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/dns/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -14,7 +14,7 @@ - LIB_DIR = ../../lib - INC_DIR = ../../include - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -31,12 +31,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/global/Makefile.in b/src/global/Makefile.in ---- a/src/global/Makefile.in 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -34,7 +34,7 @@ - canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ - clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ - defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ -- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ -+ deliver_request.o \ - dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ - dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ - ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ -@@ -103,10 +103,13 @@ - LIB_DIR = ../../lib - INC_DIR = ../../include - MAKES = -+LDAPSO = dict_ldap.so -+MYSQLSO = dict_mysql.so -+PGSQLSO = dict_pgsql.so - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) - - $(OBJS): ../../conf/makedefs.out - -@@ -116,14 +119,30 @@ - test: $(TESTPROG) - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) -+ -+$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal -+ -+$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal -+ -+$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(LDAPSO): $(LDAPSO) -+ cp $(LDAPSO) ../../libexec -+ -+../../libexec/$(MYSQLSO): $(MYSQLSO) -+ cp $(MYSQLSO) ../../libexec -+ -+../../libexec/$(PGSQLSO): $(PGSQLSO) -+ cp $(PGSQLSO) ../../libexec -+ -+update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -491,7 +510,7 @@ - lint $(DEFS) $(SRCS) $(LINTFIX) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk -+ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk - rm -rf printfck - - tidy: clean -diff -ruN a/src/global/Makefile.in.orig b/src/global/Makefile.in.orig ---- a/src/global/Makefile.in.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/Makefile.in.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,2018 @@ -+SHELL = /bin/sh -+SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \ -+ canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ -+ clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ -+ defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ -+ deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \ -+ dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \ -+ dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \ -+ ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \ -+ header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \ -+ mail_addr.c mail_addr_crunch.c mail_addr_find.c mail_addr_map.c \ -+ mail_command_client.c mail_command_server.c mail_conf.c \ -+ mail_conf_bool.c mail_conf_int.c mail_conf_long.c mail_conf_raw.c \ -+ mail_conf_str.c mail_conf_time.c mail_connect.c mail_copy.c \ -+ mail_date.c mail_dict.c mail_error.c mail_flush.c mail_open_ok.c \ -+ mail_params.c mail_pathname.c mail_queue.c mail_run.c \ -+ mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \ -+ mark_corrupt.c match_parent_style.c mbox_conf.c mbox_open.c \ -+ mime_state.c mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_open.c \ -+ mkmap_sdbm.c msg_stats_print.c msg_stats_scan.c mynetworks.c \ -+ mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \ -+ pipe_command.c post_mail.c quote_821_local.c quote_822_local.c \ -+ rcpt_buf.c rcpt_print.c rec_attr_map.c rec_streamlf.c rec_type.c \ -+ recipient_list.c record.c remove.c resolve_clnt.c resolve_local.c \ -+ rewrite_clnt.c scache_clnt.c scache_multi.c scache_single.c \ -+ sent.c smtp_stream.c split_addr.c string_list.c strip_addr.c \ -+ sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \ -+ tok822_resolve.c tok822_rewrite.c tok822_tree.c trace.c \ -+ user_acl.c valid_mailhost_addr.c verify.c verify_clnt.c \ -+ verp_sender.c wildcard_inet_addr.c xtext.c delivered_hdr.c \ -+ fold_addr.c header_body_checks.c mkmap_proxy.c data_redirect.c \ -+ match_service.c mail_conf_nint.c -+OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ -+ canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ -+ clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ -+ defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ -+ deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ -+ dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ -+ dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ -+ ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ -+ header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \ -+ mail_addr.o mail_addr_crunch.o mail_addr_find.o mail_addr_map.o \ -+ mail_command_client.o mail_command_server.o mail_conf.o \ -+ mail_conf_bool.o mail_conf_int.o mail_conf_long.o mail_conf_raw.o \ -+ mail_conf_str.o mail_conf_time.o mail_connect.o mail_copy.o \ -+ mail_date.o mail_dict.o mail_error.o mail_flush.o mail_open_ok.o \ -+ mail_params.o mail_pathname.o mail_queue.o mail_run.o \ -+ mail_scan_dir.o mail_stream.o mail_task.o mail_trigger.o maps.o \ -+ mark_corrupt.o match_parent_style.o mbox_conf.o mbox_open.o \ -+ mime_state.o mkmap_cdb.o mkmap_db.o mkmap_dbm.o mkmap_open.o \ -+ mkmap_sdbm.o msg_stats_print.o msg_stats_scan.o mynetworks.o \ -+ mypwd.o namadr_list.o off_cvt.o opened.o own_inet_addr.o \ -+ pipe_command.o post_mail.o quote_821_local.o quote_822_local.o \ -+ rcpt_buf.o rcpt_print.o rec_attr_map.o rec_streamlf.o rec_type.o \ -+ recipient_list.o record.o remove.o resolve_clnt.o resolve_local.o \ -+ rewrite_clnt.o scache_clnt.o scache_multi.o scache_single.o \ -+ sent.o smtp_stream.o split_addr.o string_list.o strip_addr.o \ -+ sys_exits.o timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \ -+ tok822_resolve.o tok822_rewrite.o tok822_tree.o trace.o \ -+ user_acl.o valid_mailhost_addr.o verify.o verify_clnt.o \ -+ verp_sender.o wildcard_inet_addr.o xtext.o delivered_hdr.o \ -+ fold_addr.o header_body_checks.o mkmap_proxy.o data_redirect.o \ -+ match_service.o mail_conf_nint.o -+HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \ -+ canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \ -+ conv_time.h db_common.h debug_peer.h debug_process.h defer.h \ -+ deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \ -+ dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \ -+ dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \ -+ dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \ -+ file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \ -+ int_filt.h is_header.h lex_822.h log_adhoc.h mail_addr.h \ -+ mail_addr_crunch.h mail_addr_find.h mail_addr_map.h mail_conf.h \ -+ mail_copy.h mail_date.h mail_dict.h mail_error.h mail_flush.h \ -+ mail_open_ok.h mail_params.h mail_proto.h mail_queue.h mail_run.h \ -+ mail_scan_dir.h mail_stream.h mail_task.h mail_version.h maps.h \ -+ mark_corrupt.h match_parent_style.h mbox_conf.h mbox_open.h \ -+ mime_state.h mkmap.h msg_stats.h mynetworks.h mypwd.h namadr_list.h \ -+ off_cvt.h opened.h own_inet_addr.h pipe_command.h post_mail.h \ -+ qmgr_user.h qmqp_proto.h quote_821_local.h quote_822_local.h \ -+ quote_flags.h rcpt_buf.h rcpt_print.h rec_attr_map.h rec_streamlf.h \ -+ rec_type.h recipient_list.h record.h resolve_clnt.h resolve_local.h \ -+ rewrite_clnt.h scache.h sent.h smtp_stream.h split_addr.h \ -+ string_list.h strip_addr.h sys_exits.h timed_ipc.h tok822.h \ -+ trace.h user_acl.h valid_mailhost_addr.h verify.h verify_clnt.h \ -+ verp_sender.h wildcard_inet_addr.h xtext.h delivered_hdr.h \ -+ fold_addr.h header_body_checks.h data_redirect.h match_service.h -+TESTSRC = rec2stream.c stream2rec.c recdump.c -+DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) -+CFLAGS = $(DEBUG) $(OPT) $(DEFS) -+INCL = -+LIB = libglobal.a -+TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \ -+ mail_addr_map mail_date maps mynetworks mypwd namadr_list \ -+ off_cvt quote_822_local rec2stream recdump resolve_clnt \ -+ resolve_local rewrite_clnt stream2rec string_list tok822_parse \ -+ quote_821_local mail_conf_time mime_state strip_addr \ -+ verify_clnt xtext anvil_clnt scache ehlo_mask \ -+ valid_mailhost_addr own_inet_addr header_body_checks \ -+ data_redirect -+ -+LIBS = ../../lib/libutil.a -+LIB_DIR = ../../lib -+INC_DIR = ../../include -+MAKES = -+ -+.c.o:; $(CC) $(CFLAGS) -c $*.c -+ -+all: $(LIB) -+ -+$(OBJS): ../../conf/makedefs.out -+ -+Makefile: Makefile.in -+ cat ../../conf/makedefs.out $? >$@ -+ -+test: $(TESTPROG) -+ -+$(LIB): $(OBJS) -+ $(AR) $(ARFL) $(LIB) $? -+ $(RANLIB) $(LIB) -+ -+$(LIB_DIR)/$(LIB): $(LIB) -+ cp $(LIB) $(LIB_DIR) -+ $(RANLIB) $(LIB_DIR)/$(LIB) -+ -+update: $(LIB_DIR)/$(LIB) $(HDRS) -+ -for i in $(HDRS); \ -+ do \ -+ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -+ done -+ cd $(INC_DIR); chmod 644 $(HDRS) -+ -+dot_lockfile: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+tok822_parse: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+rec2stream: rec2stream.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+stream2rec: stream2rec.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+recdump: recdump.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+namadr_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+domain_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mynetworks: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+resolve_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+rewrite_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+quote_822_local: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+off_cvt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_map: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_find: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+maps: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mypwd: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_date: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+resolve_local: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_crunch: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+string_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+local_transport: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+quote_821_local: quote_821_local.c $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIBS) $(SYSLIBS) -+ -+mail_conf_time: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mime_state: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+strip_addr: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+verify_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+xtext: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+anvil_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+scache: scache.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+ehlo_mask: ehlo_mask.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+valid_mailhost_addr: valid_mailhost_addr.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+own_inet_addr: own_inet_addr.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+header_body_checks: header_body_checks.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+data_redirect: data_redirect.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+tests: tok822_test mime_tests strip_addr_test tok822_limit_test \ -+ xtext_test scache_multi_test ehlo_mask_test \ -+ namadr_list_test mail_conf_time_test header_body_checks_tests -+ -+mime_tests: mime_test mime_nest mime_8bit mime_dom mime_trunc mime_cvt \ -+ mime_cvt2 mime_cvt3 mime_garb1 mime_garb2 mime_garb3 mime_garb4 -+ -+header_body_checks_tests: header_body_checks_null_test \ -+ header_body_checks_warn_test header_body_checks_prepend_test \ -+ header_body_checks_ignore_test header_body_checks_replace_test -+ -+root_tests: rewrite_clnt_test resolve_clnt_test -+ -+tok822_test: tok822_parse tok822_parse.in tok822_parse.ref -+ ./tok822_parse <tok822_parse.in >tok822_parse.tmp 2>&1 -+ diff tok822_parse.ref tok822_parse.tmp -+ rm -f tok822_parse.tmp -+ -+mime_test: mime_state mime_test.in mime_test.ref -+ ./mime_state <mime_test.in >mime_test.tmp -+ diff mime_test.ref mime_test.tmp -+ rm -f mime_test.tmp -+ -+mime_nest: mime_state mime_nest.in mime_nest.ref -+ ./mime_state <mime_nest.in >mime_nest.tmp -+ diff mime_nest.ref mime_nest.tmp -+ rm -f mime_nest.tmp -+ -+mime_8bit: mime_state mime_8bit.in mime_8bit.ref -+ ./mime_state <mime_8bit.in >mime_8bit.tmp -+ diff mime_8bit.ref mime_8bit.tmp -+ rm -f mime_8bit.tmp -+ -+mime_dom: mime_state mime_dom.in mime_dom.ref -+ ./mime_state <mime_dom.in >mime_dom.tmp -+ diff mime_dom.ref mime_dom.tmp -+ rm -f mime_dom.tmp -+ -+mime_trunc: mime_state mime_trunc.in mime_trunc.ref -+ ./mime_state <mime_trunc.in >mime_trunc.tmp -+ diff mime_trunc.ref mime_trunc.tmp -+ rm -f mime_trunc.tmp -+ -+mime_cvt: mime_state mime_cvt.in mime_cvt.ref -+ ./mime_state <mime_cvt.in >mime_cvt.tmp -+ diff mime_cvt.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_cvt2: mime_state mime_cvt.in2 mime_cvt.ref2 -+ ./mime_state <mime_cvt.in2 >mime_cvt.tmp -+ diff mime_cvt.ref2 mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_cvt3: mime_state mime_cvt.in3 mime_cvt.ref3 -+ ./mime_state <mime_cvt.in3 >mime_cvt.tmp -+ diff mime_cvt.ref3 mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb1: mime_state mime_garb1.in mime_garb1.ref -+ ./mime_state <mime_garb1.in >mime_cvt.tmp -+ diff mime_garb1.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb2: mime_state mime_garb2.in mime_garb2.ref -+ ./mime_state <mime_garb2.in >mime_cvt.tmp -+ diff mime_garb2.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb3: mime_state mime_garb3.in mime_garb3.ref -+ ./mime_state <mime_garb3.in >mime_cvt.tmp -+ diff mime_garb3.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb4: mime_state mime_garb4.in mime_garb4.ref -+ ./mime_state <mime_garb4.in >mime_cvt.tmp -+ diff mime_garb4.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+tok822_limit_test: tok822_parse tok822_limit.in tok822_limit.ref -+ ./tok822_parse <tok822_limit.in >tok822_limit.tmp -+ diff tok822_limit.ref tok822_limit.tmp -+ rm -f tok822_limit.tmp -+ -+strip_addr_test: strip_addr strip_addr.ref -+ ./strip_addr 2>strip_addr.tmp -+ diff strip_addr.ref strip_addr.tmp -+ rm -f strip_addr.tmp -+ -+xtext_test: xtext -+ ./xtext <xtext.c | od -cb >xtext.tmp -+ od -cb <xtext.c >xtext.ref -+ cmp xtext.ref xtext.tmp -+ rm -f xtext.ref xtext.tmp -+ -+# Requires: Postfix running, root privileges -+ -+rewrite_clnt_test: rewrite_clnt rewrite_clnt.in rewrite_clnt.ref -+ @set -- `id`; case "$$1" in \ -+ *"(root)") ;; \ -+ *) echo 'This test requires root privilege'; exit 1;; \ -+ esac -+ @test -n "`postconf -h remote_header_rewrite_domain`" || { \ -+ echo 'This test requires non-empty remote_header_rewrite_domain'; exit 1; } -+ ./rewrite_clnt <rewrite_clnt.in >rewrite_clnt.tmp -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/" \ -+ -e "s/INVALID_DOMAIN/`postconf -h remote_header_rewrite_domain`/" \ -+ rewrite_clnt.ref | diff - rewrite_clnt.tmp -+ rm -f rewrite_clnt.tmp -+ -+# Requires: Postfix, root, relayhost=$mydomain, no transport map -+ -+resolve_clnt_test: resolve_clnt resolve_clnt.in resolve_clnt.ref -+ @set -- `id`; case "$$1" in \ -+ *"(root)") ;; \ -+ *) echo 'This test requires root privilege'; exit 1;; \ -+ esac -+ @test "`postconf -h relayhost`" = '$$mydomain' || { \ -+ echo 'This test requires relayhost=$$mydomain'; exit 1; } -+ @test "`postconf -h transport_maps`" = "" || { \ -+ echo 'This test requires no transport map'; exit 1; } -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ -+ -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ -+ resolve_clnt.in | ./resolve_clnt >resolve_clnt.tmp -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ -+ -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ -+ -e "s/RELAYHOST/`postconf -h mydomain`/g" \ -+ resolve_clnt.ref | diff - resolve_clnt.tmp -+ rm -f resolve_clnt.tmp -+ -+scache_multi_test: scache scache_multi.in scache_multi.ref -+ ./scache <scache_multi.in >scache_multi.tmp -+ diff scache_multi.ref scache_multi.tmp -+ rm -f scache_multi.tmp -+ -+ehlo_mask_test: ehlo_mask ehlo_mask.in ehlo_mask.ref -+ ./ehlo_mask <ehlo_mask.in >ehlo_mask.tmp -+ diff ehlo_mask.ref ehlo_mask.tmp -+ rm -f ehlo_mask.tmp -+ -+namadr_list_test: namadr_list namadr_list.in namadr_list.ref -+ -sh namadr_list.in >namadr_list.tmp 2>&1 -+ diff namadr_list.ref namadr_list.tmp -+ rm -f namadr_list.tmp -+ -+mail_conf_time_test: mail_conf_time mail_conf_time.ref -+ ./mail_conf_time >mail_conf_time.tmp -+ diff mail_conf_time.ref mail_conf_time.tmp -+ rm -f mail_conf_time.tmp -+ -+header_body_checks_null_test: header_body_checks header_body_checks_null.ref -+ ./header_body_checks "" "" "" "" \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ ./header_body_checks static:dunno static:dunno static:dunno static:dunno \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ ./header_body_checks static:ok static:ok static:ok static:ok \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ rm -f header_body_checks_null.tmp -+ -+header_body_checks_warn_test: header_body_checks header_body_checks_warn.ref -+ ./header_body_checks static:warn static:warn static:warn static:warn \ -+ <mime_test.in >header_body_checks_warn.tmp 2>&1 -+ cmp header_body_checks_warn.ref header_body_checks_warn.tmp -+ rm -f header_body_checks_warn.tmp -+ -+header_body_checks_prepend_test: header_body_checks header_body_checks_prepend.ref -+ echo /./ prepend header: head >header_body_checks_head -+ echo /./ prepend header: mime >header_body_checks_mime -+ echo /./ prepend header: nest >header_body_checks_nest -+ echo /./ prepend body >header_body_checks_body -+ ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ -+ regexp:header_body_checks_nest regexp:header_body_checks_body \ -+ <mime_test.in >header_body_checks_prepend.tmp 2>&1 -+ cmp header_body_checks_prepend.ref header_body_checks_prepend.tmp -+ rm -f header_body_checks_prepend.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+# Note: the IGNORE action will not strip empty lines. Postfix maps -+# currently never see null query strings because some map types raise -+# errors. We can eliminate this restriction by allowing individual -+# map types to advertise whether they can handle null queries. -+header_body_checks_ignore_test: header_body_checks header_body_checks_ignore.ref -+ ./header_body_checks static:ignore static:ignore static:ignore static:ignore \ -+ <mime_test.in >header_body_checks_ignore.tmp 2>&1 -+ cmp header_body_checks_ignore.ref header_body_checks_ignore.tmp -+ rm -f header_body_checks_ignore.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+header_body_checks_replace_test: header_body_checks header_body_checks_replace.ref -+ echo /./ replace header: head >header_body_checks_head -+ echo /./ replace header: mime >header_body_checks_mime -+ echo /./ replace header: nest >header_body_checks_nest -+ echo /./ replace body >header_body_checks_body -+ ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ -+ regexp:header_body_checks_nest regexp:header_body_checks_body \ -+ <mime_test.in >header_body_checks_replace.tmp 2>&1 -+ cmp header_body_checks_replace.ref header_body_checks_replace.tmp -+ rm -f header_body_checks_replace.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+printfck: $(OBJS) $(PROG) -+ rm -rf printfck -+ mkdir printfck -+ cp *.h printfck -+ sed '1,/^# do not edit/!d' Makefile >printfck/Makefile -+ set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done -+ cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o` -+ -+lint: -+ lint $(DEFS) $(SRCS) $(LINTFIX) -+ -+clean: -+ rm -f *.o $(LIB) *core $(TESTPROG) junk -+ rm -rf printfck -+ -+tidy: clean -+ -+depend: $(MAKES) -+ (sed '1,/^# do not edit/!d' Makefile.in; \ -+ set -e; for i in [a-z][a-z0-9]*.c; do \ -+ $(CC) -E $(DEFS) $(INCL) $$i | grep -v '[<>]' | sed -n -e '/^# *1 *"\([^"]*\)".*/{' \ -+ -e 's//'`echo $$i|sed 's/c$$/o/'`': \1/' \ -+ -e 's/o: \.\//o: /' -e p -e '}' ; \ -+ done | sort -u) | grep -v '[.][o][:][ ][/]' >$$$$ && mv $$$$ Makefile.in -+ @$(EXPORT) make -f Makefile.in Makefile 1>&2 -+ -+# do not edit below this line - it is generated by 'make depend' -+abounce.o: ../../include/attr.h -+abounce.o: ../../include/events.h -+abounce.o: ../../include/iostuff.h -+abounce.o: ../../include/msg.h -+abounce.o: ../../include/mymalloc.h -+abounce.o: ../../include/sys_defs.h -+abounce.o: ../../include/vbuf.h -+abounce.o: ../../include/vstream.h -+abounce.o: ../../include/vstring.h -+abounce.o: abounce.c -+abounce.o: abounce.h -+abounce.o: bounce.h -+abounce.o: deliver_request.h -+abounce.o: dsn.h -+abounce.o: dsn_buf.h -+abounce.o: mail_params.h -+abounce.o: mail_proto.h -+abounce.o: msg_stats.h -+abounce.o: recipient_list.h -+anvil_clnt.o: ../../include/attr.h -+anvil_clnt.o: ../../include/attr_clnt.h -+anvil_clnt.o: ../../include/iostuff.h -+anvil_clnt.o: ../../include/msg.h -+anvil_clnt.o: ../../include/mymalloc.h -+anvil_clnt.o: ../../include/stringops.h -+anvil_clnt.o: ../../include/sys_defs.h -+anvil_clnt.o: ../../include/vbuf.h -+anvil_clnt.o: ../../include/vstream.h -+anvil_clnt.o: ../../include/vstring.h -+anvil_clnt.o: anvil_clnt.c -+anvil_clnt.o: anvil_clnt.h -+anvil_clnt.o: mail_params.h -+anvil_clnt.o: mail_proto.h -+been_here.o: ../../include/htable.h -+been_here.o: ../../include/msg.h -+been_here.o: ../../include/mymalloc.h -+been_here.o: ../../include/stringops.h -+been_here.o: ../../include/sys_defs.h -+been_here.o: ../../include/vbuf.h -+been_here.o: ../../include/vstring.h -+been_here.o: been_here.c -+been_here.o: been_here.h -+bounce.o: ../../include/attr.h -+bounce.o: ../../include/iostuff.h -+bounce.o: ../../include/msg.h -+bounce.o: ../../include/mymalloc.h -+bounce.o: ../../include/sys_defs.h -+bounce.o: ../../include/vbuf.h -+bounce.o: ../../include/vstream.h -+bounce.o: ../../include/vstring.h -+bounce.o: bounce.c -+bounce.o: bounce.h -+bounce.o: defer.h -+bounce.o: deliver_request.h -+bounce.o: dsn.h -+bounce.o: dsn_buf.h -+bounce.o: dsn_print.h -+bounce.o: dsn_util.h -+bounce.o: log_adhoc.h -+bounce.o: mail_params.h -+bounce.o: mail_proto.h -+bounce.o: msg_stats.h -+bounce.o: rcpt_print.h -+bounce.o: recipient_list.h -+bounce.o: trace.h -+bounce.o: verify.h -+bounce_log.o: ../../include/attr.h -+bounce_log.o: ../../include/iostuff.h -+bounce_log.o: ../../include/msg.h -+bounce_log.o: ../../include/mymalloc.h -+bounce_log.o: ../../include/stringops.h -+bounce_log.o: ../../include/sys_defs.h -+bounce_log.o: ../../include/vbuf.h -+bounce_log.o: ../../include/vstream.h -+bounce_log.o: ../../include/vstring.h -+bounce_log.o: ../../include/vstring_vstream.h -+bounce_log.o: bounce_log.c -+bounce_log.o: bounce_log.h -+bounce_log.o: dsn.h -+bounce_log.o: dsn_buf.h -+bounce_log.o: dsn_mask.h -+bounce_log.o: mail_params.h -+bounce_log.o: mail_proto.h -+bounce_log.o: mail_queue.h -+bounce_log.o: rcpt_buf.h -+bounce_log.o: recipient_list.h -+canon_addr.o: ../../include/attr.h -+canon_addr.o: ../../include/iostuff.h -+canon_addr.o: ../../include/mymalloc.h -+canon_addr.o: ../../include/sys_defs.h -+canon_addr.o: ../../include/vbuf.h -+canon_addr.o: ../../include/vstream.h -+canon_addr.o: ../../include/vstring.h -+canon_addr.o: canon_addr.c -+canon_addr.o: canon_addr.h -+canon_addr.o: mail_proto.h -+canon_addr.o: rewrite_clnt.h -+cfg_parser.o: ../../include/argv.h -+cfg_parser.o: ../../include/dict.h -+cfg_parser.o: ../../include/msg.h -+cfg_parser.o: ../../include/mymalloc.h -+cfg_parser.o: ../../include/sys_defs.h -+cfg_parser.o: ../../include/vbuf.h -+cfg_parser.o: ../../include/vstream.h -+cfg_parser.o: ../../include/vstring.h -+cfg_parser.o: cfg_parser.c -+cfg_parser.o: cfg_parser.h -+cfg_parser.o: mail_conf.h -+cleanup_strerror.o: ../../include/msg.h -+cleanup_strerror.o: ../../include/sys_defs.h -+cleanup_strerror.o: ../../include/vbuf.h -+cleanup_strerror.o: ../../include/vstring.h -+cleanup_strerror.o: cleanup_strerror.c -+cleanup_strerror.o: cleanup_user.h -+cleanup_strflags.o: ../../include/msg.h -+cleanup_strflags.o: ../../include/sys_defs.h -+cleanup_strflags.o: ../../include/vbuf.h -+cleanup_strflags.o: ../../include/vstring.h -+cleanup_strflags.o: cleanup_strflags.c -+cleanup_strflags.o: cleanup_user.h -+clnt_stream.o: ../../include/attr.h -+clnt_stream.o: ../../include/events.h -+clnt_stream.o: ../../include/iostuff.h -+clnt_stream.o: ../../include/msg.h -+clnt_stream.o: ../../include/mymalloc.h -+clnt_stream.o: ../../include/sys_defs.h -+clnt_stream.o: ../../include/vbuf.h -+clnt_stream.o: ../../include/vstream.h -+clnt_stream.o: clnt_stream.c -+clnt_stream.o: clnt_stream.h -+clnt_stream.o: mail_params.h -+clnt_stream.o: mail_proto.h -+conv_time.o: ../../include/msg.h -+conv_time.o: ../../include/sys_defs.h -+conv_time.o: conv_time.c -+conv_time.o: conv_time.h -+data_redirect.o: ../../include/argv.h -+data_redirect.o: ../../include/dict.h -+data_redirect.o: ../../include/dict_cdb.h -+data_redirect.o: ../../include/dict_db.h -+data_redirect.o: ../../include/dict_dbm.h -+data_redirect.o: ../../include/msg.h -+data_redirect.o: ../../include/name_code.h -+data_redirect.o: ../../include/split_at.h -+data_redirect.o: ../../include/stringops.h -+data_redirect.o: ../../include/sys_defs.h -+data_redirect.o: ../../include/vbuf.h -+data_redirect.o: ../../include/vstream.h -+data_redirect.o: ../../include/vstring.h -+data_redirect.o: data_redirect.c -+data_redirect.o: data_redirect.h -+data_redirect.o: dict_proxy.h -+data_redirect.o: mail_params.h -+db_common.o: ../../include/argv.h -+db_common.o: ../../include/dict.h -+db_common.o: ../../include/match_list.h -+db_common.o: ../../include/match_ops.h -+db_common.o: ../../include/msg.h -+db_common.o: ../../include/mymalloc.h -+db_common.o: ../../include/sys_defs.h -+db_common.o: ../../include/vbuf.h -+db_common.o: ../../include/vstream.h -+db_common.o: ../../include/vstring.h -+db_common.o: cfg_parser.h -+db_common.o: db_common.c -+db_common.o: db_common.h -+db_common.o: string_list.h -+debug_peer.o: ../../include/match_list.h -+debug_peer.o: ../../include/match_ops.h -+debug_peer.o: ../../include/msg.h -+debug_peer.o: ../../include/sys_defs.h -+debug_peer.o: debug_peer.c -+debug_peer.o: debug_peer.h -+debug_peer.o: mail_params.h -+debug_peer.o: match_parent_style.h -+debug_peer.o: namadr_list.h -+debug_process.o: ../../include/msg.h -+debug_process.o: ../../include/sys_defs.h -+debug_process.o: debug_process.c -+debug_process.o: debug_process.h -+debug_process.o: mail_conf.h -+debug_process.o: mail_params.h -+defer.o: ../../include/attr.h -+defer.o: ../../include/iostuff.h -+defer.o: ../../include/msg.h -+defer.o: ../../include/sys_defs.h -+defer.o: ../../include/vbuf.h -+defer.o: ../../include/vstream.h -+defer.o: ../../include/vstring.h -+defer.o: bounce.h -+defer.o: defer.c -+defer.o: defer.h -+defer.o: deliver_request.h -+defer.o: dsn.h -+defer.o: dsn_buf.h -+defer.o: dsn_print.h -+defer.o: dsn_util.h -+defer.o: flush_clnt.h -+defer.o: log_adhoc.h -+defer.o: mail_params.h -+defer.o: mail_proto.h -+defer.o: mail_queue.h -+defer.o: msg_stats.h -+defer.o: rcpt_print.h -+defer.o: recipient_list.h -+defer.o: trace.h -+defer.o: verify.h -+deliver_completed.o: ../../include/msg.h -+deliver_completed.o: ../../include/sys_defs.h -+deliver_completed.o: ../../include/vbuf.h -+deliver_completed.o: ../../include/vstream.h -+deliver_completed.o: ../../include/vstring.h -+deliver_completed.o: deliver_completed.c -+deliver_completed.o: deliver_completed.h -+deliver_completed.o: rec_type.h -+deliver_completed.o: record.h -+deliver_flock.o: ../../include/iostuff.h -+deliver_flock.o: ../../include/myflock.h -+deliver_flock.o: ../../include/sys_defs.h -+deliver_flock.o: ../../include/vbuf.h -+deliver_flock.o: ../../include/vstring.h -+deliver_flock.o: deliver_flock.c -+deliver_flock.o: deliver_flock.h -+deliver_flock.o: mail_params.h -+deliver_pass.o: ../../include/attr.h -+deliver_pass.o: ../../include/iostuff.h -+deliver_pass.o: ../../include/msg.h -+deliver_pass.o: ../../include/mymalloc.h -+deliver_pass.o: ../../include/split_at.h -+deliver_pass.o: ../../include/sys_defs.h -+deliver_pass.o: ../../include/vbuf.h -+deliver_pass.o: ../../include/vstream.h -+deliver_pass.o: ../../include/vstring.h -+deliver_pass.o: bounce.h -+deliver_pass.o: defer.h -+deliver_pass.o: deliver_pass.c -+deliver_pass.o: deliver_pass.h -+deliver_pass.o: deliver_request.h -+deliver_pass.o: dsb_scan.h -+deliver_pass.o: dsn.h -+deliver_pass.o: dsn_buf.h -+deliver_pass.o: mail_params.h -+deliver_pass.o: mail_proto.h -+deliver_pass.o: msg_stats.h -+deliver_pass.o: rcpt_print.h -+deliver_pass.o: recipient_list.h -+deliver_request.o: ../../include/attr.h -+deliver_request.o: ../../include/iostuff.h -+deliver_request.o: ../../include/msg.h -+deliver_request.o: ../../include/myflock.h -+deliver_request.o: ../../include/mymalloc.h -+deliver_request.o: ../../include/sys_defs.h -+deliver_request.o: ../../include/vbuf.h -+deliver_request.o: ../../include/vstream.h -+deliver_request.o: ../../include/vstring.h -+deliver_request.o: deliver_request.c -+deliver_request.o: deliver_request.h -+deliver_request.o: dsn.h -+deliver_request.o: dsn_print.h -+deliver_request.o: mail_open_ok.h -+deliver_request.o: mail_proto.h -+deliver_request.o: mail_queue.h -+deliver_request.o: msg_stats.h -+deliver_request.o: rcpt_buf.h -+deliver_request.o: recipient_list.h -+delivered_hdr.o: ../../include/htable.h -+delivered_hdr.o: ../../include/msg.h -+delivered_hdr.o: ../../include/mymalloc.h -+delivered_hdr.o: ../../include/stringops.h -+delivered_hdr.o: ../../include/sys_defs.h -+delivered_hdr.o: ../../include/vbuf.h -+delivered_hdr.o: ../../include/vstream.h -+delivered_hdr.o: ../../include/vstring.h -+delivered_hdr.o: ../../include/vstring_vstream.h -+delivered_hdr.o: delivered_hdr.c -+delivered_hdr.o: delivered_hdr.h -+delivered_hdr.o: fold_addr.h -+delivered_hdr.o: header_opts.h -+delivered_hdr.o: is_header.h -+delivered_hdr.o: quote_822_local.h -+delivered_hdr.o: quote_flags.h -+delivered_hdr.o: rec_type.h -+delivered_hdr.o: record.h -+dict_ldap.o: ../../include/argv.h -+dict_ldap.o: ../../include/binhash.h -+dict_ldap.o: ../../include/dict.h -+dict_ldap.o: ../../include/match_list.h -+dict_ldap.o: ../../include/match_ops.h -+dict_ldap.o: ../../include/msg.h -+dict_ldap.o: ../../include/mymalloc.h -+dict_ldap.o: ../../include/stringops.h -+dict_ldap.o: ../../include/sys_defs.h -+dict_ldap.o: ../../include/vbuf.h -+dict_ldap.o: ../../include/vstream.h -+dict_ldap.o: ../../include/vstring.h -+dict_ldap.o: cfg_parser.h -+dict_ldap.o: db_common.h -+dict_ldap.o: dict_ldap.c -+dict_ldap.o: dict_ldap.h -+dict_ldap.o: string_list.h -+dict_mysql.o: ../../include/argv.h -+dict_mysql.o: ../../include/dict.h -+dict_mysql.o: ../../include/events.h -+dict_mysql.o: ../../include/find_inet.h -+dict_mysql.o: ../../include/match_list.h -+dict_mysql.o: ../../include/match_ops.h -+dict_mysql.o: ../../include/msg.h -+dict_mysql.o: ../../include/mymalloc.h -+dict_mysql.o: ../../include/myrand.h -+dict_mysql.o: ../../include/split_at.h -+dict_mysql.o: ../../include/stringops.h -+dict_mysql.o: ../../include/sys_defs.h -+dict_mysql.o: ../../include/vbuf.h -+dict_mysql.o: ../../include/vstream.h -+dict_mysql.o: ../../include/vstring.h -+dict_mysql.o: cfg_parser.h -+dict_mysql.o: db_common.h -+dict_mysql.o: dict_mysql.c -+dict_mysql.o: dict_mysql.h -+dict_mysql.o: string_list.h -+dict_pgsql.o: ../../include/argv.h -+dict_pgsql.o: ../../include/dict.h -+dict_pgsql.o: ../../include/events.h -+dict_pgsql.o: ../../include/find_inet.h -+dict_pgsql.o: ../../include/match_list.h -+dict_pgsql.o: ../../include/match_ops.h -+dict_pgsql.o: ../../include/msg.h -+dict_pgsql.o: ../../include/mymalloc.h -+dict_pgsql.o: ../../include/myrand.h -+dict_pgsql.o: ../../include/split_at.h -+dict_pgsql.o: ../../include/stringops.h -+dict_pgsql.o: ../../include/sys_defs.h -+dict_pgsql.o: ../../include/vbuf.h -+dict_pgsql.o: ../../include/vstream.h -+dict_pgsql.o: ../../include/vstring.h -+dict_pgsql.o: cfg_parser.h -+dict_pgsql.o: db_common.h -+dict_pgsql.o: dict_pgsql.c -+dict_pgsql.o: dict_pgsql.h -+dict_pgsql.o: string_list.h -+dict_proxy.o: ../../include/argv.h -+dict_proxy.o: ../../include/attr.h -+dict_proxy.o: ../../include/dict.h -+dict_proxy.o: ../../include/iostuff.h -+dict_proxy.o: ../../include/msg.h -+dict_proxy.o: ../../include/mymalloc.h -+dict_proxy.o: ../../include/stringops.h -+dict_proxy.o: ../../include/sys_defs.h -+dict_proxy.o: ../../include/vbuf.h -+dict_proxy.o: ../../include/vstream.h -+dict_proxy.o: ../../include/vstring.h -+dict_proxy.o: clnt_stream.h -+dict_proxy.o: dict_proxy.c -+dict_proxy.o: dict_proxy.h -+dict_proxy.o: mail_params.h -+dict_proxy.o: mail_proto.h -+domain_list.o: ../../include/match_list.h -+domain_list.o: ../../include/match_ops.h -+domain_list.o: ../../include/sys_defs.h -+domain_list.o: domain_list.c -+domain_list.o: domain_list.h -+dot_lockfile.o: ../../include/iostuff.h -+dot_lockfile.o: ../../include/mymalloc.h -+dot_lockfile.o: ../../include/stringops.h -+dot_lockfile.o: ../../include/sys_defs.h -+dot_lockfile.o: ../../include/vbuf.h -+dot_lockfile.o: ../../include/vstring.h -+dot_lockfile.o: dot_lockfile.c -+dot_lockfile.o: dot_lockfile.h -+dot_lockfile.o: mail_params.h -+dot_lockfile_as.o: ../../include/msg.h -+dot_lockfile_as.o: ../../include/set_eugid.h -+dot_lockfile_as.o: ../../include/sys_defs.h -+dot_lockfile_as.o: ../../include/vbuf.h -+dot_lockfile_as.o: ../../include/vstring.h -+dot_lockfile_as.o: dot_lockfile.h -+dot_lockfile_as.o: dot_lockfile_as.c -+dot_lockfile_as.o: dot_lockfile_as.h -+dsb_scan.o: ../../include/attr.h -+dsb_scan.o: ../../include/iostuff.h -+dsb_scan.o: ../../include/sys_defs.h -+dsb_scan.o: ../../include/vbuf.h -+dsb_scan.o: ../../include/vstream.h -+dsb_scan.o: ../../include/vstring.h -+dsb_scan.o: dsb_scan.c -+dsb_scan.o: dsb_scan.h -+dsb_scan.o: dsn.h -+dsb_scan.o: dsn_buf.h -+dsb_scan.o: mail_proto.h -+dsn.o: ../../include/msg.h -+dsn.o: ../../include/mymalloc.h -+dsn.o: ../../include/sys_defs.h -+dsn.o: dsn.c -+dsn.o: dsn.h -+dsn_buf.o: ../../include/msg.h -+dsn_buf.o: ../../include/mymalloc.h -+dsn_buf.o: ../../include/sys_defs.h -+dsn_buf.o: ../../include/vbuf.h -+dsn_buf.o: ../../include/vstring.h -+dsn_buf.o: dsn.h -+dsn_buf.o: dsn_buf.c -+dsn_buf.o: dsn_buf.h -+dsn_mask.o: ../../include/msg.h -+dsn_mask.o: ../../include/name_code.h -+dsn_mask.o: ../../include/name_mask.h -+dsn_mask.o: ../../include/sys_defs.h -+dsn_mask.o: ../../include/vbuf.h -+dsn_mask.o: ../../include/vstring.h -+dsn_mask.o: dsn_mask.c -+dsn_mask.o: dsn_mask.h -+dsn_print.o: ../../include/attr.h -+dsn_print.o: ../../include/iostuff.h -+dsn_print.o: ../../include/sys_defs.h -+dsn_print.o: ../../include/vbuf.h -+dsn_print.o: ../../include/vstream.h -+dsn_print.o: dsn.h -+dsn_print.o: dsn_print.c -+dsn_print.o: dsn_print.h -+dsn_print.o: mail_proto.h -+dsn_util.o: ../../include/msg.h -+dsn_util.o: ../../include/mymalloc.h -+dsn_util.o: ../../include/stringops.h -+dsn_util.o: ../../include/sys_defs.h -+dsn_util.o: ../../include/vbuf.h -+dsn_util.o: ../../include/vstring.h -+dsn_util.o: dsn_util.c -+dsn_util.o: dsn_util.h -+ehlo_mask.o: ../../include/name_mask.h -+ehlo_mask.o: ../../include/sys_defs.h -+ehlo_mask.o: ../../include/vbuf.h -+ehlo_mask.o: ../../include/vstring.h -+ehlo_mask.o: ehlo_mask.c -+ehlo_mask.o: ehlo_mask.h -+ext_prop.o: ../../include/name_mask.h -+ext_prop.o: ../../include/sys_defs.h -+ext_prop.o: ../../include/vbuf.h -+ext_prop.o: ../../include/vstring.h -+ext_prop.o: ext_prop.c -+ext_prop.o: ext_prop.h -+ext_prop.o: mail_params.h -+file_id.o: ../../include/msg.h -+file_id.o: ../../include/sys_defs.h -+file_id.o: ../../include/vbuf.h -+file_id.o: ../../include/vstring.h -+file_id.o: file_id.c -+file_id.o: file_id.h -+flush_clnt.o: ../../include/attr.h -+flush_clnt.o: ../../include/iostuff.h -+flush_clnt.o: ../../include/match_list.h -+flush_clnt.o: ../../include/match_ops.h -+flush_clnt.o: ../../include/msg.h -+flush_clnt.o: ../../include/sys_defs.h -+flush_clnt.o: ../../include/vbuf.h -+flush_clnt.o: ../../include/vstream.h -+flush_clnt.o: domain_list.h -+flush_clnt.o: flush_clnt.c -+flush_clnt.o: flush_clnt.h -+flush_clnt.o: mail_flush.h -+flush_clnt.o: mail_params.h -+flush_clnt.o: mail_proto.h -+flush_clnt.o: match_parent_style.h -+fold_addr.o: ../../include/stringops.h -+fold_addr.o: ../../include/sys_defs.h -+fold_addr.o: ../../include/vbuf.h -+fold_addr.o: ../../include/vstring.h -+fold_addr.o: fold_addr.c -+fold_addr.o: fold_addr.h -+header_body_checks.o: ../../include/argv.h -+header_body_checks.o: ../../include/dict.h -+header_body_checks.o: ../../include/msg.h -+header_body_checks.o: ../../include/mymalloc.h -+header_body_checks.o: ../../include/sys_defs.h -+header_body_checks.o: ../../include/vbuf.h -+header_body_checks.o: ../../include/vstream.h -+header_body_checks.o: ../../include/vstring.h -+header_body_checks.o: cleanup_user.h -+header_body_checks.o: dsn_util.h -+header_body_checks.o: header_body_checks.c -+header_body_checks.o: header_body_checks.h -+header_body_checks.o: header_opts.h -+header_body_checks.o: is_header.h -+header_body_checks.o: maps.h -+header_body_checks.o: mime_state.h -+header_body_checks.o: rec_type.h -+header_opts.o: ../../include/htable.h -+header_opts.o: ../../include/msg.h -+header_opts.o: ../../include/stringops.h -+header_opts.o: ../../include/sys_defs.h -+header_opts.o: ../../include/vbuf.h -+header_opts.o: ../../include/vstring.h -+header_opts.o: header_opts.c -+header_opts.o: header_opts.h -+header_token.o: ../../include/msg.h -+header_token.o: ../../include/sys_defs.h -+header_token.o: ../../include/vbuf.h -+header_token.o: ../../include/vstring.h -+header_token.o: header_token.c -+header_token.o: header_token.h -+header_token.o: lex_822.h -+input_transp.o: ../../include/msg.h -+input_transp.o: ../../include/name_mask.h -+input_transp.o: ../../include/sys_defs.h -+input_transp.o: ../../include/vbuf.h -+input_transp.o: ../../include/vstring.h -+input_transp.o: cleanup_user.h -+input_transp.o: input_transp.c -+input_transp.o: input_transp.h -+input_transp.o: mail_params.h -+int_filt.o: ../../include/msg.h -+int_filt.o: ../../include/name_mask.h -+int_filt.o: ../../include/sys_defs.h -+int_filt.o: ../../include/vbuf.h -+int_filt.o: ../../include/vstring.h -+int_filt.o: cleanup_user.h -+int_filt.o: int_filt.c -+int_filt.o: int_filt.h -+int_filt.o: mail_params.h -+is_header.o: ../../include/sys_defs.h -+is_header.o: is_header.c -+is_header.o: is_header.h -+log_adhoc.o: ../../include/attr.h -+log_adhoc.o: ../../include/format_tv.h -+log_adhoc.o: ../../include/msg.h -+log_adhoc.o: ../../include/sys_defs.h -+log_adhoc.o: ../../include/vbuf.h -+log_adhoc.o: ../../include/vstream.h -+log_adhoc.o: ../../include/vstring.h -+log_adhoc.o: dsn.h -+log_adhoc.o: log_adhoc.c -+log_adhoc.o: log_adhoc.h -+log_adhoc.o: mail_params.h -+log_adhoc.o: msg_stats.h -+log_adhoc.o: recipient_list.h -+mail_addr.o: ../../include/stringops.h -+mail_addr.o: ../../include/sys_defs.h -+mail_addr.o: ../../include/vbuf.h -+mail_addr.o: ../../include/vstring.h -+mail_addr.o: mail_addr.c -+mail_addr.o: mail_addr.h -+mail_addr.o: mail_params.h -+mail_addr_crunch.o: ../../include/argv.h -+mail_addr_crunch.o: ../../include/mymalloc.h -+mail_addr_crunch.o: ../../include/sys_defs.h -+mail_addr_crunch.o: ../../include/vbuf.h -+mail_addr_crunch.o: ../../include/vstring.h -+mail_addr_crunch.o: canon_addr.h -+mail_addr_crunch.o: mail_addr_crunch.c -+mail_addr_crunch.o: mail_addr_crunch.h -+mail_addr_crunch.o: resolve_clnt.h -+mail_addr_crunch.o: tok822.h -+mail_addr_find.o: ../../include/argv.h -+mail_addr_find.o: ../../include/dict.h -+mail_addr_find.o: ../../include/msg.h -+mail_addr_find.o: ../../include/mymalloc.h -+mail_addr_find.o: ../../include/stringops.h -+mail_addr_find.o: ../../include/sys_defs.h -+mail_addr_find.o: ../../include/vbuf.h -+mail_addr_find.o: ../../include/vstream.h -+mail_addr_find.o: ../../include/vstring.h -+mail_addr_find.o: mail_addr_find.c -+mail_addr_find.o: mail_addr_find.h -+mail_addr_find.o: mail_params.h -+mail_addr_find.o: maps.h -+mail_addr_find.o: resolve_local.h -+mail_addr_find.o: strip_addr.h -+mail_addr_map.o: ../../include/argv.h -+mail_addr_map.o: ../../include/dict.h -+mail_addr_map.o: ../../include/msg.h -+mail_addr_map.o: ../../include/mymalloc.h -+mail_addr_map.o: ../../include/sys_defs.h -+mail_addr_map.o: ../../include/vbuf.h -+mail_addr_map.o: ../../include/vstream.h -+mail_addr_map.o: ../../include/vstring.h -+mail_addr_map.o: mail_addr_crunch.h -+mail_addr_map.o: mail_addr_find.h -+mail_addr_map.o: mail_addr_map.c -+mail_addr_map.o: mail_addr_map.h -+mail_addr_map.o: maps.h -+mail_command_client.o: ../../include/attr.h -+mail_command_client.o: ../../include/iostuff.h -+mail_command_client.o: ../../include/sys_defs.h -+mail_command_client.o: ../../include/vbuf.h -+mail_command_client.o: ../../include/vstream.h -+mail_command_client.o: mail_command_client.c -+mail_command_client.o: mail_proto.h -+mail_command_server.o: ../../include/attr.h -+mail_command_server.o: ../../include/iostuff.h -+mail_command_server.o: ../../include/sys_defs.h -+mail_command_server.o: ../../include/vbuf.h -+mail_command_server.o: ../../include/vstream.h -+mail_command_server.o: mail_command_server.c -+mail_command_server.o: mail_proto.h -+mail_conf.o: ../../include/argv.h -+mail_conf.o: ../../include/dict.h -+mail_conf.o: ../../include/msg.h -+mail_conf.o: ../../include/mymalloc.h -+mail_conf.o: ../../include/readlline.h -+mail_conf.o: ../../include/safe.h -+mail_conf.o: ../../include/stringops.h -+mail_conf.o: ../../include/sys_defs.h -+mail_conf.o: ../../include/vbuf.h -+mail_conf.o: ../../include/vstream.h -+mail_conf.o: ../../include/vstring.h -+mail_conf.o: mail_conf.c -+mail_conf.o: mail_conf.h -+mail_conf.o: mail_params.h -+mail_conf_bool.o: ../../include/argv.h -+mail_conf_bool.o: ../../include/dict.h -+mail_conf_bool.o: ../../include/msg.h -+mail_conf_bool.o: ../../include/sys_defs.h -+mail_conf_bool.o: ../../include/vbuf.h -+mail_conf_bool.o: ../../include/vstream.h -+mail_conf_bool.o: ../../include/vstring.h -+mail_conf_bool.o: mail_conf.h -+mail_conf_bool.o: mail_conf_bool.c -+mail_conf_int.o: ../../include/argv.h -+mail_conf_int.o: ../../include/dict.h -+mail_conf_int.o: ../../include/msg.h -+mail_conf_int.o: ../../include/mymalloc.h -+mail_conf_int.o: ../../include/stringops.h -+mail_conf_int.o: ../../include/sys_defs.h -+mail_conf_int.o: ../../include/vbuf.h -+mail_conf_int.o: ../../include/vstream.h -+mail_conf_int.o: ../../include/vstring.h -+mail_conf_int.o: mail_conf.h -+mail_conf_int.o: mail_conf_int.c -+mail_conf_long.o: ../../include/argv.h -+mail_conf_long.o: ../../include/dict.h -+mail_conf_long.o: ../../include/msg.h -+mail_conf_long.o: ../../include/mymalloc.h -+mail_conf_long.o: ../../include/stringops.h -+mail_conf_long.o: ../../include/sys_defs.h -+mail_conf_long.o: ../../include/vbuf.h -+mail_conf_long.o: ../../include/vstream.h -+mail_conf_long.o: ../../include/vstring.h -+mail_conf_long.o: mail_conf.h -+mail_conf_long.o: mail_conf_long.c -+mail_conf_nint.o: ../../include/argv.h -+mail_conf_nint.o: ../../include/dict.h -+mail_conf_nint.o: ../../include/msg.h -+mail_conf_nint.o: ../../include/mymalloc.h -+mail_conf_nint.o: ../../include/stringops.h -+mail_conf_nint.o: ../../include/sys_defs.h -+mail_conf_nint.o: ../../include/vbuf.h -+mail_conf_nint.o: ../../include/vstream.h -+mail_conf_nint.o: ../../include/vstring.h -+mail_conf_nint.o: mail_conf.h -+mail_conf_nint.o: mail_conf_nint.c -+mail_conf_raw.o: ../../include/msg.h -+mail_conf_raw.o: ../../include/mymalloc.h -+mail_conf_raw.o: ../../include/sys_defs.h -+mail_conf_raw.o: mail_conf.h -+mail_conf_raw.o: mail_conf_raw.c -+mail_conf_str.o: ../../include/msg.h -+mail_conf_str.o: ../../include/mymalloc.h -+mail_conf_str.o: ../../include/stringops.h -+mail_conf_str.o: ../../include/sys_defs.h -+mail_conf_str.o: ../../include/vbuf.h -+mail_conf_str.o: ../../include/vstring.h -+mail_conf_str.o: mail_conf.h -+mail_conf_str.o: mail_conf_str.c -+mail_conf_time.o: ../../include/argv.h -+mail_conf_time.o: ../../include/dict.h -+mail_conf_time.o: ../../include/msg.h -+mail_conf_time.o: ../../include/mymalloc.h -+mail_conf_time.o: ../../include/stringops.h -+mail_conf_time.o: ../../include/sys_defs.h -+mail_conf_time.o: ../../include/vbuf.h -+mail_conf_time.o: ../../include/vstream.h -+mail_conf_time.o: ../../include/vstring.h -+mail_conf_time.o: conv_time.h -+mail_conf_time.o: mail_conf.h -+mail_conf_time.o: mail_conf_time.c -+mail_connect.o: ../../include/attr.h -+mail_connect.o: ../../include/connect.h -+mail_connect.o: ../../include/iostuff.h -+mail_connect.o: ../../include/msg.h -+mail_connect.o: ../../include/mymalloc.h -+mail_connect.o: ../../include/stringops.h -+mail_connect.o: ../../include/sys_defs.h -+mail_connect.o: ../../include/vbuf.h -+mail_connect.o: ../../include/vstream.h -+mail_connect.o: ../../include/vstring.h -+mail_connect.o: mail_connect.c -+mail_connect.o: mail_proto.h -+mail_connect.o: timed_ipc.h -+mail_copy.o: ../../include/htable.h -+mail_copy.o: ../../include/iostuff.h -+mail_copy.o: ../../include/msg.h -+mail_copy.o: ../../include/safe_open.h -+mail_copy.o: ../../include/stringops.h -+mail_copy.o: ../../include/sys_defs.h -+mail_copy.o: ../../include/vbuf.h -+mail_copy.o: ../../include/vstream.h -+mail_copy.o: ../../include/vstring.h -+mail_copy.o: ../../include/vstring_vstream.h -+mail_copy.o: dsn.h -+mail_copy.o: dsn_buf.h -+mail_copy.o: mail_addr.h -+mail_copy.o: mail_copy.c -+mail_copy.o: mail_copy.h -+mail_copy.o: mail_params.h -+mail_copy.o: mail_queue.h -+mail_copy.o: mark_corrupt.h -+mail_copy.o: mbox_open.h -+mail_copy.o: quote_822_local.h -+mail_copy.o: quote_flags.h -+mail_copy.o: rec_type.h -+mail_copy.o: record.h -+mail_copy.o: sys_exits.h -+mail_date.o: ../../include/msg.h -+mail_date.o: ../../include/sys_defs.h -+mail_date.o: ../../include/vbuf.h -+mail_date.o: ../../include/vstring.h -+mail_date.o: mail_date.c -+mail_date.o: mail_date.h -+mail_dict.o: ../../include/argv.h -+mail_dict.o: ../../include/dict.h -+mail_dict.o: ../../include/msg.h -+mail_dict.o: ../../include/sys_defs.h -+mail_dict.o: ../../include/vbuf.h -+mail_dict.o: ../../include/vstream.h -+mail_dict.o: ../../include/vstring.h -+mail_dict.o: dict_ldap.h -+mail_dict.o: dict_mysql.h -+mail_dict.o: dict_pgsql.h -+mail_dict.o: dict_proxy.h -+mail_dict.o: mail_dict.c -+mail_dict.o: mail_dict.h -+mail_error.o: ../../include/name_mask.h -+mail_error.o: ../../include/sys_defs.h -+mail_error.o: ../../include/vbuf.h -+mail_error.o: ../../include/vstring.h -+mail_error.o: mail_error.c -+mail_error.o: mail_error.h -+mail_flush.o: ../../include/attr.h -+mail_flush.o: ../../include/iostuff.h -+mail_flush.o: ../../include/sys_defs.h -+mail_flush.o: ../../include/vbuf.h -+mail_flush.o: ../../include/vstream.h -+mail_flush.o: mail_flush.c -+mail_flush.o: mail_flush.h -+mail_flush.o: mail_params.h -+mail_flush.o: mail_proto.h -+mail_open_ok.o: ../../include/msg.h -+mail_open_ok.o: ../../include/sys_defs.h -+mail_open_ok.o: ../../include/vbuf.h -+mail_open_ok.o: ../../include/vstream.h -+mail_open_ok.o: ../../include/vstring.h -+mail_open_ok.o: mail_open_ok.c -+mail_open_ok.o: mail_open_ok.h -+mail_open_ok.o: mail_queue.h -+mail_params.o: ../../include/argv.h -+mail_params.o: ../../include/attr.h -+mail_params.o: ../../include/dict.h -+mail_params.o: ../../include/dict_db.h -+mail_params.o: ../../include/get_hostname.h -+mail_params.o: ../../include/inet_addr_list.h -+mail_params.o: ../../include/inet_proto.h -+mail_params.o: ../../include/iostuff.h -+mail_params.o: ../../include/msg.h -+mail_params.o: ../../include/msg_syslog.h -+mail_params.o: ../../include/myaddrinfo.h -+mail_params.o: ../../include/mymalloc.h -+mail_params.o: ../../include/safe.h -+mail_params.o: ../../include/safe_open.h -+mail_params.o: ../../include/stringops.h -+mail_params.o: ../../include/sys_defs.h -+mail_params.o: ../../include/valid_hostname.h -+mail_params.o: ../../include/vbuf.h -+mail_params.o: ../../include/vstream.h -+mail_params.o: ../../include/vstring.h -+mail_params.o: ../../include/vstring_vstream.h -+mail_params.o: mail_conf.h -+mail_params.o: mail_params.c -+mail_params.o: mail_params.h -+mail_params.o: mail_proto.h -+mail_params.o: mail_version.h -+mail_params.o: mynetworks.h -+mail_params.o: own_inet_addr.h -+mail_params.o: recipient_list.h -+mail_params.o: verp_sender.h -+mail_pathname.o: ../../include/attr.h -+mail_pathname.o: ../../include/iostuff.h -+mail_pathname.o: ../../include/stringops.h -+mail_pathname.o: ../../include/sys_defs.h -+mail_pathname.o: ../../include/vbuf.h -+mail_pathname.o: ../../include/vstream.h -+mail_pathname.o: ../../include/vstring.h -+mail_pathname.o: mail_pathname.c -+mail_pathname.o: mail_proto.h -+mail_queue.o: ../../include/argv.h -+mail_queue.o: ../../include/dir_forest.h -+mail_queue.o: ../../include/make_dirs.h -+mail_queue.o: ../../include/msg.h -+mail_queue.o: ../../include/mymalloc.h -+mail_queue.o: ../../include/sane_fsops.h -+mail_queue.o: ../../include/split_at.h -+mail_queue.o: ../../include/sys_defs.h -+mail_queue.o: ../../include/valid_hostname.h -+mail_queue.o: ../../include/vbuf.h -+mail_queue.o: ../../include/vstream.h -+mail_queue.o: ../../include/vstring.h -+mail_queue.o: file_id.h -+mail_queue.o: mail_params.h -+mail_queue.o: mail_queue.c -+mail_queue.o: mail_queue.h -+mail_run.o: ../../include/msg.h -+mail_run.o: ../../include/mymalloc.h -+mail_run.o: ../../include/stringops.h -+mail_run.o: ../../include/sys_defs.h -+mail_run.o: ../../include/vbuf.h -+mail_run.o: ../../include/vstring.h -+mail_run.o: mail_params.h -+mail_run.o: mail_run.c -+mail_run.o: mail_run.h -+mail_scan_dir.o: ../../include/scan_dir.h -+mail_scan_dir.o: ../../include/sys_defs.h -+mail_scan_dir.o: mail_scan_dir.c -+mail_scan_dir.o: mail_scan_dir.h -+mail_stream.o: ../../include/argv.h -+mail_stream.o: ../../include/attr.h -+mail_stream.o: ../../include/iostuff.h -+mail_stream.o: ../../include/msg.h -+mail_stream.o: ../../include/mymalloc.h -+mail_stream.o: ../../include/sane_fsops.h -+mail_stream.o: ../../include/stringops.h -+mail_stream.o: ../../include/sys_defs.h -+mail_stream.o: ../../include/vbuf.h -+mail_stream.o: ../../include/vstream.h -+mail_stream.o: ../../include/vstring.h -+mail_stream.o: cleanup_user.h -+mail_stream.o: mail_params.h -+mail_stream.o: mail_proto.h -+mail_stream.o: mail_queue.h -+mail_stream.o: mail_stream.c -+mail_stream.o: mail_stream.h -+mail_stream.o: opened.h -+mail_task.o: ../../include/safe.h -+mail_task.o: ../../include/sys_defs.h -+mail_task.o: ../../include/vbuf.h -+mail_task.o: ../../include/vstring.h -+mail_task.o: mail_conf.h -+mail_task.o: mail_params.h -+mail_task.o: mail_task.c -+mail_task.o: mail_task.h -+mail_trigger.o: ../../include/attr.h -+mail_trigger.o: ../../include/iostuff.h -+mail_trigger.o: ../../include/msg.h -+mail_trigger.o: ../../include/mymalloc.h -+mail_trigger.o: ../../include/sys_defs.h -+mail_trigger.o: ../../include/trigger.h -+mail_trigger.o: ../../include/vbuf.h -+mail_trigger.o: ../../include/vstream.h -+mail_trigger.o: mail_params.h -+mail_trigger.o: mail_proto.h -+mail_trigger.o: mail_trigger.c -+mail_version.o: mail_version.c -+maps.o: ../../include/argv.h -+maps.o: ../../include/dict.h -+maps.o: ../../include/msg.h -+maps.o: ../../include/mymalloc.h -+maps.o: ../../include/split_at.h -+maps.o: ../../include/stringops.h -+maps.o: ../../include/sys_defs.h -+maps.o: ../../include/vbuf.h -+maps.o: ../../include/vstream.h -+maps.o: ../../include/vstring.h -+maps.o: mail_conf.h -+maps.o: maps.c -+maps.o: maps.h -+mark_corrupt.o: ../../include/attr.h -+mark_corrupt.o: ../../include/msg.h -+mark_corrupt.o: ../../include/set_eugid.h -+mark_corrupt.o: ../../include/sys_defs.h -+mark_corrupt.o: ../../include/vbuf.h -+mark_corrupt.o: ../../include/vstream.h -+mark_corrupt.o: ../../include/vstring.h -+mark_corrupt.o: deliver_request.h -+mark_corrupt.o: dsn.h -+mark_corrupt.o: mail_params.h -+mark_corrupt.o: mail_queue.h -+mark_corrupt.o: mark_corrupt.c -+mark_corrupt.o: mark_corrupt.h -+mark_corrupt.o: msg_stats.h -+mark_corrupt.o: recipient_list.h -+match_parent_style.o: ../../include/match_list.h -+match_parent_style.o: ../../include/match_ops.h -+match_parent_style.o: ../../include/sys_defs.h -+match_parent_style.o: mail_params.h -+match_parent_style.o: match_parent_style.c -+match_parent_style.o: match_parent_style.h -+match_parent_style.o: string_list.h -+match_service.o: ../../include/argv.h -+match_service.o: ../../include/msg.h -+match_service.o: ../../include/mymalloc.h -+match_service.o: ../../include/stringops.h -+match_service.o: ../../include/sys_defs.h -+match_service.o: ../../include/vbuf.h -+match_service.o: ../../include/vstring.h -+match_service.o: match_service.c -+match_service.o: match_service.h -+mbox_conf.o: ../../include/argv.h -+mbox_conf.o: ../../include/name_mask.h -+mbox_conf.o: ../../include/sys_defs.h -+mbox_conf.o: ../../include/vbuf.h -+mbox_conf.o: ../../include/vstring.h -+mbox_conf.o: mail_params.h -+mbox_conf.o: mbox_conf.c -+mbox_conf.o: mbox_conf.h -+mbox_open.o: ../../include/argv.h -+mbox_open.o: ../../include/iostuff.h -+mbox_open.o: ../../include/msg.h -+mbox_open.o: ../../include/myflock.h -+mbox_open.o: ../../include/mymalloc.h -+mbox_open.o: ../../include/safe_open.h -+mbox_open.o: ../../include/sys_defs.h -+mbox_open.o: ../../include/vbuf.h -+mbox_open.o: ../../include/vstream.h -+mbox_open.o: ../../include/vstring.h -+mbox_open.o: deliver_flock.h -+mbox_open.o: dot_lockfile.h -+mbox_open.o: dsn.h -+mbox_open.o: dsn_buf.h -+mbox_open.o: mbox_conf.h -+mbox_open.o: mbox_open.c -+mbox_open.o: mbox_open.h -+mime_state.o: ../../include/msg.h -+mime_state.o: ../../include/mymalloc.h -+mime_state.o: ../../include/sys_defs.h -+mime_state.o: ../../include/vbuf.h -+mime_state.o: ../../include/vstring.h -+mime_state.o: header_opts.h -+mime_state.o: header_token.h -+mime_state.o: is_header.h -+mime_state.o: lex_822.h -+mime_state.o: mail_params.h -+mime_state.o: mime_state.c -+mime_state.o: mime_state.h -+mime_state.o: rec_type.h -+mkmap_cdb.o: ../../include/argv.h -+mkmap_cdb.o: ../../include/dict.h -+mkmap_cdb.o: ../../include/dict_cdb.h -+mkmap_cdb.o: ../../include/mymalloc.h -+mkmap_cdb.o: ../../include/sys_defs.h -+mkmap_cdb.o: ../../include/vbuf.h -+mkmap_cdb.o: ../../include/vstream.h -+mkmap_cdb.o: ../../include/vstring.h -+mkmap_cdb.o: mkmap.h -+mkmap_cdb.o: mkmap_cdb.c -+mkmap_db.o: ../../include/argv.h -+mkmap_db.o: ../../include/dict.h -+mkmap_db.o: ../../include/dict_db.h -+mkmap_db.o: ../../include/msg.h -+mkmap_db.o: ../../include/myflock.h -+mkmap_db.o: ../../include/mymalloc.h -+mkmap_db.o: ../../include/stringops.h -+mkmap_db.o: ../../include/sys_defs.h -+mkmap_db.o: ../../include/vbuf.h -+mkmap_db.o: ../../include/vstream.h -+mkmap_db.o: ../../include/vstring.h -+mkmap_db.o: mail_params.h -+mkmap_db.o: mkmap.h -+mkmap_db.o: mkmap_db.c -+mkmap_dbm.o: ../../include/argv.h -+mkmap_dbm.o: ../../include/dict.h -+mkmap_dbm.o: ../../include/dict_dbm.h -+mkmap_dbm.o: ../../include/msg.h -+mkmap_dbm.o: ../../include/myflock.h -+mkmap_dbm.o: ../../include/mymalloc.h -+mkmap_dbm.o: ../../include/stringops.h -+mkmap_dbm.o: ../../include/sys_defs.h -+mkmap_dbm.o: ../../include/vbuf.h -+mkmap_dbm.o: ../../include/vstream.h -+mkmap_dbm.o: ../../include/vstring.h -+mkmap_dbm.o: mkmap.h -+mkmap_dbm.o: mkmap_dbm.c -+mkmap_open.o: ../../include/argv.h -+mkmap_open.o: ../../include/dict.h -+mkmap_open.o: ../../include/dict_cdb.h -+mkmap_open.o: ../../include/dict_db.h -+mkmap_open.o: ../../include/dict_dbm.h -+mkmap_open.o: ../../include/dict_sdbm.h -+mkmap_open.o: ../../include/msg.h -+mkmap_open.o: ../../include/mymalloc.h -+mkmap_open.o: ../../include/sigdelay.h -+mkmap_open.o: ../../include/sys_defs.h -+mkmap_open.o: ../../include/vbuf.h -+mkmap_open.o: ../../include/vstream.h -+mkmap_open.o: ../../include/vstring.h -+mkmap_open.o: dict_proxy.h -+mkmap_open.o: mkmap.h -+mkmap_open.o: mkmap_open.c -+mkmap_proxy.o: ../../include/argv.h -+mkmap_proxy.o: ../../include/dict.h -+mkmap_proxy.o: ../../include/mymalloc.h -+mkmap_proxy.o: ../../include/sys_defs.h -+mkmap_proxy.o: ../../include/vbuf.h -+mkmap_proxy.o: ../../include/vstream.h -+mkmap_proxy.o: ../../include/vstring.h -+mkmap_proxy.o: dict_proxy.h -+mkmap_proxy.o: mkmap.h -+mkmap_proxy.o: mkmap_proxy.c -+mkmap_sdbm.o: ../../include/argv.h -+mkmap_sdbm.o: ../../include/dict.h -+mkmap_sdbm.o: ../../include/dict_sdbm.h -+mkmap_sdbm.o: ../../include/msg.h -+mkmap_sdbm.o: ../../include/myflock.h -+mkmap_sdbm.o: ../../include/mymalloc.h -+mkmap_sdbm.o: ../../include/stringops.h -+mkmap_sdbm.o: ../../include/sys_defs.h -+mkmap_sdbm.o: ../../include/vbuf.h -+mkmap_sdbm.o: ../../include/vstream.h -+mkmap_sdbm.o: ../../include/vstring.h -+mkmap_sdbm.o: mkmap.h -+mkmap_sdbm.o: mkmap_sdbm.c -+msg_stats_print.o: ../../include/attr.h -+msg_stats_print.o: ../../include/iostuff.h -+msg_stats_print.o: ../../include/sys_defs.h -+msg_stats_print.o: ../../include/vbuf.h -+msg_stats_print.o: ../../include/vstream.h -+msg_stats_print.o: mail_proto.h -+msg_stats_print.o: msg_stats.h -+msg_stats_print.o: msg_stats_print.c -+msg_stats_scan.o: ../../include/attr.h -+msg_stats_scan.o: ../../include/iostuff.h -+msg_stats_scan.o: ../../include/msg.h -+msg_stats_scan.o: ../../include/sys_defs.h -+msg_stats_scan.o: ../../include/vbuf.h -+msg_stats_scan.o: ../../include/vstream.h -+msg_stats_scan.o: ../../include/vstring.h -+msg_stats_scan.o: mail_proto.h -+msg_stats_scan.o: msg_stats.h -+msg_stats_scan.o: msg_stats_scan.c -+mynetworks.o: ../../include/argv.h -+mynetworks.o: ../../include/inet_addr_list.h -+mynetworks.o: ../../include/mask_addr.h -+mynetworks.o: ../../include/msg.h -+mynetworks.o: ../../include/myaddrinfo.h -+mynetworks.o: ../../include/name_mask.h -+mynetworks.o: ../../include/sock_addr.h -+mynetworks.o: ../../include/sys_defs.h -+mynetworks.o: ../../include/vbuf.h -+mynetworks.o: ../../include/vstring.h -+mynetworks.o: been_here.h -+mynetworks.o: mail_params.h -+mynetworks.o: mynetworks.c -+mynetworks.o: mynetworks.h -+mynetworks.o: own_inet_addr.h -+mypwd.o: ../../include/binhash.h -+mypwd.o: ../../include/htable.h -+mypwd.o: ../../include/msg.h -+mypwd.o: ../../include/mymalloc.h -+mypwd.o: ../../include/sys_defs.h -+mypwd.o: mypwd.c -+mypwd.o: mypwd.h -+namadr_list.o: ../../include/match_list.h -+namadr_list.o: ../../include/match_ops.h -+namadr_list.o: ../../include/sys_defs.h -+namadr_list.o: namadr_list.c -+namadr_list.o: namadr_list.h -+off_cvt.o: ../../include/msg.h -+off_cvt.o: ../../include/sys_defs.h -+off_cvt.o: ../../include/vbuf.h -+off_cvt.o: ../../include/vstring.h -+off_cvt.o: off_cvt.c -+off_cvt.o: off_cvt.h -+opened.o: ../../include/msg.h -+opened.o: ../../include/sys_defs.h -+opened.o: ../../include/vbuf.h -+opened.o: ../../include/vstring.h -+opened.o: opened.c -+opened.o: opened.h -+own_inet_addr.o: ../../include/inet_addr_host.h -+own_inet_addr.o: ../../include/inet_addr_list.h -+own_inet_addr.o: ../../include/inet_addr_local.h -+own_inet_addr.o: ../../include/inet_proto.h -+own_inet_addr.o: ../../include/msg.h -+own_inet_addr.o: ../../include/myaddrinfo.h -+own_inet_addr.o: ../../include/mymalloc.h -+own_inet_addr.o: ../../include/sock_addr.h -+own_inet_addr.o: ../../include/stringops.h -+own_inet_addr.o: ../../include/sys_defs.h -+own_inet_addr.o: ../../include/vbuf.h -+own_inet_addr.o: ../../include/vstring.h -+own_inet_addr.o: mail_params.h -+own_inet_addr.o: own_inet_addr.c -+own_inet_addr.o: own_inet_addr.h -+pipe_command.o: ../../include/argv.h -+pipe_command.o: ../../include/chroot_uid.h -+pipe_command.o: ../../include/clean_env.h -+pipe_command.o: ../../include/exec_command.h -+pipe_command.o: ../../include/iostuff.h -+pipe_command.o: ../../include/msg.h -+pipe_command.o: ../../include/msg_vstream.h -+pipe_command.o: ../../include/set_eugid.h -+pipe_command.o: ../../include/set_ugid.h -+pipe_command.o: ../../include/stringops.h -+pipe_command.o: ../../include/sys_defs.h -+pipe_command.o: ../../include/timed_wait.h -+pipe_command.o: ../../include/vbuf.h -+pipe_command.o: ../../include/vstream.h -+pipe_command.o: ../../include/vstring.h -+pipe_command.o: dsn.h -+pipe_command.o: dsn_buf.h -+pipe_command.o: dsn_util.h -+pipe_command.o: mail_copy.h -+pipe_command.o: mail_params.h -+pipe_command.o: pipe_command.c -+pipe_command.o: pipe_command.h -+pipe_command.o: sys_exits.h -+post_mail.o: ../../include/attr.h -+post_mail.o: ../../include/events.h -+post_mail.o: ../../include/iostuff.h -+post_mail.o: ../../include/msg.h -+post_mail.o: ../../include/mymalloc.h -+post_mail.o: ../../include/sys_defs.h -+post_mail.o: ../../include/vbuf.h -+post_mail.o: ../../include/vstream.h -+post_mail.o: ../../include/vstring.h -+post_mail.o: cleanup_user.h -+post_mail.o: int_filt.h -+post_mail.o: mail_date.h -+post_mail.o: mail_params.h -+post_mail.o: mail_proto.h -+post_mail.o: post_mail.c -+post_mail.o: post_mail.h -+post_mail.o: rec_type.h -+post_mail.o: record.h -+quote_821_local.o: ../../include/sys_defs.h -+quote_821_local.o: ../../include/vbuf.h -+quote_821_local.o: ../../include/vstring.h -+quote_821_local.o: quote_821_local.c -+quote_821_local.o: quote_821_local.h -+quote_821_local.o: quote_flags.h -+quote_822_local.o: ../../include/sys_defs.h -+quote_822_local.o: ../../include/vbuf.h -+quote_822_local.o: ../../include/vstring.h -+quote_822_local.o: quote_822_local.c -+quote_822_local.o: quote_822_local.h -+quote_822_local.o: quote_flags.h -+rcpt_buf.o: ../../include/attr.h -+rcpt_buf.o: ../../include/iostuff.h -+rcpt_buf.o: ../../include/mymalloc.h -+rcpt_buf.o: ../../include/sys_defs.h -+rcpt_buf.o: ../../include/vbuf.h -+rcpt_buf.o: ../../include/vstream.h -+rcpt_buf.o: ../../include/vstring.h -+rcpt_buf.o: mail_proto.h -+rcpt_buf.o: rcpt_buf.c -+rcpt_buf.o: rcpt_buf.h -+rcpt_buf.o: recipient_list.h -+rcpt_print.o: ../../include/attr.h -+rcpt_print.o: ../../include/iostuff.h -+rcpt_print.o: ../../include/sys_defs.h -+rcpt_print.o: ../../include/vbuf.h -+rcpt_print.o: ../../include/vstream.h -+rcpt_print.o: mail_proto.h -+rcpt_print.o: rcpt_print.c -+rcpt_print.o: rcpt_print.h -+rcpt_print.o: recipient_list.h -+rec2stream.o: ../../include/sys_defs.h -+rec2stream.o: ../../include/vbuf.h -+rec2stream.o: ../../include/vstream.h -+rec2stream.o: ../../include/vstring.h -+rec2stream.o: rec2stream.c -+rec2stream.o: rec_streamlf.h -+rec2stream.o: rec_type.h -+rec2stream.o: record.h -+rec_attr_map.o: ../../include/attr.h -+rec_attr_map.o: ../../include/iostuff.h -+rec_attr_map.o: ../../include/sys_defs.h -+rec_attr_map.o: ../../include/vbuf.h -+rec_attr_map.o: ../../include/vstream.h -+rec_attr_map.o: mail_proto.h -+rec_attr_map.o: rec_attr_map.c -+rec_attr_map.o: rec_attr_map.h -+rec_attr_map.o: rec_type.h -+rec_streamlf.o: ../../include/sys_defs.h -+rec_streamlf.o: ../../include/vbuf.h -+rec_streamlf.o: ../../include/vstream.h -+rec_streamlf.o: ../../include/vstring.h -+rec_streamlf.o: rec_streamlf.c -+rec_streamlf.o: rec_streamlf.h -+rec_streamlf.o: rec_type.h -+rec_streamlf.o: record.h -+rec_type.o: rec_type.c -+rec_type.o: rec_type.h -+recdump.o: ../../include/msg_vstream.h -+recdump.o: ../../include/sys_defs.h -+recdump.o: ../../include/vbuf.h -+recdump.o: ../../include/vstream.h -+recdump.o: ../../include/vstring.h -+recdump.o: rec_streamlf.h -+recdump.o: rec_type.h -+recdump.o: recdump.c -+recdump.o: record.h -+recipient_list.o: ../../include/msg.h -+recipient_list.o: ../../include/mymalloc.h -+recipient_list.o: ../../include/sys_defs.h -+recipient_list.o: recipient_list.c -+recipient_list.o: recipient_list.h -+record.o: ../../include/msg.h -+record.o: ../../include/mymalloc.h -+record.o: ../../include/stringops.h -+record.o: ../../include/sys_defs.h -+record.o: ../../include/vbuf.h -+record.o: ../../include/vstream.h -+record.o: ../../include/vstring.h -+record.o: off_cvt.h -+record.o: rec_type.h -+record.o: record.c -+record.o: record.h -+remove.o: ../../include/sys_defs.h -+remove.o: ../../include/vbuf.h -+remove.o: ../../include/vstring.h -+remove.o: mail_params.h -+remove.o: remove.c -+resolve_clnt.o: ../../include/attr.h -+resolve_clnt.o: ../../include/events.h -+resolve_clnt.o: ../../include/iostuff.h -+resolve_clnt.o: ../../include/msg.h -+resolve_clnt.o: ../../include/sys_defs.h -+resolve_clnt.o: ../../include/vbuf.h -+resolve_clnt.o: ../../include/vstream.h -+resolve_clnt.o: ../../include/vstring.h -+resolve_clnt.o: ../../include/vstring_vstream.h -+resolve_clnt.o: clnt_stream.h -+resolve_clnt.o: mail_params.h -+resolve_clnt.o: mail_proto.h -+resolve_clnt.o: resolve_clnt.c -+resolve_clnt.o: resolve_clnt.h -+resolve_local.o: ../../include/inet_addr_list.h -+resolve_local.o: ../../include/match_list.h -+resolve_local.o: ../../include/match_ops.h -+resolve_local.o: ../../include/msg.h -+resolve_local.o: ../../include/myaddrinfo.h -+resolve_local.o: ../../include/mymalloc.h -+resolve_local.o: ../../include/sys_defs.h -+resolve_local.o: ../../include/valid_hostname.h -+resolve_local.o: mail_params.h -+resolve_local.o: own_inet_addr.h -+resolve_local.o: resolve_local.c -+resolve_local.o: resolve_local.h -+resolve_local.o: string_list.h -+resolve_local.o: valid_mailhost_addr.h -+rewrite_clnt.o: ../../include/attr.h -+rewrite_clnt.o: ../../include/events.h -+rewrite_clnt.o: ../../include/iostuff.h -+rewrite_clnt.o: ../../include/msg.h -+rewrite_clnt.o: ../../include/sys_defs.h -+rewrite_clnt.o: ../../include/vbuf.h -+rewrite_clnt.o: ../../include/vstream.h -+rewrite_clnt.o: ../../include/vstring.h -+rewrite_clnt.o: ../../include/vstring_vstream.h -+rewrite_clnt.o: clnt_stream.h -+rewrite_clnt.o: mail_params.h -+rewrite_clnt.o: mail_proto.h -+rewrite_clnt.o: quote_822_local.h -+rewrite_clnt.o: quote_flags.h -+rewrite_clnt.o: rewrite_clnt.c -+rewrite_clnt.o: rewrite_clnt.h -+scache.o: ../../include/argv.h -+scache.o: ../../include/events.h -+scache.o: ../../include/msg.h -+scache.o: ../../include/sys_defs.h -+scache.o: ../../include/vbuf.h -+scache.o: ../../include/vstream.h -+scache.o: ../../include/vstring.h -+scache.o: ../../include/vstring_vstream.h -+scache.o: scache.c -+scache.o: scache.h -+scache_clnt.o: ../../include/attr.h -+scache_clnt.o: ../../include/auto_clnt.h -+scache_clnt.o: ../../include/iostuff.h -+scache_clnt.o: ../../include/msg.h -+scache_clnt.o: ../../include/mymalloc.h -+scache_clnt.o: ../../include/stringops.h -+scache_clnt.o: ../../include/sys_defs.h -+scache_clnt.o: ../../include/vbuf.h -+scache_clnt.o: ../../include/vstream.h -+scache_clnt.o: ../../include/vstring.h -+scache_clnt.o: mail_params.h -+scache_clnt.o: mail_proto.h -+scache_clnt.o: scache.h -+scache_clnt.o: scache_clnt.c -+scache_multi.o: ../../include/events.h -+scache_multi.o: ../../include/htable.h -+scache_multi.o: ../../include/msg.h -+scache_multi.o: ../../include/mymalloc.h -+scache_multi.o: ../../include/ring.h -+scache_multi.o: ../../include/sys_defs.h -+scache_multi.o: ../../include/vbuf.h -+scache_multi.o: ../../include/vstring.h -+scache_multi.o: scache.h -+scache_multi.o: scache_multi.c -+scache_single.o: ../../include/events.h -+scache_single.o: ../../include/msg.h -+scache_single.o: ../../include/mymalloc.h -+scache_single.o: ../../include/sys_defs.h -+scache_single.o: ../../include/vbuf.h -+scache_single.o: ../../include/vstring.h -+scache_single.o: scache.h -+scache_single.o: scache_single.c -+sent.o: ../../include/attr.h -+sent.o: ../../include/msg.h -+sent.o: ../../include/sys_defs.h -+sent.o: ../../include/vbuf.h -+sent.o: ../../include/vstream.h -+sent.o: ../../include/vstring.h -+sent.o: bounce.h -+sent.o: defer.h -+sent.o: deliver_request.h -+sent.o: dsn.h -+sent.o: dsn_buf.h -+sent.o: dsn_mask.h -+sent.o: dsn_util.h -+sent.o: log_adhoc.h -+sent.o: mail_params.h -+sent.o: msg_stats.h -+sent.o: recipient_list.h -+sent.o: sent.c -+sent.o: sent.h -+sent.o: trace.h -+sent.o: verify.h -+smtp_stream.o: ../../include/iostuff.h -+smtp_stream.o: ../../include/msg.h -+smtp_stream.o: ../../include/sys_defs.h -+smtp_stream.o: ../../include/vbuf.h -+smtp_stream.o: ../../include/vstream.h -+smtp_stream.o: ../../include/vstring.h -+smtp_stream.o: ../../include/vstring_vstream.h -+smtp_stream.o: smtp_stream.c -+smtp_stream.o: smtp_stream.h -+split_addr.o: ../../include/split_at.h -+split_addr.o: ../../include/sys_defs.h -+split_addr.o: mail_addr.h -+split_addr.o: mail_params.h -+split_addr.o: split_addr.c -+split_addr.o: split_addr.h -+stream2rec.o: ../../include/sys_defs.h -+stream2rec.o: ../../include/vbuf.h -+stream2rec.o: ../../include/vstream.h -+stream2rec.o: ../../include/vstring.h -+stream2rec.o: rec_streamlf.h -+stream2rec.o: rec_type.h -+stream2rec.o: record.h -+stream2rec.o: stream2rec.c -+string_list.o: ../../include/match_list.h -+string_list.o: ../../include/match_ops.h -+string_list.o: ../../include/sys_defs.h -+string_list.o: string_list.c -+string_list.o: string_list.h -+strip_addr.o: ../../include/mymalloc.h -+strip_addr.o: ../../include/sys_defs.h -+strip_addr.o: split_addr.h -+strip_addr.o: strip_addr.c -+strip_addr.o: strip_addr.h -+sys_exits.o: ../../include/msg.h -+sys_exits.o: ../../include/sys_defs.h -+sys_exits.o: ../../include/vbuf.h -+sys_exits.o: ../../include/vstring.h -+sys_exits.o: sys_exits.c -+sys_exits.o: sys_exits.h -+timed_ipc.o: ../../include/msg.h -+timed_ipc.o: ../../include/sys_defs.h -+timed_ipc.o: ../../include/vbuf.h -+timed_ipc.o: ../../include/vstream.h -+timed_ipc.o: mail_params.h -+timed_ipc.o: timed_ipc.c -+timed_ipc.o: timed_ipc.h -+tok822_find.o: ../../include/sys_defs.h -+tok822_find.o: ../../include/vbuf.h -+tok822_find.o: ../../include/vstring.h -+tok822_find.o: resolve_clnt.h -+tok822_find.o: tok822.h -+tok822_find.o: tok822_find.c -+tok822_node.o: ../../include/mymalloc.h -+tok822_node.o: ../../include/sys_defs.h -+tok822_node.o: ../../include/vbuf.h -+tok822_node.o: ../../include/vstring.h -+tok822_node.o: resolve_clnt.h -+tok822_node.o: tok822.h -+tok822_node.o: tok822_node.c -+tok822_parse.o: ../../include/msg.h -+tok822_parse.o: ../../include/stringops.h -+tok822_parse.o: ../../include/sys_defs.h -+tok822_parse.o: ../../include/vbuf.h -+tok822_parse.o: ../../include/vstring.h -+tok822_parse.o: lex_822.h -+tok822_parse.o: quote_822_local.h -+tok822_parse.o: quote_flags.h -+tok822_parse.o: resolve_clnt.h -+tok822_parse.o: tok822.h -+tok822_parse.o: tok822_parse.c -+tok822_resolve.o: ../../include/msg.h -+tok822_resolve.o: ../../include/sys_defs.h -+tok822_resolve.o: ../../include/vbuf.h -+tok822_resolve.o: ../../include/vstring.h -+tok822_resolve.o: resolve_clnt.h -+tok822_resolve.o: tok822.h -+tok822_resolve.o: tok822_resolve.c -+tok822_rewrite.o: ../../include/attr.h -+tok822_rewrite.o: ../../include/iostuff.h -+tok822_rewrite.o: ../../include/msg.h -+tok822_rewrite.o: ../../include/sys_defs.h -+tok822_rewrite.o: ../../include/vbuf.h -+tok822_rewrite.o: ../../include/vstream.h -+tok822_rewrite.o: ../../include/vstring.h -+tok822_rewrite.o: mail_proto.h -+tok822_rewrite.o: resolve_clnt.h -+tok822_rewrite.o: rewrite_clnt.h -+tok822_rewrite.o: tok822.h -+tok822_rewrite.o: tok822_rewrite.c -+tok822_tree.o: ../../include/mymalloc.h -+tok822_tree.o: ../../include/sys_defs.h -+tok822_tree.o: ../../include/vbuf.h -+tok822_tree.o: ../../include/vstring.h -+tok822_tree.o: resolve_clnt.h -+tok822_tree.o: tok822.h -+tok822_tree.o: tok822_tree.c -+trace.o: ../../include/attr.h -+trace.o: ../../include/iostuff.h -+trace.o: ../../include/msg.h -+trace.o: ../../include/sys_defs.h -+trace.o: ../../include/vbuf.h -+trace.o: ../../include/vstream.h -+trace.o: ../../include/vstring.h -+trace.o: bounce.h -+trace.o: deliver_request.h -+trace.o: dsn.h -+trace.o: dsn_buf.h -+trace.o: dsn_print.h -+trace.o: log_adhoc.h -+trace.o: mail_params.h -+trace.o: mail_proto.h -+trace.o: msg_stats.h -+trace.o: rcpt_print.h -+trace.o: recipient_list.h -+trace.o: trace.c -+trace.o: trace.h -+user_acl.o: ../../include/match_list.h -+user_acl.o: ../../include/match_ops.h -+user_acl.o: ../../include/sys_defs.h -+user_acl.o: ../../include/vbuf.h -+user_acl.o: ../../include/vstring.h -+user_acl.o: mail_params.h -+user_acl.o: mypwd.h -+user_acl.o: string_list.h -+user_acl.o: user_acl.c -+user_acl.o: user_acl.h -+valid_mailhost_addr.o: ../../include/msg.h -+valid_mailhost_addr.o: ../../include/myaddrinfo.h -+valid_mailhost_addr.o: ../../include/sys_defs.h -+valid_mailhost_addr.o: ../../include/valid_hostname.h -+valid_mailhost_addr.o: valid_mailhost_addr.c -+valid_mailhost_addr.o: valid_mailhost_addr.h -+verify.o: ../../include/attr.h -+verify.o: ../../include/iostuff.h -+verify.o: ../../include/msg.h -+verify.o: ../../include/sys_defs.h -+verify.o: ../../include/vbuf.h -+verify.o: ../../include/vstream.h -+verify.o: ../../include/vstring.h -+verify.o: deliver_request.h -+verify.o: dsn.h -+verify.o: log_adhoc.h -+verify.o: mail_params.h -+verify.o: mail_proto.h -+verify.o: msg_stats.h -+verify.o: recipient_list.h -+verify.o: verify.c -+verify.o: verify.h -+verify.o: verify_clnt.h -+verify_clnt.o: ../../include/attr.h -+verify_clnt.o: ../../include/iostuff.h -+verify_clnt.o: ../../include/msg.h -+verify_clnt.o: ../../include/sys_defs.h -+verify_clnt.o: ../../include/vbuf.h -+verify_clnt.o: ../../include/vstream.h -+verify_clnt.o: ../../include/vstring.h -+verify_clnt.o: clnt_stream.h -+verify_clnt.o: deliver_request.h -+verify_clnt.o: dsn.h -+verify_clnt.o: mail_params.h -+verify_clnt.o: mail_proto.h -+verify_clnt.o: msg_stats.h -+verify_clnt.o: recipient_list.h -+verify_clnt.o: verify_clnt.c -+verify_clnt.o: verify_clnt.h -+verp_sender.o: ../../include/sys_defs.h -+verp_sender.o: ../../include/vbuf.h -+verp_sender.o: ../../include/vstring.h -+verp_sender.o: mail_params.h -+verp_sender.o: recipient_list.h -+verp_sender.o: verp_sender.c -+verp_sender.o: verp_sender.h -+wildcard_inet_addr.o: ../../include/inet_addr_host.h -+wildcard_inet_addr.o: ../../include/inet_addr_list.h -+wildcard_inet_addr.o: ../../include/msg.h -+wildcard_inet_addr.o: ../../include/myaddrinfo.h -+wildcard_inet_addr.o: ../../include/sys_defs.h -+wildcard_inet_addr.o: wildcard_inet_addr.c -+wildcard_inet_addr.o: wildcard_inet_addr.h -+xtext.o: ../../include/msg.h -+xtext.o: ../../include/sys_defs.h -+xtext.o: ../../include/vbuf.h -+xtext.o: ../../include/vstring.h -+xtext.o: xtext.c -+xtext.o: xtext.h -diff -ruN a/src/global/mail_conf.c b/src/global/mail_conf.c ---- a/src/global/mail_conf.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_conf.c 2009-06-01 13:08:26.000000000 +0000 -@@ -182,6 +182,13 @@ - path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); - dict_load_file(CONFIG_DICT, path); - myfree(path); -+ -+#ifndef NO_DYNAMIC_MAPS -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif -+ - } - - /* mail_conf_flush - discard configuration dictionary */ -diff -ruN a/src/global/mail_conf.c.orig b/src/global/mail_conf.c.orig ---- a/src/global/mail_conf.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/mail_conf.c.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,229 @@ -+/*++ -+/* NAME -+/* mail_conf 3 -+/* SUMMARY -+/* global configuration parameter management -+/* SYNOPSIS -+/* #include <mail_conf.h> -+/* -+/* void mail_conf_read() -+/* -+/* void mail_conf_suck() -+/* -+/* void mail_conf_flush() -+/* -+/* void mail_conf_update(name, value) -+/* const char *name; -+/* const char *value; -+/* -+/* const char *mail_conf_lookup(name) -+/* const char *name; -+/* -+/* const char *mail_conf_eval(string) -+/* const char *string; -+/* -+/* const char *mail_conf_lookup_eval(name) -+/* const char *name; -+/* DESCRIPTION -+/* mail_conf_suck() reads the global Postfix configuration file, and -+/* stores its values into a global configuration dictionary. -+/* -+/* mail_conf_read() invokes mail_conf_suck() and assigns the values -+/* to global variables by calling mail_params_init(). -+/* -+/* mail_conf_flush() discards the global configuration dictionary. -+/* This is needed in programs that read main.cf multiple times, to -+/* ensure that deleted parameter settings are handled properly. -+/* -+/* The following routines are wrappers around the generic dictionary -+/* access routines. -+/* -+/* mail_conf_update() updates the named global parameter. This has -+/* no effect on parameters whose value has already been looked up. -+/* The update succeeds or the program terminates with fatal error. -+/* -+/* mail_conf_lookup() looks up the value of the named parameter. -+/* A null pointer result means the parameter was not found. -+/* The result is volatile and should be copied if it is to be -+/* used for any appreciable amount of time. -+/* -+/* mail_conf_eval() recursively expands any $parameters in the -+/* string argument. The result is volatile and should be copied -+/* if it is to be used for any appreciable amount of time. -+/* -+/* mail_conf_lookup_eval() looks up the named parameter, and expands any -+/* $parameters in the result. The result is volatile and should be -+/* copied if it is to be used for any appreciable amount of time. -+/* DIAGNOSTICS -+/* Fatal errors: malformed numerical value. -+/* ENVIRONMENT -+/* MAIL_CONFIG, non-default configuration database -+/* MAIL_VERBOSE, enable verbose mode -+/* FILES -+/* /etc/postfix: default Postfix configuration directory. -+/* SEE ALSO -+/* dict(3) generic dictionary manager -+/* mail_conf_int(3) integer-valued parameters -+/* mail_conf_str(3) string-valued parameters -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <mymalloc.h> -+#include <vstream.h> -+#include <vstring.h> -+#include <dict.h> -+#include <safe.h> -+#include <stringops.h> -+#include <readlline.h> -+ -+/* Global library. */ -+ -+#include "mail_params.h" -+#include "mail_conf.h" -+ -+/* mail_conf_checkdir - authorize non-default directory */ -+ -+static void mail_conf_checkdir(const char *config_dir) -+{ -+ VSTRING *buf; -+ VSTREAM *fp; -+ char *path; -+ char *name; -+ char *value; -+ char *cp; -+ int found = 0; -+ -+ /* -+ * If running set-[ug]id, require that a non-default configuration -+ * directory name is blessed as a bona fide configuration directory in -+ * the default main.cf file. -+ */ -+ path = concatenate(DEF_CONFIG_DIR, "/", "main.cf", (char *) 0); -+ if ((fp = vstream_fopen(path, O_RDONLY, 0)) == 0) -+ msg_fatal("open file %s: %m", path); -+ -+ buf = vstring_alloc(1); -+ while (found == 0 && readlline(buf, fp, (int *) 0)) { -+ if (split_nameval(vstring_str(buf), &name, &value) == 0 -+ && (strcmp(name, VAR_CONFIG_DIRS) == 0 -+ || strcmp(name, VAR_MULTI_CONF_DIRS) == 0)) { -+ while (found == 0 && (cp = mystrtok(&value, ", \t\r\n")) != 0) -+ if (strcmp(cp, config_dir) == 0) -+ found = 1; -+ } -+ } -+ if (vstream_fclose(fp)) -+ msg_fatal("read file %s: %m", path); -+ vstring_free(buf); -+ -+ if (found == 0) { -+ msg_error("untrusted configuration directory name: %s", config_dir); -+ msg_fatal("specify \"%s = %s\" in %s", -+ VAR_CONFIG_DIRS, config_dir, path); -+ } -+ myfree(path); -+} -+ -+/* mail_conf_read - read global configuration file */ -+ -+void mail_conf_read(void) -+{ -+ mail_conf_suck(); -+ mail_params_init(); -+} -+ -+/* mail_conf_suck - suck in the global configuration file */ -+ -+void mail_conf_suck(void) -+{ -+ char *config_dir; -+ char *path; -+ -+ /* -+ * Permit references to unknown configuration variable names. We rely on -+ * a separate configuration checking tool to spot misspelled names and -+ * other kinds of trouble. Enter the configuration directory into the -+ * default dictionary. -+ */ -+ dict_unknown_allowed = 1; -+ if (var_config_dir) -+ myfree(var_config_dir); -+ if ((config_dir = getenv(CONF_ENV_PATH)) == 0) -+ config_dir = DEF_CONFIG_DIR; -+ var_config_dir = mystrdup(config_dir); -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ -+ /* -+ * If the configuration directory name comes from a different trust -+ * domain, require that it is listed in the default main.cf file. -+ */ -+ if (strcmp(var_config_dir, DEF_CONFIG_DIR) != 0 /* non-default */ -+ && safe_getenv(CONF_ENV_PATH) == 0 /* non-default */ -+ && geteuid() != 0) /* untrusted */ -+ mail_conf_checkdir(var_config_dir); -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ dict_load_file(CONFIG_DICT, path); -+ myfree(path); -+} -+ -+/* mail_conf_flush - discard configuration dictionary */ -+ -+void mail_conf_flush(void) -+{ -+ if (dict_handle(CONFIG_DICT) != 0) -+ dict_unregister(CONFIG_DICT); -+} -+ -+/* mail_conf_eval - expand macros in string */ -+ -+const char *mail_conf_eval(const char *string) -+{ -+#define RECURSIVE 1 -+ -+ return (dict_eval(CONFIG_DICT, string, RECURSIVE)); -+} -+ -+/* mail_conf_lookup - lookup named variable */ -+ -+const char *mail_conf_lookup(const char *name) -+{ -+ return (dict_lookup(CONFIG_DICT, name)); -+} -+ -+/* mail_conf_lookup_eval - expand named variable */ -+ -+const char *mail_conf_lookup_eval(const char *name) -+{ -+ const char *value; -+ -+#define RECURSIVE 1 -+ -+ if ((value = dict_lookup(CONFIG_DICT, name)) != 0) -+ value = dict_eval(CONFIG_DICT, value, RECURSIVE); -+ return (value); -+} -+ -+/* mail_conf_update - update parameter */ -+ -+void mail_conf_update(const char *key, const char *value) -+{ -+ dict_update(CONFIG_DICT, key, value); -+} -diff -ruN a/src/global/mail_dict.c b/src/global/mail_dict.c ---- a/src/global/mail_dict.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_dict.c 2009-06-01 13:08:26.000000000 +0000 -@@ -45,6 +45,7 @@ - - static const DICT_OPEN_INFO dict_open_info[] = { - DICT_TYPE_PROXY, dict_proxy_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_LDAP - DICT_TYPE_LDAP, dict_ldap_open, - #endif -@@ -54,6 +55,7 @@ - #ifdef HAS_PGSQL - DICT_TYPE_PGSQL, dict_pgsql_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - 0, - }; - -diff -ruN a/src/global/mail_params.c b/src/global/mail_params.c ---- a/src/global/mail_params.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_params.c 2009-06-01 13:08:26.000000000 +0000 -@@ -79,6 +79,7 @@ - /* char *var_export_environ; - /* char *var_debug_peer_list; - /* int var_debug_peer_level; -+/* int var_command_maxtime; - /* int var_in_flow_delay; - /* int var_fault_inj_code; - /* char *var_bounce_service; -@@ -265,6 +266,7 @@ - char *var_export_environ; - char *var_debug_peer_list; - int var_debug_peer_level; -+int var_command_maxtime; - int var_fault_inj_code; - char *var_bounce_service; - char *var_cleanup_service; -@@ -276,6 +278,7 @@ - char *var_error_service; - char *var_flush_service; - char *var_verify_service; -+char *var_scache_service; - char *var_trace_service; - char *var_proxymap_service; - char *var_proxywrite_service; -diff -ruN a/src/global/mail_params.c.orig b/src/global/mail_params.c.orig ---- a/src/global/mail_params.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/mail_params.c.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,752 @@ -+/*++ -+/* NAME -+/* mail_params 3 -+/* SUMMARY -+/* global mail configuration parameters -+/* SYNOPSIS -+/* #include <mail_params.h> -+/* -+/* char *var_myhostname; -+/* char *var_mydomain; -+/* char *var_myorigin; -+/* char *var_mydest; -+/* char *var_relayhost; -+/* char *var_transit_origin; -+/* char *var_transit_dest; -+/* char *var_mail_name; -+/* int var_helpful_warnings; -+/* char *var_syslog_name; -+/* char *var_mail_owner; -+/* uid_t var_owner_uid; -+/* gid_t var_owner_gid; -+/* char *var_sgid_group; -+/* gid_t var_sgid_gid; -+/* char *var_default_privs; -+/* uid_t var_default_uid; -+/* gid_t var_default_gid; -+/* char *var_config_dir; -+/* char *var_daemon_dir; -+/* char *var_data_dir; -+/* char *var_command_dir; -+/* char *var_queue_dir; -+/* int var_use_limit; -+/* int var_idle_limit; -+/* int var_event_drain; -+/* int var_bundle_rcpt; -+/* char *var_procname; -+/* int var_pid; -+/* int var_ipc_timeout; -+/* char *var_pid_dir; -+/* int var_dont_remove; -+/* char *var_inet_interfaces; -+/* char *var_proxy_interfaces; -+/* char *var_inet_protocols; -+/* char *var_mynetworks; -+/* char *var_double_bounce_sender; -+/* int var_line_limit; -+/* char *var_alias_db_map; -+/* int var_message_limit; -+/* char *var_mail_release; -+/* char *var_mail_version; -+/* int var_ipc_idle_limit; -+/* int var_ipc_ttl_limit; -+/* char *var_db_type; -+/* char *var_hash_queue_names; -+/* int var_hash_queue_depth; -+/* int var_trigger_timeout; -+/* char *var_rcpt_delim; -+/* int var_fork_tries; -+/* int var_fork_delay; -+/* int var_flock_tries; -+/* int var_flock_delay; -+/* int var_flock_stale; -+/* int var_disable_dns; -+/* int var_soft_bounce; -+/* time_t var_starttime; -+/* int var_ownreq_special; -+/* int var_daemon_timeout; -+/* char *var_syslog_facility; -+/* char *var_relay_domains; -+/* char *var_fflush_domains; -+/* char *var_mynetworks_style; -+/* char *var_verp_delims; -+/* char *var_verp_filter; -+/* char *var_par_dom_match; -+/* char *var_config_dirs; -+/* -+/* int var_inet_windowsize; -+/* char *var_import_environ; -+/* char *var_export_environ; -+/* char *var_debug_peer_list; -+/* int var_debug_peer_level; -+/* int var_in_flow_delay; -+/* int var_fault_inj_code; -+/* char *var_bounce_service; -+/* char *var_cleanup_service; -+/* char *var_defer_service; -+/* char *var_pickup_service; -+/* char *var_queue_service; -+/* char *var_rewrite_service; -+/* char *var_showq_service; -+/* char *var_error_service; -+/* char *var_flush_service; -+/* char *var_verify_service; -+/* char *var_trace_service; -+/* char *var_proxymap_service; -+/* char *var_proxywrite_service; -+/* int var_db_create_buf; -+/* int var_db_read_buf; -+/* int var_mime_maxdepth; -+/* int var_mime_bound_len; -+/* int var_header_limit; -+/* int var_token_limit; -+/* int var_disable_mime_input; -+/* int var_disable_mime_oconv; -+/* int var_strict_8bitmime; -+/* int var_strict_7bit_hdrs; -+/* int var_strict_8bit_body; -+/* int var_strict_encoding; -+/* int var_verify_neg_cache; -+/* int var_oldlog_compat; -+/* int var_delay_max_res; -+/* char *var_int_filt_classes; -+/* int var_cyrus_sasl_authzid; -+/* -+/* char *var_multi_conf_dirs; -+/* char *var_multi_wrapper; -+/* char *var_multi_group; -+/* char *var_multi_name; -+/* bool var_multi_enable; -+/* -+/* void mail_params_init() -+/* -+/* const char null_format_string[1]; -+/* DESCRIPTION -+/* This module (actually the associated include file) define the names -+/* and defaults of all mail configuration parameters. -+/* -+/* mail_params_init() initializes the built-in parameters listed above. -+/* These parameters are relied upon by library routines, so they are -+/* initialized globally so as to avoid hard-to-find errors due to -+/* missing initialization. This routine must be called early, at -+/* least before entering a chroot jail. -+/* -+/* null_format_string is a workaround for gcc compilers that complain -+/* about empty or null format strings. -+/* DIAGNOSTICS -+/* Fatal errors: out of memory; null system or domain name. -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+#include <pwd.h> -+#include <grp.h> -+#include <time.h> -+#include <ctype.h> -+ -+#ifdef STRCASECMP_IN_STRINGS_H -+#include <strings.h> -+#endif -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <msg_syslog.h> -+#include <get_hostname.h> -+#include <valid_hostname.h> -+#include <stringops.h> -+#include <safe.h> -+#include <safe_open.h> -+#include <mymalloc.h> -+#ifdef HAS_DB -+#include <dict_db.h> -+#endif -+#include <inet_proto.h> -+#include <vstring_vstream.h> -+#include <iostuff.h> -+ -+/* Global library. */ -+ -+#include <mynetworks.h> -+#include <mail_conf.h> -+#include <mail_version.h> -+#include <mail_proto.h> -+#include <verp_sender.h> -+#include <own_inet_addr.h> -+#include <mail_params.h> -+ -+ /* -+ * Special configuration variables. -+ */ -+char *var_myhostname; -+char *var_mydomain; -+char *var_myorigin; -+char *var_mydest; -+char *var_relayhost; -+char *var_transit_origin; -+char *var_transit_dest; -+char *var_mail_name; -+int var_helpful_warnings; -+char *var_syslog_name; -+char *var_mail_owner; -+uid_t var_owner_uid; -+gid_t var_owner_gid; -+char *var_sgid_group; -+gid_t var_sgid_gid; -+char *var_default_privs; -+uid_t var_default_uid; -+gid_t var_default_gid; -+char *var_config_dir; -+char *var_daemon_dir; -+char *var_data_dir; -+char *var_command_dir; -+char *var_queue_dir; -+int var_use_limit; -+int var_event_drain; -+int var_idle_limit; -+int var_bundle_rcpt; -+char *var_procname; -+int var_pid; -+int var_ipc_timeout; -+char *var_pid_dir; -+int var_dont_remove; -+char *var_inet_interfaces; -+char *var_proxy_interfaces; -+char *var_inet_protocols; -+char *var_mynetworks; -+char *var_double_bounce_sender; -+int var_line_limit; -+char *var_alias_db_map; -+int var_message_limit; -+char *var_mail_release; -+char *var_mail_version; -+int var_ipc_idle_limit; -+int var_ipc_ttl_limit; -+char *var_db_type; -+char *var_hash_queue_names; -+int var_hash_queue_depth; -+int var_trigger_timeout; -+char *var_rcpt_delim; -+int var_fork_tries; -+int var_fork_delay; -+int var_flock_tries; -+int var_flock_delay; -+int var_flock_stale; -+int var_disable_dns; -+int var_soft_bounce; -+time_t var_starttime; -+int var_ownreq_special; -+int var_daemon_timeout; -+char *var_syslog_facility; -+char *var_relay_domains; -+char *var_fflush_domains; -+char *var_mynetworks_style; -+char *var_verp_delims; -+char *var_verp_filter; -+int var_in_flow_delay; -+char *var_par_dom_match; -+char *var_config_dirs; -+ -+int var_inet_windowsize; -+char *var_import_environ; -+char *var_export_environ; -+char *var_debug_peer_list; -+int var_debug_peer_level; -+int var_fault_inj_code; -+char *var_bounce_service; -+char *var_cleanup_service; -+char *var_defer_service; -+char *var_pickup_service; -+char *var_queue_service; -+char *var_rewrite_service; -+char *var_showq_service; -+char *var_error_service; -+char *var_flush_service; -+char *var_verify_service; -+char *var_trace_service; -+char *var_proxymap_service; -+char *var_proxywrite_service; -+int var_db_create_buf; -+int var_db_read_buf; -+int var_mime_maxdepth; -+int var_mime_bound_len; -+int var_header_limit; -+int var_token_limit; -+int var_disable_mime_input; -+int var_disable_mime_oconv; -+int var_strict_8bitmime; -+int var_strict_7bit_hdrs; -+int var_strict_8bit_body; -+int var_strict_encoding; -+int var_verify_neg_cache; -+int var_oldlog_compat; -+int var_delay_max_res; -+char *var_int_filt_classes; -+int var_cyrus_sasl_authzid; -+ -+char *var_multi_conf_dirs; -+char *var_multi_wrapper; -+char *var_multi_group; -+char *var_multi_name; -+bool var_multi_enable; -+ -+const char null_format_string[1] = ""; -+ -+/* check_myhostname - lookup hostname and validate */ -+ -+static const char *check_myhostname(void) -+{ -+ static const char *name; -+ const char *dot; -+ const char *domain; -+ -+ /* -+ * Use cached result. -+ */ -+ if (name) -+ return (name); -+ -+ /* -+ * If the local machine name is not in FQDN form, try to append the -+ * contents of $mydomain. Use a default domain as a final workaround. -+ */ -+ name = get_hostname(); -+ if ((dot = strchr(name, '.')) == 0) { -+ if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) -+ domain = DEF_MYDOMAIN; -+ name = concatenate(name, ".", domain, (char *) 0); -+ } -+ return (name); -+} -+ -+/* check_mydomainname - lookup domain name and validate */ -+ -+static const char *check_mydomainname(void) -+{ -+ char *dot; -+ -+ /* -+ * Use a default domain when the hostname is not a FQDN ("foo"). -+ */ -+ if ((dot = strchr(var_myhostname, '.')) == 0) -+ return (DEF_MYDOMAIN); -+ return (dot + 1); -+} -+ -+/* check_default_privs - lookup default user attributes and validate */ -+ -+static void check_default_privs(void) -+{ -+ struct passwd *pwd; -+ -+ if ((pwd = getpwnam(var_default_privs)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+ if ((var_default_uid = pwd->pw_uid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+ if ((var_default_gid = pwd->pw_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+} -+ -+/* check_mail_owner - lookup owner user attributes and validate */ -+ -+static void check_mail_owner(void) -+{ -+ struct passwd *pwd; -+ -+ if ((pwd = getpwnam(var_mail_owner)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ if ((var_owner_uid = pwd->pw_uid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ if ((var_owner_gid = pwd->pw_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ -+ /* -+ * This detects only some forms of sharing. Enumerating the entire -+ * password file name space could be expensive. The purpose of this code -+ * is to discourage user ID sharing by developers and package -+ * maintainers. -+ */ -+ if ((pwd = getpwuid(var_owner_uid)) != 0 -+ && strcmp(pwd->pw_name, var_mail_owner) != 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has same user ID as %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner, pwd->pw_name); -+} -+ -+/* check_sgid_group - lookup setgid group attributes and validate */ -+ -+static void check_sgid_group(void) -+{ -+ struct group *grp; -+ -+ if ((grp = getgrnam(var_sgid_group)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown group name: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group); -+ if ((var_sgid_gid = grp->gr_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: group %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group); -+ -+ /* -+ * This detects only some forms of sharing. Enumerating the entire group -+ * file name space could be expensive. The purpose of this code is to -+ * discourage group ID sharing by developers and package maintainers. -+ */ -+ if ((grp = getgrgid(var_sgid_gid)) != 0 -+ && strcmp(grp->gr_name, var_sgid_group) != 0) -+ msg_fatal("file %s/%s: parameter %s: group %s has same group ID as %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group, grp->gr_name); -+} -+ -+/* check_overlap - disallow UID or GID sharing */ -+ -+static void check_overlap(void) -+{ -+ if (strcmp(var_default_privs, var_mail_owner) == 0) -+ msg_fatal("file %s/%s: parameters %s and %s specify the same user %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs); -+ if (var_default_uid == var_owner_uid) -+ msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same user ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs, var_mail_owner, -+ (long) var_owner_uid); -+ if (var_default_gid == var_owner_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs, var_mail_owner, -+ (long) var_owner_gid); -+ if (var_default_gid == var_sgid_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_SGID_GROUP, -+ var_default_privs, var_sgid_group, -+ (long) var_sgid_gid); -+ if (var_owner_gid == var_sgid_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, VAR_SGID_GROUP, -+ var_mail_owner, var_sgid_group, -+ (long) var_sgid_gid); -+} -+ -+#ifdef MYORIGIN_FROM_FILE -+ -+/* read_param_from_file - read parameter value from file */ -+ -+static char *read_param_from_file(const char *path) -+{ -+ VSTRING *why = vstring_alloc(100); -+ VSTRING *buf = vstring_alloc(100); -+ VSTREAM *fp; -+ char *bp; -+ char *result; -+ -+ /* -+ * Ugly macros to make complex expressions less unreadable. -+ */ -+#define SKIP(start, var, cond) \ -+ for (var = start; *var && (cond); var++); -+ -+#define TRIM(s) { \ -+ char *p; \ -+ for (p = (s) + strlen(s); p > (s) && ISSPACE(p[-1]); p--); \ -+ *p = 0; \ -+ } -+ -+ fp = safe_open(path, O_RDONLY, 0, (struct stat *) 0, -1, -1, why); -+ if (fp == 0) -+ msg_fatal("%s: %s", path, vstring_str(why)); -+ vstring_get_nonl(buf, fp); -+ if (vstream_ferror(fp)) /* FIX 20070501 */ -+ msg_fatal("%s: read error: %m", path); -+ vstream_fclose(fp); -+ SKIP(vstring_str(buf), bp, ISSPACE(*bp)); -+ TRIM(bp); -+ result = mystrdup(bp); -+ -+ vstring_free(why); -+ vstring_free(buf); -+ return (result); -+} -+ -+#endif -+ -+/* mail_params_init - configure built-in parameters */ -+ -+void mail_params_init() -+{ -+ static const CONFIG_STR_TABLE first_str_defaults[] = { -+ VAR_SYSLOG_FACILITY, DEF_SYSLOG_FACILITY, &var_syslog_facility, 1, 0, -+ VAR_INET_PROTOCOLS, DEF_INET_PROTOCOLS, &var_inet_protocols, 1, 0, -+ VAR_MULTI_CONF_DIRS, DEF_MULTI_CONF_DIRS, &var_multi_conf_dirs, 0, 0, -+ VAR_MULTI_WRAPPER, DEF_MULTI_WRAPPER, &var_multi_wrapper, 0, 0, -+ VAR_MULTI_GROUP, DEF_MULTI_GROUP, &var_multi_group, 0, 0, -+ VAR_MULTI_NAME, DEF_MULTI_NAME, &var_multi_name, 0, 0, -+ 0, -+ }; -+ static const CONFIG_STR_FN_TABLE function_str_defaults[] = { -+ VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, -+ VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, -+ 0, -+ }; -+ static const CONFIG_STR_TABLE other_str_defaults[] = { -+ VAR_MAIL_NAME, DEF_MAIL_NAME, &var_mail_name, 1, 0, -+ VAR_SYSLOG_NAME, DEF_SYSLOG_NAME, &var_syslog_name, 1, 0, -+ VAR_MAIL_OWNER, DEF_MAIL_OWNER, &var_mail_owner, 1, 0, -+ VAR_SGID_GROUP, DEF_SGID_GROUP, &var_sgid_group, 1, 0, -+ VAR_MYDEST, DEF_MYDEST, &var_mydest, 0, 0, -+ VAR_MYORIGIN, DEF_MYORIGIN, &var_myorigin, 1, 0, -+ VAR_RELAYHOST, DEF_RELAYHOST, &var_relayhost, 0, 0, -+ VAR_DAEMON_DIR, DEF_DAEMON_DIR, &var_daemon_dir, 1, 0, -+ VAR_DATA_DIR, DEF_DATA_DIR, &var_data_dir, 1, 0, -+ VAR_COMMAND_DIR, DEF_COMMAND_DIR, &var_command_dir, 1, 0, -+ VAR_QUEUE_DIR, DEF_QUEUE_DIR, &var_queue_dir, 1, 0, -+ VAR_PID_DIR, DEF_PID_DIR, &var_pid_dir, 1, 0, -+ VAR_INET_INTERFACES, DEF_INET_INTERFACES, &var_inet_interfaces, 1, 0, -+ VAR_PROXY_INTERFACES, DEF_PROXY_INTERFACES, &var_proxy_interfaces, 0, 0, -+ VAR_DOUBLE_BOUNCE, DEF_DOUBLE_BOUNCE, &var_double_bounce_sender, 1, 0, -+ VAR_DEFAULT_PRIVS, DEF_DEFAULT_PRIVS, &var_default_privs, 1, 0, -+ VAR_ALIAS_DB_MAP, DEF_ALIAS_DB_MAP, &var_alias_db_map, 0, 0, -+ VAR_MAIL_RELEASE, DEF_MAIL_RELEASE, &var_mail_release, 1, 0, -+ VAR_MAIL_VERSION, DEF_MAIL_VERSION, &var_mail_version, 1, 0, -+ VAR_DB_TYPE, DEF_DB_TYPE, &var_db_type, 1, 0, -+ VAR_HASH_QUEUE_NAMES, DEF_HASH_QUEUE_NAMES, &var_hash_queue_names, 1, 0, -+ VAR_RCPT_DELIM, DEF_RCPT_DELIM, &var_rcpt_delim, 0, 1, -+ VAR_RELAY_DOMAINS, DEF_RELAY_DOMAINS, &var_relay_domains, 0, 0, -+ VAR_FFLUSH_DOMAINS, DEF_FFLUSH_DOMAINS, &var_fflush_domains, 0, 0, -+ VAR_EXPORT_ENVIRON, DEF_EXPORT_ENVIRON, &var_export_environ, 0, 0, -+ VAR_IMPORT_ENVIRON, DEF_IMPORT_ENVIRON, &var_import_environ, 0, 0, -+ VAR_MYNETWORKS_STYLE, DEF_MYNETWORKS_STYLE, &var_mynetworks_style, 1, 0, -+ VAR_DEBUG_PEER_LIST, DEF_DEBUG_PEER_LIST, &var_debug_peer_list, 0, 0, -+ VAR_VERP_DELIMS, DEF_VERP_DELIMS, &var_verp_delims, 2, 2, -+ VAR_VERP_FILTER, DEF_VERP_FILTER, &var_verp_filter, 1, 0, -+ VAR_PAR_DOM_MATCH, DEF_PAR_DOM_MATCH, &var_par_dom_match, 0, 0, -+ VAR_CONFIG_DIRS, DEF_CONFIG_DIRS, &var_config_dirs, 0, 0, -+ VAR_BOUNCE_SERVICE, DEF_BOUNCE_SERVICE, &var_bounce_service, 1, 0, -+ VAR_CLEANUP_SERVICE, DEF_CLEANUP_SERVICE, &var_cleanup_service, 1, 0, -+ VAR_DEFER_SERVICE, DEF_DEFER_SERVICE, &var_defer_service, 1, 0, -+ VAR_PICKUP_SERVICE, DEF_PICKUP_SERVICE, &var_pickup_service, 1, 0, -+ VAR_QUEUE_SERVICE, DEF_QUEUE_SERVICE, &var_queue_service, 1, 0, -+ VAR_REWRITE_SERVICE, DEF_REWRITE_SERVICE, &var_rewrite_service, 1, 0, -+ VAR_SHOWQ_SERVICE, DEF_SHOWQ_SERVICE, &var_showq_service, 1, 0, -+ VAR_ERROR_SERVICE, DEF_ERROR_SERVICE, &var_error_service, 1, 0, -+ VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0, -+ VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0, -+ VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0, -+ VAR_PROXYMAP_SERVICE, DEF_PROXYMAP_SERVICE, &var_proxymap_service, 1, 0, -+ VAR_PROXYWRITE_SERVICE, DEF_PROXYWRITE_SERVICE, &var_proxywrite_service, 1, 0, -+ VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0, -+ 0, -+ }; -+ static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = { -+ VAR_MYNETWORKS, mynetworks, &var_mynetworks, 0, 0, -+ 0, -+ }; -+ static const CONFIG_INT_TABLE other_int_defaults[] = { -+ VAR_MAX_USE, DEF_MAX_USE, &var_use_limit, 1, 0, -+ VAR_DONT_REMOVE, DEF_DONT_REMOVE, &var_dont_remove, 0, 0, -+ VAR_LINE_LIMIT, DEF_LINE_LIMIT, &var_line_limit, 512, 0, -+ VAR_MESSAGE_LIMIT, DEF_MESSAGE_LIMIT, &var_message_limit, 0, 0, -+ VAR_HASH_QUEUE_DEPTH, DEF_HASH_QUEUE_DEPTH, &var_hash_queue_depth, 1, 0, -+ VAR_FORK_TRIES, DEF_FORK_TRIES, &var_fork_tries, 1, 0, -+ VAR_FLOCK_TRIES, DEF_FLOCK_TRIES, &var_flock_tries, 1, 0, -+ VAR_DEBUG_PEER_LEVEL, DEF_DEBUG_PEER_LEVEL, &var_debug_peer_level, 1, 0, -+ VAR_FAULT_INJ_CODE, DEF_FAULT_INJ_CODE, &var_fault_inj_code, 0, 0, -+ VAR_DB_CREATE_BUF, DEF_DB_CREATE_BUF, &var_db_create_buf, 1, 0, -+ VAR_DB_READ_BUF, DEF_DB_READ_BUF, &var_db_read_buf, 1, 0, -+ VAR_HEADER_LIMIT, DEF_HEADER_LIMIT, &var_header_limit, 1, 0, -+ VAR_TOKEN_LIMIT, DEF_TOKEN_LIMIT, &var_token_limit, 1, 0, -+ VAR_MIME_MAXDEPTH, DEF_MIME_MAXDEPTH, &var_mime_maxdepth, 1, 0, -+ VAR_MIME_BOUND_LEN, DEF_MIME_BOUND_LEN, &var_mime_bound_len, 1, 0, -+ VAR_DELAY_MAX_RES, DEF_DELAY_MAX_RES, &var_delay_max_res, MIN_DELAY_MAX_RES, MAX_DELAY_MAX_RES, -+ VAR_INET_WINDOW, DEF_INET_WINDOW, &var_inet_windowsize, 0, 0, -+ 0, -+ }; -+ static const CONFIG_TIME_TABLE time_defaults[] = { -+ VAR_EVENT_DRAIN, DEF_EVENT_DRAIN, &var_event_drain, 1, 0, -+ VAR_MAX_IDLE, DEF_MAX_IDLE, &var_idle_limit, 1, 0, -+ VAR_IPC_TIMEOUT, DEF_IPC_TIMEOUT, &var_ipc_timeout, 1, 0, -+ VAR_IPC_IDLE, DEF_IPC_IDLE, &var_ipc_idle_limit, 1, 0, -+ VAR_IPC_TTL, DEF_IPC_TTL, &var_ipc_ttl_limit, 1, 0, -+ VAR_TRIGGER_TIMEOUT, DEF_TRIGGER_TIMEOUT, &var_trigger_timeout, 1, 0, -+ VAR_FORK_DELAY, DEF_FORK_DELAY, &var_fork_delay, 1, 0, -+ VAR_FLOCK_DELAY, DEF_FLOCK_DELAY, &var_flock_delay, 1, 0, -+ VAR_FLOCK_STALE, DEF_FLOCK_STALE, &var_flock_stale, 1, 0, -+ VAR_DAEMON_TIMEOUT, DEF_DAEMON_TIMEOUT, &var_daemon_timeout, 1, 0, -+ VAR_IN_FLOW_DELAY, DEF_IN_FLOW_DELAY, &var_in_flow_delay, 0, 10, -+ 0, -+ }; -+ static const CONFIG_BOOL_TABLE bool_defaults[] = { -+ VAR_DISABLE_DNS, DEF_DISABLE_DNS, &var_disable_dns, -+ VAR_SOFT_BOUNCE, DEF_SOFT_BOUNCE, &var_soft_bounce, -+ VAR_OWNREQ_SPECIAL, DEF_OWNREQ_SPECIAL, &var_ownreq_special, -+ VAR_STRICT_8BITMIME, DEF_STRICT_8BITMIME, &var_strict_8bitmime, -+ VAR_STRICT_7BIT_HDRS, DEF_STRICT_7BIT_HDRS, &var_strict_7bit_hdrs, -+ VAR_STRICT_8BIT_BODY, DEF_STRICT_8BIT_BODY, &var_strict_8bit_body, -+ VAR_STRICT_ENCODING, DEF_STRICT_ENCODING, &var_strict_encoding, -+ VAR_DISABLE_MIME_INPUT, DEF_DISABLE_MIME_INPUT, &var_disable_mime_input, -+ VAR_DISABLE_MIME_OCONV, DEF_DISABLE_MIME_OCONV, &var_disable_mime_oconv, -+ VAR_VERIFY_NEG_CACHE, DEF_VERIFY_NEG_CACHE, &var_verify_neg_cache, -+ VAR_OLDLOG_COMPAT, DEF_OLDLOG_COMPAT, &var_oldlog_compat, -+ VAR_HELPFUL_WARNINGS, DEF_HELPFUL_WARNINGS, &var_helpful_warnings, -+ VAR_CYRUS_SASL_AUTHZID, DEF_CYRUS_SASL_AUTHZID, &var_cyrus_sasl_authzid, -+ VAR_MULTI_ENABLE, DEF_MULTI_ENABLE, &var_multi_enable, -+ 0, -+ }; -+ const char *cp; -+ INET_PROTO_INFO *proto_info; -+ -+ /* -+ * Extract syslog_facility early, so that from here on all errors are -+ * logged with the proper facility. -+ */ -+ get_mail_conf_str_table(first_str_defaults); -+ -+ if (!msg_syslog_facility(var_syslog_facility)) -+ msg_fatal("file %s/%s: parameter %s: unrecognized value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SYSLOG_FACILITY, var_syslog_facility); -+ -+ /* -+ * What protocols should we attempt to support? The result is stored in -+ * the global inet_proto_table variable. -+ */ -+ proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); -+ -+ /* -+ * Variables whose defaults are determined at runtime. Some sites use -+ * short hostnames in the host table; some sites name their system after -+ * the domain. -+ */ -+ get_mail_conf_str_fn_table(function_str_defaults); -+ if (!valid_hostname(var_myhostname, DO_GRIPE)) -+ msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MYHOSTNAME, var_myhostname); -+ if (!valid_hostname(var_mydomain, DO_GRIPE)) -+ msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MYDOMAIN, var_mydomain); -+ -+ /* -+ * Variables that are needed by almost every program. -+ * -+ * XXX Reading the myorigin value from file is originally a Debian Linux -+ * feature. This code is not enabled by default because of problems: 1) -+ * it re-implements its own parameter syntax checks, and 2) it does not -+ * implement $name expansions. -+ */ -+ get_mail_conf_str_table(other_str_defaults); -+#ifdef MYORIGIN_FROM_FILE -+ if (*var_myorigin == '/') { -+ char *origin = read_param_from_file(var_myorigin); -+ -+ if (*origin == 0) -+ msg_fatal("%s file %s is empty", VAR_MYORIGIN, var_myorigin); -+ myfree(var_myorigin); /* FIX 20070501 */ -+ var_myorigin = origin; -+ } -+#endif -+ get_mail_conf_int_table(other_int_defaults); -+ get_mail_conf_bool_table(bool_defaults); -+ get_mail_conf_time_table(time_defaults); -+ check_default_privs(); -+ check_mail_owner(); -+ check_sgid_group(); -+ check_overlap(); -+#ifdef HAS_DB -+ dict_db_cache_size = var_db_read_buf; -+#endif -+ inet_windowsize = var_inet_windowsize; -+ -+ /* -+ * Variables whose defaults are determined at runtime, after other -+ * variables have been set. This dependency is admittedly a bit tricky. -+ * XXX Perhaps we should just register variables, and let the evaluator -+ * figure out in what order to evaluate things. -+ */ -+ get_mail_conf_str_fn_table(function_str_defaults_2); -+ -+ /* -+ * FIX 200412 The IPv6 patch did not call own_inet_addr_list() before -+ * entering the chroot jail on Linux IPv6 systems. Linux has the IPv6 -+ * interface list in /proc, which is not available after chrooting. -+ */ -+ (void) own_inet_addr_list(); -+ -+ /* -+ * The PID variable cannot be set from the configuration file!! -+ */ -+ set_mail_conf_int(VAR_PID, var_pid = getpid()); -+ -+ /* -+ * Neither can the start time variable. It isn't even visible. -+ */ -+ time(&var_starttime); -+ -+ /* -+ * Export the syslog name so children can inherit and use it before they -+ * have initialized. -+ */ -+ if ((cp = safe_getenv(CONF_ENV_LOGTAG)) == 0 -+ || strcmp(cp, var_syslog_name) != 0) -+ if (setenv(CONF_ENV_LOGTAG, var_syslog_name, 1) < 0) -+ msg_fatal("setenv %s %s: %m", CONF_ENV_LOGTAG, var_syslog_name); -+ -+ /* -+ * I have seen this happen just too often. -+ */ -+ if (strcasecmp(var_myhostname, var_relayhost) == 0) -+ msg_fatal("%s and %s parameter settings must not be identical: %s", -+ VAR_MYHOSTNAME, VAR_RELAYHOST, var_myhostname); -+ -+ /* -+ * XXX These should be caught by a proper parameter parsing algorithm. -+ */ -+ if (var_myorigin[strcspn(var_myorigin, ", \t\r\n")]) -+ msg_fatal("%s parameter setting must not contain multiple values: %s", -+ VAR_MYORIGIN, var_myorigin); -+ -+ if (var_relayhost[strcspn(var_relayhost, ", \t\r\n")]) -+ msg_fatal("%s parameter setting must not contain multiple values: %s", -+ VAR_RELAYHOST, var_relayhost); -+ -+ /* -+ * One more sanity check. -+ */ -+ if ((cp = verp_delims_verify(var_verp_delims)) != 0) -+ msg_fatal("file %s/%s: parameters %s and %s: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_VERP_DELIMS, VAR_VERP_FILTER, cp); -+} -diff -ruN a/src/global/mkmap_open.c b/src/global/mkmap_open.c ---- a/src/global/mkmap_open.c 2009-06-01 12:27:44.000000000 +0000 -+++ b/src/global/mkmap_open.c 2009-06-01 13:08:26.000000000 +0000 -@@ -81,7 +81,7 @@ - * We use a different table (in dict_open.c) when querying maps. - */ - typedef struct { -- char *type; -+ const char *type; - MKMAP *(*before_open) (const char *); - } MKMAP_OPEN_INFO; - -@@ -156,7 +156,16 @@ - */ - for (mp = mkmap_types; /* void */ ; mp++) { - if (mp->type == 0) -+#ifndef NO_DYNAMIC_MAPS -+ { -+ static MKMAP_OPEN_INFO oi; -+ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); -+ oi.type=type; -+ mp=&oi; -+ } -+#else - msg_fatal("unsupported map type: %s", type); -+#endif - if (strcmp(type, mp->type) == 0) - break; - } -diff -ruN a/src/master/Makefile.in b/src/master/Makefile.in ---- a/src/master/Makefile.in 2009-06-01 12:27:44.000000000 +0000 -+++ b/src/master/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -20,7 +20,7 @@ - INC_DIR = ../../include - BIN_DIR = ../../libexec - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c - - all: $(PROG) $(LIB) - -@@ -39,12 +39,10 @@ - root_tests: - - $(LIB): $(LIB_OBJ) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR)/$(LIB) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - $(BIN_DIR)/$(PROG): $(PROG) - cp $(PROG) $(BIN_DIR) -diff -ruN a/src/milter/Makefile.in b/src/milter/Makefile.in ---- a/src/milter/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/milter/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -14,7 +14,7 @@ - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -30,12 +30,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/postconf/postconf.c b/src/postconf/postconf.c ---- a/src/postconf/postconf.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/postconf/postconf.c 2009-06-01 13:08:26.000000000 +0000 -@@ -962,6 +962,16 @@ - { - ARGV *maps_argv; - int i; -+#ifndef NO_DYNAMIC_MAPS -+ char *path; -+ char *config_dir; -+ -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif - - maps_argv = dict_mapnames(); - for (i = 0; i < maps_argv->argc; i++) -diff -ruN a/src/postconf/postconf.c.orig b/src/postconf/postconf.c.orig ---- a/src/postconf/postconf.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/postconf/postconf.c.orig 2009-06-01 13:07:57.000000000 +0000 -@@ -0,0 +1,1218 @@ -+/*++ -+/* NAME -+/* postconf 1 -+/* SUMMARY -+/* Postfix configuration utility -+/* SYNOPSIS -+/* .fi -+/* \fBpostconf\fR [\fB-dhnv\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter ...\fR] -+/* -+/* \fBpostconf\fR [\fB-aAmlv\fR] [\fB-c \fIconfig_dir\fR] -+/* -+/* \fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter=value ...\fR] -+/* -+/* \fBpostconf\fR [\fB-#v\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter ...\fR] -+/* -+/* \fBpostconf\fR [\fB-btv\fR] [\fB-c \fIconfig_dir\fR] [\fItemplate_file\fR] -+/* DESCRIPTION -+/* The \fBpostconf\fR(1) command displays the actual values -+/* of configuration parameters, changes configuration parameter -+/* values, or displays other configuration information about -+/* the Postfix mail system. -+/* -+/* Options: -+/* .IP \fB-a\fR -+/* List the available SASL server plug-in types. The SASL -+/* plug-in type is selected with the \fBsmtpd_sasl_type\fR -+/* configuration parameter by specifying one of the names -+/* listed below. -+/* .RS -+/* .IP \fBcyrus\fR -+/* This server plug-in is available when Postfix is built with -+/* Cyrus SASL support. -+/* .IP \fBdovecot\fR -+/* This server plug-in uses the Dovecot authentication server, -+/* and is available when Postfix is built with any form of SASL -+/* support. -+/* .RE -+/* .IP -+/* This feature is available with Postfix 2.3 and later. -+/* .IP \fB-A\fR -+/* List the available SASL client plug-in types. The SASL -+/* plug-in type is selected with the \fBsmtp_sasl_type\fR or -+/* \fBlmtp_sasl_type\fR configuration parameters by specifying -+/* one of the names listed below. -+/* .RS -+/* .IP \fBcyrus\fR -+/* This client plug-in is available when Postfix is built with -+/* Cyrus SASL support. -+/* .RE -+/* .IP -+/* This feature is available with Postfix 2.3 and later. -+/* .IP "\fB-b\fR [\fItemplate_file\fR]" -+/* Display the message text that appears at the beginning of -+/* delivery status notification (DSN) messages, with $\fBname\fR -+/* expressions replaced by actual values. To override the -+/* built-in message text, specify a template file at the end -+/* of the command line, or specify a template file in main.cf -+/* with the \fBbounce_template_file\fR parameter. -+/* To force selection of the built-in message text templates, -+/* specify an empty template file name (in shell language: ""). -+/* -+/* This feature is available with Postfix 2.3 and later. -+/* .IP "\fB-c \fIconfig_dir\fR" -+/* The \fBmain.cf\fR configuration file is in the named directory -+/* instead of the default configuration directory. -+/* .IP \fB-d\fR -+/* Print default parameter settings instead of actual settings. -+/* .IP \fB-e\fR -+/* Edit the \fBmain.cf\fR configuration file. The file is copied -+/* to a temporary file then renamed into place. Parameters and -+/* values are specified on the command line. Use quotes in order -+/* to protect shell metacharacters and whitespace. -+/* .IP \fB-h\fR -+/* Show parameter values only, not the ``name = '' label -+/* that normally precedes the value. -+/* .IP \fB-l\fR -+/* List the names of all supported mailbox locking methods. -+/* Postfix supports the following methods: -+/* .RS -+/* .IP \fBflock\fR -+/* A kernel-based advisory locking method for local files only. -+/* This locking method is available on systems with a BSD -+/* compatible library. -+/* .IP \fBfcntl\fR -+/* A kernel-based advisory locking method for local and remote files. -+/* .IP \fBdotlock\fR -+/* An application-level locking method. An application locks a file -+/* named \fIfilename\fR by creating a file named \fIfilename\fB.lock\fR. -+/* The application is expected to remove its own lock file, as well as -+/* stale lock files that were left behind after abnormal termination. -+/* .RE -+/* .IP \fB-m\fR -+/* List the names of all supported lookup table types. In Postfix -+/* configuration files, -+/* lookup tables are specified as \fItype\fB:\fIname\fR, where -+/* \fItype\fR is one of the types listed below. The table \fIname\fR -+/* syntax depends on the lookup table type as described in the -+/* DATABASE_README document. -+/* .RS -+/* .IP \fBbtree\fR -+/* A sorted, balanced tree structure. -+/* This is available on systems with support for Berkeley DB -+/* databases. -+/* .IP \fBcdb\fR -+/* A read-optimized structure with no support for incremental updates. -+/* This is available on systems with support for CDB databases. -+/* .IP \fBcidr\fR -+/* A table that associates values with Classless Inter-Domain Routing -+/* (CIDR) patterns. This is described in \fBcidr_table\fR(5). -+/* .IP \fBdbm\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for DBM databases. -+/* .IP \fBenviron\fR -+/* The UNIX process environment array. The lookup key is the variable -+/* name. Originally implemented for testing, someone may find this -+/* useful someday. -+/* .IP \fBhash\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for Berkeley DB -+/* databases. -+/* .IP "\fBldap\fR (read-only)" -+/* Perform lookups using the LDAP protocol. This is described -+/* in \fBldap_table\fR(5). -+/* .IP "\fBmysql\fR (read-only)" -+/* Perform lookups using the MYSQL protocol. This is described -+/* in \fBmysql_table\fR(5). -+/* .IP "\fBpcre\fR (read-only)" -+/* A lookup table based on Perl Compatible Regular Expressions. The -+/* file format is described in \fBpcre_table\fR(5). -+/* .IP "\fBpgsql\fR (read-only)" -+/* Perform lookups using the PostgreSQL protocol. This is described -+/* in \fBpgsql_table\fR(5). -+/* .IP "\fBproxy\fR (read-only)" -+/* A lookup table that is implemented via the Postfix -+/* \fBproxymap\fR(8) service. The table name syntax is -+/* \fItype\fB:\fIname\fR. -+/* .IP "\fBregexp\fR (read-only)" -+/* A lookup table based on regular expressions. The file format is -+/* described in \fBregexp_table\fR(5). -+/* .IP \fBsdbm\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for SDBM databases. -+/* .IP "\fBstatic\fR (read-only)" -+/* A table that always returns its name as lookup result. For example, -+/* \fBstatic:foobar\fR always returns the string \fBfoobar\fR as lookup -+/* result. -+/* .IP "\fBtcp\fR (read-only)" -+/* Perform lookups using a simple request-reply protocol that is -+/* described in \fBtcp_table\fR(5). -+/* This feature is not included with the stable Postfix release. -+/* .IP "\fBunix\fR (read-only)" -+/* A limited way to query the UNIX authentication database. The -+/* following tables are implemented: -+/* .RS -+/*. IP \fBunix:passwd.byname\fR -+/* The table is the UNIX password database. The key is a login name. -+/* The result is a password file entry in \fBpasswd\fR(5) format. -+/* .IP \fBunix:group.byname\fR -+/* The table is the UNIX group database. The key is a group name. -+/* The result is a group file entry in \fBgroup\fR(5) format. -+/* .RE -+/* .RE -+/* .IP -+/* Other table types may exist depending on how Postfix was built. -+/* .IP \fB-n\fR -+/* Print parameter settings that are not left at their built-in -+/* default value, because they are explicitly specified in main.cf. -+/* .IP "\fB-t\fR [\fItemplate_file\fR]" -+/* Display the templates for delivery status notification (DSN) -+/* messages. To override the built-in templates, specify a -+/* template file at the end of the command line, or specify a -+/* template file in main.cf with the \fBbounce_template_file\fR -+/* parameter. To force selection of the built-in templates, -+/* specify an empty template file name (in shell language: -+/* ""). -+/* -+/* This feature is available with Postfix 2.3 and later. -+/* .IP \fB-v\fR -+/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR -+/* options make the software increasingly verbose. -+/* .IP \fB-#\fR -+/* Edit the \fBmain.cf\fR configuration file. The file is copied -+/* to a temporary file then renamed into place. The parameters -+/* specified on the command line are commented-out, so that they -+/* revert to their default values. Specify a list of parameter -+/* names, not name=value pairs. There is no \fBpostconf\fR command -+/* to perform the reverse operation. -+/* -+/* This feature is available with Postfix 2.6 and later. -+/* DIAGNOSTICS -+/* Problems are reported to the standard error stream. -+/* ENVIRONMENT -+/* .ad -+/* .fi -+/* .IP \fBMAIL_CONFIG\fR -+/* Directory with Postfix configuration files. -+/* CONFIGURATION PARAMETERS -+/* .ad -+/* .fi -+/* The following \fBmain.cf\fR parameters are especially relevant to -+/* this program. -+/* -+/* The text below provides only a parameter summary. See -+/* \fBpostconf\fR(5) for more details including examples. -+/* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" -+/* The default location of the Postfix main.cf and master.cf -+/* configuration files. -+/* .IP "\fBbounce_template_file (empty)\fR" -+/* Pathname of a configuration file with bounce message templates. -+/* FILES -+/* /etc/postfix/main.cf, Postfix configuration parameters -+/* SEE ALSO -+/* bounce(5), bounce template file format -+/* postconf(5), configuration parameters -+/* README FILES -+/* .ad -+/* .fi -+/* Use "\fBpostconf readme_directory\fR" or -+/* "\fBpostconf html_directory\fR" to locate this information. -+/* .na -+/* .nf -+/* DATABASE_README, Postfix lookup table overview -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <sys/stat.h> -+#include <stdio.h> /* rename() */ -+#include <pwd.h> -+#include <string.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <ctype.h> -+ -+#ifdef USE_PATHS_H -+#include <paths.h> -+#endif -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <vstream.h> -+#include <msg_vstream.h> -+#include <get_hostname.h> -+#include <stringops.h> -+#include <htable.h> -+#include <dict.h> -+#include <safe.h> -+#include <mymalloc.h> -+#include <argv.h> -+#include <split_at.h> -+#include <vstring_vstream.h> -+#include <myflock.h> -+#include <inet_proto.h> -+#include <argv.h> -+#include <edit_file.h> -+ -+/* Global library. */ -+ -+#include <mynetworks.h> -+#include <mail_conf.h> -+#include <mail_dict.h> -+#include <mail_proto.h> -+#include <mail_version.h> -+#include <mail_params.h> -+#include <mail_addr.h> -+#include <mbox_conf.h> -+#include <mail_run.h> -+ -+/* XSASL library. */ -+ -+#include <xsasl.h> -+ -+ /* -+ * What we're supposed to be doing. -+ */ -+#define SHOW_NONDEF (1<<0) /* show non-default settings */ -+#define SHOW_DEFS (1<<1) /* show default setting */ -+#define SHOW_NAME (1<<2) /* show parameter name */ -+#define SHOW_MAPS (1<<3) /* show map types */ -+#define EDIT_MAIN (1<<4) /* edit main.cf */ -+#define SHOW_LOCKS (1<<5) /* show mailbox lock methods */ -+#define SHOW_EVAL (1<<6) /* expand right-hand sides */ -+#define SHOW_SASL_SERV (1<<7) /* show server auth plugin types */ -+#define SHOW_SASL_CLNT (1<<8) /* show client auth plugin types */ -+#define COMMENT_OUT (1<<9) /* #-out selected main.cf entries */ -+ -+ /* -+ * Lookup table for in-core parameter info. -+ */ -+HTABLE *param_table; -+ -+ /* -+ * Lookup table for external parameter info. -+ */ -+DICT *text_table; -+ -+ /* -+ * Declarations generated by scanning actual C source files. -+ */ -+#include "time_vars.h" -+#include "bool_vars.h" -+#include "int_vars.h" -+#include "str_vars.h" -+#include "raw_vars.h" -+#include "nint_vars.h" -+ -+ /* -+ * Manually extracted. -+ */ -+#include "auto_vars.h" -+#include "install_vars.h" -+ -+ /* -+ * Lookup tables generated by scanning actual C source files. -+ */ -+static const CONFIG_TIME_TABLE time_table[] = { -+#include "time_table.h" -+ 0, -+}; -+ -+static const CONFIG_BOOL_TABLE bool_table[] = { -+#include "bool_table.h" -+ 0, -+}; -+ -+static const CONFIG_INT_TABLE int_table[] = { -+#include "int_table.h" -+ 0, -+}; -+ -+static const CONFIG_STR_TABLE str_table[] = { -+#include "str_table.h" -+#include "auto_table.h" /* XXX */ -+#include "install_table.h" -+ 0, -+}; -+ -+static const CONFIG_RAW_TABLE raw_table[] = { -+#include "raw_table.h" -+ 0, -+}; -+ -+static const CONFIG_NINT_TABLE nint_table[] = { -+#include "nint_table.h" -+ 0, -+}; -+ -+ /* -+ * Parameters with default values obtained via function calls. -+ */ -+char *var_myhostname; -+char *var_mydomain; -+char *var_mynetworks; -+ -+static const char *check_myhostname(void); -+static const char *check_mydomainname(void); -+static const char *check_mynetworks(void); -+ -+static const CONFIG_STR_FN_TABLE str_fn_table[] = { -+ VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, -+ VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, -+ 0, -+}; -+static const CONFIG_STR_FN_TABLE str_fn_table_2[] = { -+ VAR_MYNETWORKS, check_mynetworks, &var_mynetworks, 1, 0, -+ 0, -+}; -+ -+ /* -+ * XXX Global so that call-backs can see it. -+ */ -+static int cmd_mode = SHOW_NAME; -+ -+/* check_myhostname - lookup hostname and validate */ -+ -+static const char *check_myhostname(void) -+{ -+ static const char *name; -+ const char *dot; -+ const char *domain; -+ -+ /* -+ * Use cached result. -+ */ -+ if (name) -+ return (name); -+ -+ /* -+ * If the local machine name is not in FQDN form, try to append the -+ * contents of $mydomain. -+ */ -+ name = get_hostname(); -+ if ((dot = strchr(name, '.')) == 0) { -+ if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) -+ domain = DEF_MYDOMAIN; -+ name = concatenate(name, ".", domain, (char *) 0); -+ } -+ return (name); -+} -+ -+/* get_myhostname - look up and store my hostname */ -+ -+static void get_myhostname(void) -+{ -+ const char *name; -+ -+ if ((name = mail_conf_lookup_eval(VAR_MYHOSTNAME)) == 0) -+ name = check_myhostname(); -+ var_myhostname = mystrdup(name); -+} -+ -+/* check_mydomainname - lookup domain name and validate */ -+ -+static const char *check_mydomainname(void) -+{ -+ char *dot; -+ -+ /* -+ * Use the hostname when it is not a FQDN ("foo"), or when the hostname -+ * actually is a domain name ("foo.com"). -+ */ -+ if (var_myhostname == 0) -+ get_myhostname(); -+ if ((dot = strchr(var_myhostname, '.')) == 0 || strchr(dot + 1, '.') == 0) -+ return (DEF_MYDOMAIN); -+ return (dot + 1); -+} -+ -+/* check_mynetworks - lookup network address list */ -+ -+static const char *check_mynetworks(void) -+{ -+ INET_PROTO_INFO *proto_info; -+ const char *junk; -+ -+ if (var_inet_interfaces == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_INET_INTERFACES)) == 0) -+ junk = DEF_INET_INTERFACES; -+ var_inet_interfaces = mystrdup(junk); -+ } -+ if (var_mynetworks_style == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_MYNETWORKS_STYLE)) == 0) -+ junk = DEF_MYNETWORKS_STYLE; -+ var_mynetworks_style = mystrdup(junk); -+ } -+ if (var_inet_protocols == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_INET_PROTOCOLS)) == 0) -+ junk = DEF_INET_PROTOCOLS; -+ var_inet_protocols = mystrdup(junk); -+ proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); -+ } -+ return (mynetworks()); -+} -+ -+/* edit_parameters - edit parameter file */ -+ -+static void edit_parameters(int cmd_mode, int argc, char **argv) -+{ -+ char *config_dir; -+ char *path; -+ EDIT_FILE *ep; -+ VSTREAM *src; -+ VSTREAM *dst; -+ VSTRING *buf = vstring_alloc(100); -+ VSTRING *key = vstring_alloc(10); -+ char *cp; -+ char *edit_key; -+ char *edit_val; -+ HTABLE *table; -+ struct cvalue { -+ char *value; -+ int found; -+ }; -+ struct cvalue *cvalue; -+ HTABLE_INFO **ht_info; -+ HTABLE_INFO **ht; -+ int interesting; -+ const char *err; -+ -+ /* -+ * Store command-line parameters for quick lookup. -+ */ -+ table = htable_create(argc); -+ while ((cp = *argv++) != 0) { -+ if (strchr(cp, '\n') != 0) -+ msg_fatal("-e or -# accepts no multi-line input"); -+ while (ISSPACE(*cp)) -+ cp++; -+ if (*cp == '#') -+ msg_fatal("-e or -# accepts no comment input"); -+ if (cmd_mode & EDIT_MAIN) { -+ if ((err = split_nameval(cp, &edit_key, &edit_val)) != 0) -+ msg_fatal("%s: \"%s\"", err, cp); -+ } else if (cmd_mode & COMMENT_OUT) { -+ if (*cp == 0) -+ msg_fatal("-# requires non-blank parameter names"); -+ if (strchr(cp, '=') != 0) -+ msg_fatal("-# requires parameter names only"); -+ edit_key = mystrdup(cp); -+ trimblanks(edit_key, 0); -+ edit_val = 0; -+ } else { -+ msg_panic("edit_parameters: unknown mode %d", cmd_mode); -+ } -+ cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue)); -+ cvalue->value = edit_val; -+ cvalue->found = 0; -+ htable_enter(table, edit_key, (char *) cvalue); -+ } -+ -+ /* -+ * XXX Avoid code duplication by better code decomposition. -+ */ -+ if (var_config_dir) -+ myfree(var_config_dir); -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ -+ /* -+ * Open a temp file for the result. This uses a deterministic name so we -+ * don't leave behind thrash with random names. -+ */ -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ if ((ep = edit_file_open(path, O_CREAT | O_WRONLY, 0644)) == 0) -+ msg_fatal("open %s%s: %m", path, EDIT_FILE_SUFFIX); -+ dst = ep->tmp_fp; -+ -+ /* -+ * Open the original file for input. -+ */ -+ if ((src = vstream_fopen(path, O_RDONLY, 0)) == 0) { -+ /* OK to delete, since we control the temp file name exclusively. */ -+ (void) unlink(ep->tmp_path); -+ msg_fatal("open %s for reading: %m", path); -+ } -+ -+ /* -+ * Copy original file to temp file, while replacing parameters on the -+ * fly. Issue warnings for names found multiple times. -+ */ -+#define STR(x) vstring_str(x) -+ -+ interesting = 0; -+ while (vstring_get(buf, src) != VSTREAM_EOF) { -+ for (cp = STR(buf); ISSPACE(*cp) /* including newline */ ; cp++) -+ /* void */ ; -+ /* Copy comment, all-whitespace, or empty line. */ -+ if (*cp == '#' || *cp == 0) { -+ vstream_fputs(STR(buf), dst); -+ } -+ /* Copy, skip or replace continued text. */ -+ else if (cp > STR(buf)) { -+ if (interesting == 0) -+ vstream_fputs(STR(buf), dst); -+ else if (cmd_mode & COMMENT_OUT) -+ vstream_fprintf(dst, "#%s", STR(buf)); -+ } -+ /* Copy or replace start of logical line. */ -+ else { -+ vstring_strncpy(key, cp, strcspn(cp, " \t\r\n=")); -+ cvalue = (struct cvalue *) htable_find(table, STR(key)); -+ if ((interesting = !!cvalue) != 0) { -+ if (cvalue->found++ == 1) -+ msg_warn("%s: multiple entries for \"%s\"", path, STR(key)); -+ if (cmd_mode & EDIT_MAIN) -+ vstream_fprintf(dst, "%s = %s\n", STR(key), cvalue->value); -+ else if (cmd_mode & COMMENT_OUT) -+ vstream_fprintf(dst, "#%s", cp); -+ else -+ msg_panic("edit_parameters: unknown mode %d", cmd_mode); -+ } else { -+ vstream_fputs(STR(buf), dst); -+ } -+ } -+ } -+ -+ /* -+ * Generate new entries for parameters that were not found. -+ */ -+ if (cmd_mode & EDIT_MAIN) { -+ for (ht_info = ht = htable_list(table); *ht; ht++) { -+ cvalue = (struct cvalue *) ht[0]->value; -+ if (cvalue->found == 0) -+ vstream_fprintf(dst, "%s = %s\n", ht[0]->key, cvalue->value); -+ } -+ myfree((char *) ht_info); -+ } -+ -+ /* -+ * When all is well, rename the temp file to the original one. -+ */ -+ if (vstream_fclose(src)) -+ msg_fatal("read %s: %m", path); -+ if (edit_file_close(ep) != 0) -+ msg_fatal("close %s%s: %m", path, EDIT_FILE_SUFFIX); -+ -+ /* -+ * Cleanup. -+ */ -+ myfree(path); -+ vstring_free(buf); -+ vstring_free(key); -+ htable_free(table, myfree); -+} -+ -+/* read_parameters - read parameter info from file */ -+ -+static void read_parameters(void) -+{ -+ char *config_dir; -+ char *path; -+ -+ /* -+ * A direct rip-off of mail_conf_read(). XXX Avoid code duplication by -+ * better code decomposition. -+ */ -+ dict_unknown_allowed = 1; -+ if (var_config_dir) -+ myfree(var_config_dir); -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ dict_load_file(CONFIG_DICT, path); -+ myfree(path); -+} -+ -+/* set_parameters - set parameter values from default or explicit setting */ -+ -+static void set_parameters(void) -+{ -+ -+ /* -+ * Populate the configuration parameter dictionary with default settings -+ * or with actual settings. -+ * -+ * Iterate over each entry in str_fn_table, str_fn_table_2, time_table, -+ * bool_table, int_table, str_table, and raw_table. Look up each -+ * parameter name in the configuration parameter dictionary. If the -+ * parameter is not set, take the default value, or take the value from -+ * main.cf, without doing $name expansions. This includes converting -+ * default values from numeric/boolean internal forms to external string -+ * form. -+ * -+ * Once the configuration parameter dictionary is populated, printing a -+ * parameter setting is a matter of querying the configuration parameter -+ * dictionary, optionally expanding of $name values, and printing the -+ * result. -+ */ -+} -+ -+/* hash_parameters - hash all parameter names so we can find and sort them */ -+ -+static void hash_parameters(void) -+{ -+ const CONFIG_TIME_TABLE *ctt; -+ const CONFIG_BOOL_TABLE *cbt; -+ const CONFIG_INT_TABLE *cit; -+ const CONFIG_STR_TABLE *cst; -+ const CONFIG_STR_FN_TABLE *csft; -+ const CONFIG_RAW_TABLE *rst; -+ const CONFIG_NINT_TABLE *nst; -+ -+ param_table = htable_create(100); -+ -+ for (ctt = time_table; ctt->name; ctt++) -+ htable_enter(param_table, ctt->name, (char *) ctt); -+ for (cbt = bool_table; cbt->name; cbt++) -+ htable_enter(param_table, cbt->name, (char *) cbt); -+ for (cit = int_table; cit->name; cit++) -+ htable_enter(param_table, cit->name, (char *) cit); -+ for (cst = str_table; cst->name; cst++) -+ htable_enter(param_table, cst->name, (char *) cst); -+ for (csft = str_fn_table; csft->name; csft++) -+ htable_enter(param_table, csft->name, (char *) csft); -+ for (csft = str_fn_table_2; csft->name; csft++) -+ htable_enter(param_table, csft->name, (char *) csft); -+ for (rst = raw_table; rst->name; rst++) -+ htable_enter(param_table, rst->name, (char *) rst); -+ for (nst = nint_table; nst->name; nst++) -+ htable_enter(param_table, nst->name, (char *) nst); -+} -+ -+/* show_strval - show string-valued parameter */ -+ -+static void show_strval(int mode, const char *name, const char *value) -+{ -+ if (mode & SHOW_EVAL) -+ value = mail_conf_eval(value); -+ -+ if (mode & SHOW_NAME) { -+ vstream_printf("%s = %s\n", name, value); -+ } else { -+ vstream_printf("%s\n", value); -+ } -+} -+ -+/* show_intval - show integer-valued parameter */ -+ -+static void show_intval(int mode, const char *name, int value) -+{ -+ if (mode & SHOW_NAME) { -+ vstream_printf("%s = %d\n", name, value); -+ } else { -+ vstream_printf("%d\n", value); -+ } -+} -+ -+/* print_bool - print boolean parameter */ -+ -+static void print_bool(int mode, CONFIG_BOOL_TABLE *cbt) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cbt->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); -+ } else { -+ show_strval(mode, cbt->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cbt->name, value); -+ } -+ } -+} -+ -+/* print_time - print relative time parameter */ -+ -+static void print_time(int mode, CONFIG_TIME_TABLE *ctt) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, ctt->name, ctt->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, ctt->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, ctt->name, ctt->defval); -+ } else { -+ show_strval(mode, ctt->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, ctt->name, value); -+ } -+ } -+} -+ -+/* print_int - print integer parameter */ -+ -+static void print_int(int mode, CONFIG_INT_TABLE *cit) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_intval(mode, cit->name, cit->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cit->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_intval(mode, cit->name, cit->defval); -+ } else { -+ show_strval(mode, cit->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cit->name, value); -+ } -+ } -+} -+ -+/* print_str - print string parameter */ -+ -+static void print_str(int mode, CONFIG_STR_TABLE *cst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, cst->name, cst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, cst->name, cst->defval); -+ } else { -+ show_strval(mode, cst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cst->name, value); -+ } -+ } -+} -+ -+/* print_str_fn - print string-function parameter */ -+ -+static void print_str_fn(int mode, CONFIG_STR_FN_TABLE *csft) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ value = dict_lookup(CONFIG_DICT, csft->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ show_strval(mode, csft->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, csft->name, value); -+ } -+ } -+} -+ -+/* print_str_fn_2 - print string-function parameter */ -+ -+static void print_str_fn_2(int mode, CONFIG_STR_FN_TABLE *csft) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ value = dict_lookup(CONFIG_DICT, csft->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ show_strval(mode, csft->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, csft->name, value); -+ } -+ } -+} -+ -+/* print_raw - print raw string parameter */ -+ -+static void print_raw(int mode, CONFIG_RAW_TABLE * rst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_EVAL) -+ msg_warn("parameter %s expands at run-time", rst->name); -+ mode &= ~SHOW_EVAL; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, rst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ show_strval(mode, rst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, rst->name, value); -+ } -+ } -+} -+ -+/* print_nint - print new integer parameter */ -+ -+static void print_nint(int mode, CONFIG_NINT_TABLE * rst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_EVAL) -+ msg_warn("parameter %s expands at run-time", rst->name); -+ mode &= ~SHOW_EVAL; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, rst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ show_strval(mode, rst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, rst->name, value); -+ } -+ } -+} -+ -+/* print_parameter - show specific parameter */ -+ -+static void print_parameter(int mode, char *ptr) -+{ -+ -+#define INSIDE(p,t) (ptr >= (char *) t && ptr < ((char *) t) + sizeof(t)) -+ -+ /* -+ * This is gross, but the best we can do on short notice. -+ */ -+ if (INSIDE(ptr, time_table)) -+ print_time(mode, (CONFIG_TIME_TABLE *) ptr); -+ if (INSIDE(ptr, bool_table)) -+ print_bool(mode, (CONFIG_BOOL_TABLE *) ptr); -+ if (INSIDE(ptr, int_table)) -+ print_int(mode, (CONFIG_INT_TABLE *) ptr); -+ if (INSIDE(ptr, str_table)) -+ print_str(mode, (CONFIG_STR_TABLE *) ptr); -+ if (INSIDE(ptr, str_fn_table)) -+ print_str_fn(mode, (CONFIG_STR_FN_TABLE *) ptr); -+ if (INSIDE(ptr, str_fn_table_2)) -+ print_str_fn_2(mode, (CONFIG_STR_FN_TABLE *) ptr); -+ if (INSIDE(ptr, raw_table)) -+ print_raw(mode, (CONFIG_RAW_TABLE *) ptr); -+ if (INSIDE(ptr, nint_table)) -+ print_nint(mode, (CONFIG_NINT_TABLE *) ptr); -+ if (msg_verbose) -+ vstream_fflush(VSTREAM_OUT); -+} -+ -+/* comp_names - qsort helper */ -+ -+static int comp_names(const void *a, const void *b) -+{ -+ HTABLE_INFO **ap = (HTABLE_INFO **) a; -+ HTABLE_INFO **bp = (HTABLE_INFO **) b; -+ -+ return (strcmp(ap[0]->key, bp[0]->key)); -+} -+ -+/* show_maps - show available maps */ -+ -+static void show_maps(void) -+{ -+ ARGV *maps_argv; -+ int i; -+ -+ maps_argv = dict_mapnames(); -+ for (i = 0; i < maps_argv->argc; i++) -+ vstream_printf("%s\n", maps_argv->argv[i]); -+ argv_free(maps_argv); -+} -+ -+/* show_locks - show available mailbox locking methods */ -+ -+static void show_locks(void) -+{ -+ ARGV *locks_argv; -+ int i; -+ -+ locks_argv = mbox_lock_names(); -+ for (i = 0; i < locks_argv->argc; i++) -+ vstream_printf("%s\n", locks_argv->argv[i]); -+ argv_free(locks_argv); -+} -+ -+/* show_sasl - show SASL plug-in types */ -+ -+static void show_sasl(int what) -+{ -+ ARGV *sasl_argv; -+ int i; -+ -+ sasl_argv = (what & SHOW_SASL_SERV) ? xsasl_server_types() : -+ xsasl_client_types(); -+ for (i = 0; i < sasl_argv->argc; i++) -+ vstream_printf("%s\n", sasl_argv->argv[i]); -+ argv_free(sasl_argv); -+} -+ -+/* show_parameters - show parameter info */ -+ -+static void show_parameters(int mode, char **names) -+{ -+ HTABLE_INFO **list; -+ HTABLE_INFO **ht; -+ char **namep; -+ char *value; -+ -+ /* -+ * Show all parameters. -+ */ -+ if (*names == 0) { -+ list = htable_list(param_table); -+ qsort((char *) list, param_table->used, sizeof(*list), comp_names); -+ for (ht = list; *ht; ht++) -+ print_parameter(mode, ht[0]->value); -+ myfree((char *) list); -+ return; -+ } -+ -+ /* -+ * Show named parameters. -+ */ -+ for (namep = names; *namep; namep++) { -+ if ((value = htable_find(param_table, *namep)) == 0) { -+ msg_warn("%s: unknown parameter", *namep); -+ } else { -+ print_parameter(mode, value); -+ } -+ } -+} -+ -+MAIL_VERSION_STAMP_DECLARE; -+ -+/* main */ -+ -+int main(int argc, char **argv) -+{ -+ int ch; -+ int fd; -+ struct stat st; -+ int junk; -+ ARGV *ext_argv = 0; -+ -+ /* -+ * Fingerprint executables and core dumps. -+ */ -+ MAIL_VERSION_STAMP_ALLOCATE; -+ -+ /* -+ * Be consistent with file permissions. -+ */ -+ umask(022); -+ -+ /* -+ * To minimize confusion, make sure that the standard file descriptors -+ * are open before opening anything else. XXX Work around for 44BSD where -+ * fstat can return EBADF on an open file descriptor. -+ */ -+ for (fd = 0; fd < 3; fd++) -+ if (fstat(fd, &st) == -1 -+ && (close(fd), open("/dev/null", O_RDWR, 0)) != fd) -+ msg_fatal("open /dev/null: %m"); -+ -+ /* -+ * Set up logging. -+ */ -+ msg_vstream_init(argv[0], VSTREAM_ERR); -+ -+ /* -+ * Parse JCL. -+ */ -+ while ((ch = GETOPT(argc, argv, "aAbc:deE#hmlntv")) > 0) { -+ switch (ch) { -+ case 'a': -+ cmd_mode |= SHOW_SASL_SERV; -+ break; -+ case 'A': -+ cmd_mode |= SHOW_SASL_CLNT; -+ break; -+ case 'b': -+ if (ext_argv) -+ msg_fatal("specify one of -b and -t"); -+ ext_argv = argv_alloc(2); -+ argv_add(ext_argv, "bounce", "-SVnexpand_templates", (char *) 0); -+ break; -+ case 'c': -+ if (setenv(CONF_ENV_PATH, optarg, 1) < 0) -+ msg_fatal("out of memory"); -+ break; -+ case 'd': -+ cmd_mode |= SHOW_DEFS; -+ break; -+ case 'e': -+ cmd_mode |= EDIT_MAIN; -+ break; -+ -+ /* -+ * People, this does not work unless you properly handle default -+ * settings. For example, fast_flush_domains = $relay_domains -+ * must not evaluate to the empty string when relay_domains is -+ * left at its default setting of $mydestination. -+ */ -+#if 0 -+ case 'E': -+ cmd_mode |= SHOW_EVAL; -+ break; -+#endif -+ case '#': -+ cmd_mode = COMMENT_OUT; -+ break; -+ -+ case 'h': -+ cmd_mode &= ~SHOW_NAME; -+ break; -+ case 'l': -+ cmd_mode |= SHOW_LOCKS; -+ break; -+ case 'm': -+ cmd_mode |= SHOW_MAPS; -+ break; -+ case 'n': -+ cmd_mode |= SHOW_NONDEF; -+ break; -+ case 't': -+ if (ext_argv) -+ msg_fatal("specify one of -b and -t"); -+ ext_argv = argv_alloc(2); -+ argv_add(ext_argv, "bounce", "-SVndump_templates", (char *) 0); -+ break; -+ case 'v': -+ msg_verbose++; -+ break; -+ default: -+ msg_fatal("usage: %s [-a (server SASL types)] [-A (client SASL types)] [-b (bounce templates)] [-c config_dir] [-d (defaults)] [-e (edit)] [-# (comment-out)] [-h (no names)] [-l (lock types)] [-m (map types)] [-n (non-defaults)] [-v] [name...]", argv[0]); -+ } -+ } -+ -+ /* -+ * Sanity check. -+ */ -+ junk = (cmd_mode & (SHOW_DEFS | SHOW_NONDEF | SHOW_MAPS | SHOW_LOCKS | EDIT_MAIN | SHOW_SASL_SERV | SHOW_SASL_CLNT | COMMENT_OUT)); -+ if (junk != 0 && ((junk != SHOW_DEFS && junk != SHOW_NONDEF -+ && junk != SHOW_MAPS && junk != SHOW_LOCKS && junk != EDIT_MAIN -+ && junk != SHOW_SASL_SERV && junk != SHOW_SASL_CLNT -+ && junk != COMMENT_OUT) -+ || ext_argv != 0)) -+ msg_fatal("specify one of -a, -A, -b, -d, -e, -#, -m, -l and -n"); -+ -+ /* -+ * Display bounce template information and exit. -+ */ -+ if (ext_argv) { -+ if (argv[optind]) { -+ if (argv[optind + 1]) -+ msg_fatal("options -b and -t require at most one template file"); -+ argv_add(ext_argv, "-o", -+ concatenate(VAR_BOUNCE_TMPL, "=", -+ argv[optind], (char *) 0), -+ (char *) 0); -+ } -+ /* Grr... */ -+ argv_add(ext_argv, "-o", -+ concatenate(VAR_QUEUE_DIR, "=", ".", (char *) 0), -+ (char *) 0); -+ mail_conf_read(); -+ mail_run_replace(var_daemon_dir, ext_argv->argv); -+ /* NOTREACHED */ -+ } -+ -+ /* -+ * If showing map types, show them and exit -+ */ -+ if (cmd_mode & SHOW_MAPS) { -+ mail_dict_init(); -+ show_maps(); -+ } -+ -+ /* -+ * If showing locking methods, show them and exit -+ */ -+ else if (cmd_mode & SHOW_LOCKS) { -+ show_locks(); -+ } -+ -+ /* -+ * If showing SASL plug-in types, show them and exit -+ */ -+ else if (cmd_mode & SHOW_SASL_SERV) { -+ show_sasl(SHOW_SASL_SERV); -+ } else if (cmd_mode & SHOW_SASL_CLNT) { -+ show_sasl(SHOW_SASL_CLNT); -+ } -+ -+ /* -+ * Edit main.cf. -+ */ -+ else if (cmd_mode & (EDIT_MAIN | COMMENT_OUT)) { -+ edit_parameters(cmd_mode, argc - optind, argv + optind); -+ } -+ -+ /* -+ * If showing non-default values, read main.cf. -+ */ -+ else { -+ if ((cmd_mode & SHOW_DEFS) == 0) { -+ read_parameters(); -+ set_parameters(); -+ } -+ -+ /* -+ * Throw together all parameters and show the asked values. -+ */ -+ hash_parameters(); -+ show_parameters(cmd_mode, argv + optind); -+ } -+ vstream_fflush(VSTREAM_OUT); -+ exit(0); -+} -diff -ruN a/src/postmap/postmap.c b/src/postmap/postmap.c ---- a/src/postmap/postmap.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/postmap/postmap.c 2009-06-01 13:08:26.000000000 +0000 -@@ -5,7 +5,7 @@ - /* Postfix lookup table management - /* SYNOPSIS - /* .fi --/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] -+/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] - /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] - /* [\fIfile_type\fR:]\fIfile_name\fR ... - /* DESCRIPTION -@@ -151,6 +151,8 @@ - /* .sp - /* This feature is available in Postfix version 2.2 and later, - /* and is not available for all database types. -+/* .IP \fB-u\fR -+/* Upgrade the database to the current version. - /* .IP \fB-v\fR - /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR - /* options make the software increasingly verbose. -@@ -723,6 +725,18 @@ - dict_close(dict); - } - -+/* postmap_upgrade - upgrade a map */ -+ -+static int postmap_upgrade(const char *map_type, const char *map_name) -+{ -+ DICT *dict; -+ -+ dict = dict_open3(map_type, map_name, O_RDWR, -+ DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); -+ dict_close(dict); -+ return (dict != 0); -+} -+ - /* usage - explain */ - - static NORETURN usage(char *myname) -@@ -743,6 +757,7 @@ - int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; - int open_flags = O_RDWR | O_CREAT | O_TRUNC; - int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; -+ int upgrade = 0; - char *query = 0; - char *delkey = 0; - int sequence = 0; -@@ -787,7 +802,7 @@ - /* - * Parse JCL. - */ -- while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { -+ while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { - switch (ch) { - default: - usage(argv[0]); -@@ -804,8 +819,8 @@ - msg_fatal("out of memory"); - break; - case 'd': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - delkey = optarg; - break; - case 'f': -@@ -831,8 +846,8 @@ - postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; - break; - case 'q': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - query = optarg; - break; - case 'r': -@@ -840,10 +855,15 @@ - dict_flags |= DICT_FLAG_DUP_REPLACE; - break; - case 's': -- if (query || delkey) -- msg_fatal("specify only one of -s or -q or -d"); -+ if (query || delkey || upgrade) -+ msg_fatal("specify only one of -s or -q or -u or -d"); - sequence = 1; - break; -+ case 'u': -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); -+ upgrade=1; -+ break; - case 'v': - msg_verbose++; - break; -@@ -914,6 +934,21 @@ - exit(0); - } - exit(1); -+ } else if (upgrade) { /* Upgrade the map(s) */ -+ int success = 1; -+ if (optind + 1 > argc) -+ usage(argv[0]); -+ while (optind < argc) { -+ if ((path_name = split_at(argv[optind], ':')) != 0) { -+ success &= postmap_upgrade(argv[optind], path_name); -+ } else { -+ success &= postmap_upgrade(var_db_type, path_name); -+ } -+ if (!success) -+ exit(1); -+ optind++; -+ } -+ exit(0); - } else { /* create/update map(s) */ - if (optind + 1 > argc) - usage(argv[0]); -diff -ruN a/src/tls/Makefile.in b/src/tls/Makefile.in ---- a/src/tls/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/tls/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -22,7 +22,7 @@ - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -38,12 +38,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/util/Makefile.in b/src/util/Makefile.in ---- a/src/util/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -31,21 +31,23 @@ - vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ - write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ - allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ -- upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c -+ upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ -+ load_lib.c - OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ - attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ - attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ - chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ - ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ - dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ -- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ -- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ -+ dict_nisplus.o dict_open.o dict_regexp.o \ -+ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ - dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ - fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ - fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ - host_port.o htable.o inet_addr_host.o inet_addr_list.o \ - inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ - inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ -+ load_lib.o \ - mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ - msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ - mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ -@@ -78,7 +80,7 @@ - msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ - mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ - open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ -- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ -+ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ - sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ - sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ - stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ -@@ -91,6 +93,7 @@ - CFLAGS = $(DEBUG) $(OPT) $(DEFS) - FILES = Makefile $(SRCS) $(HDRS) - INCL = -+PCRESO = dict_pcre.so - LIB = libutil.a - TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ - fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ -@@ -105,10 +108,11 @@ - - LIB_DIR = ../../lib - INC_DIR = ../../include -+LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(PCRESO) - - $(OBJS): ../../conf/makedefs.out - -@@ -117,15 +121,19 @@ - - test: $(TESTPROG) - -+$(PCRESO): dict_pcre.o libutil.a -+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil -+ - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(PCRESO): $(PCRESO) -+ cp $(PCRESO) ../../libexec -+ -+update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -147,7 +155,8 @@ - lint $(SRCS) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp -+ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ -+ junk $(MAKES) *.tmp - rm -rf printfck - - tidy: clean -diff -ruN a/src/util/dict.h b/src/util/dict.h ---- a/src/util/dict.h 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict.h 2009-06-01 13:08:26.000000000 +0000 -@@ -66,6 +66,7 @@ - #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ - #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ - #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ -+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ - #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) - - /* IMPORTANT: Update the dict_mask[] table when the above changes */ -@@ -138,6 +139,11 @@ - extern DICT *dict_open(const char *, int, int); - extern DICT *dict_open3(const char *, const char *, int, int); - extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); -+#ifndef NO_DYNAMIC_MAPS -+extern void dict_open_dlinfo(const char *path); -+typedef void* (*dict_mkmap_func_t)(const char *); -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type); -+#endif - - #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) - #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) -diff -ruN a/src/util/dict_db.c b/src/util/dict_db.c ---- a/src/util/dict_db.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_db.c 2009-06-01 13:08:26.000000000 +0000 -@@ -664,6 +664,12 @@ - msg_fatal("set DB cache size %d: %m", dict_db_cache_size); - if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) - msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); -+ if (dict_flags & DICT_FLAG_UPGRADE) { -+ if (msg_verbose) -+ msg_info("upgrading database %s",db_path); -+ if ((errno = db->upgrade(db,db_path,0)) != 0) -+ msg_fatal("upgrade of database %s: %m",db_path); -+ } - #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) - if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) - msg_fatal("open database %s: %m", db_path); -diff -ruN a/src/util/dict_dbm.c b/src/util/dict_dbm.c ---- a/src/util/dict_dbm.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_dbm.c 2009-06-01 13:08:26.000000000 +0000 -@@ -407,6 +407,10 @@ - char *dbm_path; - int lock_fd; - -+#ifdef HAVE_GDBM -+ msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", -+ path); -+#endif - /* - * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in - * the time domain) locking while accessing individual database records. -diff -ruN a/src/util/dict_open.c b/src/util/dict_open.c ---- a/src/util/dict_open.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_open.c 2009-06-01 13:08:26.000000000 +0000 -@@ -44,6 +44,8 @@ - /* DICT *(*open) (const char *, int, int); - /* - /* ARGV *dict_mapnames() -+/* -+/* void (*)() dict_mkmap_func(const char *dict_type) - /* DESCRIPTION - /* This module implements a low-level interface to multiple - /* physical dictionary types. -@@ -159,6 +161,9 @@ - /* - /* dict_mapnames() returns a sorted list with the names of all available - /* dictionary types. -+/* -+/* dict_mkmap_func() returns a pointer to the mkmap setup function -+/* for the given map type, as given in /etc/dynamicmaps.cf - /* DIAGNOSTICS - /* Fatal error: open error, unsupported dictionary type, attempt to - /* update non-writable dictionary. -@@ -183,6 +188,9 @@ - #include <strings.h> - #endif - -+#include <sys/stat.h> -+#include <unistd.h> -+ - /* Utility library. */ - - #include <argv.h> -@@ -207,6 +215,27 @@ - #include <split_at.h> - #include <htable.h> - -+#ifndef NO_DYNAMIC_MAPS -+#include <load_lib.h> -+#include <vstring.h> -+#include <vstream.h> -+#include <vstring_vstream.h> -+#include <mvect.h> -+ -+ /* -+ * Interface for dynamic map loading. -+ */ -+typedef struct { -+ const char *pattern; -+ const char *soname; -+ const char *openfunc; -+ const char *mkmapfunc; -+} DLINFO; -+ -+static DLINFO *dict_dlinfo; -+static DLINFO *dict_open_dlfind(const char *type); -+#endif -+ - /* - * lookup table for available map types. - */ -@@ -221,9 +250,11 @@ - #endif - DICT_TYPE_ENVIRON, dict_env_open, - DICT_TYPE_UNIX, dict_unix_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef SNAPSHOT - DICT_TYPE_TCP, dict_tcp_open, - #endif -+#endif - #ifdef HAS_SDBM - DICT_TYPE_SDBM, dict_sdbm_open, - #endif -@@ -243,9 +274,11 @@ - #ifdef HAS_NETINFO - DICT_TYPE_NETINFO, dict_ni_open, - #endif -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_PCRE - DICT_TYPE_PCRE, dict_pcre_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - #ifdef HAS_POSIX_REGEXP - DICT_TYPE_REGEXP, dict_regexp_open, - #endif -@@ -303,8 +336,31 @@ - dict_type, dict_name); - if (dict_open_hash == 0) - dict_open_init(); -- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) -- msg_fatal("unsupported dictionary type: %s", dict_type); -+ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { -+#ifdef NO_DYNAMIC_MAPS -+ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); -+#else -+ struct stat st; -+ LIB_FN fn[2]; -+ DICT *(*open) (const char *, int, int); -+ DLINFO *dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ fn[0].name = dl->openfunc; -+ fn[0].ptr = (void**)&open; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ dict_open_register(dict_type, open); -+ dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); -+#endif -+ } -+ if (msg_verbose>1) { -+ msg_info("%s: calling %s open routine",myname,dict_type); -+ } - if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) - msg_fatal("opening %s:%s %m", dict_type, dict_name); - if (msg_verbose) -@@ -312,6 +368,36 @@ - return (dict); - } - -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type) -+{ -+ char *myname="dict_mkmap_func"; -+ struct stat st; -+ LIB_FN fn[2]; -+ dict_mkmap_func_t mkmap; -+ DLINFO *dl; -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ if (!dl->mkmapfunc) -+ msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); -+ -+ fn[0].name = dl->mkmapfunc; -+ fn[0].ptr = (void**)&mkmap; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ return mkmap; -+#else -+ return (void(*)())NULL; -+#endif -+} -+ - /* dict_open_register - register dictionary type */ - - void dict_open_register(const char *type, -@@ -345,6 +431,9 @@ - HTABLE_INFO **ht; - DICT_OPEN_INFO *dp; - ARGV *mapnames; -+#ifndef NO_DYNAMIC_MAPS -+ DLINFO *dlp; -+#endif - - if (dict_open_hash == 0) - dict_open_init(); -@@ -353,6 +442,13 @@ - dp = (DICT_OPEN_INFO *) ht[0]->value; - argv_add(mapnames, dp->type, ARGV_END); - } -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ for (dlp=dict_dlinfo; dlp->pattern; dlp++) { -+ argv_add(mapnames, dlp->pattern, ARGV_END); -+ } -+#endif - qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), - dict_sort_alpha_cpp); - myfree((char *) ht_info); -@@ -360,6 +456,87 @@ - return mapnames; - } - -+#ifndef NO_DYNAMIC_MAPS -+#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) -+ -+void dict_open_dlinfo(const char *path) -+{ -+ char *myname="dict_open_dlinfo"; -+ VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); -+ VSTRING *buf = vstring_alloc(100); -+ char *cp; -+ ARGV *argv; -+ MVECT vector; -+ int nelm=0; -+ int linenum=0; -+ -+ dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); -+ -+ if (!conf_fp) { -+ msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", -+ myname, path); -+ } else { -+ while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { -+ cp = vstring_str(buf); -+ linenum++; -+ if (*cp == '#' || *cp == '\0') -+ continue; -+ argv = argv_split(cp, " \t"); -+ if (argv->argc != 3 && argv->argc != 4) { -+ msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", -+ myname, linenum); -+ } -+ if (STREQ(argv->argv[0],"*")) { -+ msg_warn("%s: wildcard dynamic map entry no longer supported.", -+ myname); -+ continue; -+ } -+ if (argv->argv[1][0] != '/') { -+ msg_fatal("%s: .so name must begin with a \"/\" at line %d", -+ myname, linenum); -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); -+ } -+ dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); -+ dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); -+ dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); -+ if (argv->argc==4) -+ dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); -+ else -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ nelm++; -+ argv_free(argv); -+ } -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); -+ } -+ dict_dlinfo[nelm].pattern = NULL; -+ dict_dlinfo[nelm].soname = NULL; -+ dict_dlinfo[nelm].openfunc = NULL; -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ if (conf_fp) -+ vstream_fclose(conf_fp); -+ vstring_free(buf); -+} -+ -+static DLINFO *dict_open_dlfind(const char *type) -+{ -+ DLINFO *dp; -+ -+ if (!dict_dlinfo) -+ return NULL; -+ -+ for (dp=dict_dlinfo; dp->pattern; dp++) { -+ if (STREQ(dp->pattern,type)) -+ return dp; -+ } -+ return NULL; -+} -+ -+#endif /* !NO_DYNAMIC_MAPS */ -+ - #ifdef TEST - - /* -diff -ruN a/src/util/load_lib.c b/src/util/load_lib.c ---- a/src/util/load_lib.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/util/load_lib.c 2009-06-01 13:08:26.000000000 +0000 -@@ -0,0 +1,135 @@ -+/*++ -+/* NAME -+/* load_lib 3 -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include <load_lib.h> -+/* -+/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+/* const char *libname; -+/* LIB_FN *libfuncs; -+/* LIB_FN *libdata; -+/* -+/* DESCRIPTION -+/* This module loads functions from libraries, returnine pointers -+/* to the named functions. -+/* -+/* load_library_symbols() loads all of the desired functions, and -+/* returns zero for success, or exits via msg_fatal(). -+/* -+/* SEE ALSO -+/* msg(3) diagnostics interface -+/* DIAGNOSTICS -+/* Problems are reported via the msg(3) diagnostics routines: -+/* library not found, symbols not found, other fatal errors. -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System libraries. */ -+ -+#include "sys_defs.h" -+#include <stdlib.h> -+#include <stddef.h> -+#include <string.h> -+#if defined(HAS_DLOPEN) -+#include <dlfcn.h> -+#elif defined(HAS_SHL_LOAD) -+#include <dl.h> -+#endif -+ -+/* Application-specific. */ -+ -+#include "msg.h" -+#include "load_lib.h" -+ -+extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) -+{ -+ char *myname = "load_library_symbols"; -+ LIB_FN *fn; -+ -+#if defined(HAS_DLOPEN) -+ void *handle; -+ char *emsg; -+ -+ handle=dlopen(libname,RTLD_NOW); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); -+ } -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+#elif defined(HAS_SHL_LOAD) -+ shl_t handle; -+ -+ handle = shl_load(libname,BIND_IMMEDIATE,0); -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+#else -+ msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", -+ myname); -+#endif -+ return 0; -+} -diff -ruN a/src/util/load_lib.h b/src/util/load_lib.h ---- a/src/util/load_lib.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/util/load_lib.h 2009-06-01 13:08:26.000000000 +0000 -@@ -0,0 +1,41 @@ -+#ifndef _LOAD_LIB_H_INCLUDED_ -+#define _LOAD_LIB_H_INCLUDED_ -+ -+/*++ -+/* NAME -+/* load_lib 3h -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include "load_lib.h" -+/* DESCRIPTION -+/* .nf -+ -+ /* -+ * External interface. -+ */ -+/* NULL name terminates list */ -+typedef struct LIB_FN { -+ const char *name; -+ void **ptr; -+} LIB_FN; -+ -+extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+ -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+#endif diff --git a/main/postfix/postfix-2.7.0-dynamic-maps.patch b/main/postfix/postfix-2.7.0-dynamic-maps.patch new file mode 100644 index 000000000..da1c799be --- /dev/null +++ b/main/postfix/postfix-2.7.0-dynamic-maps.patch @@ -0,0 +1,1064 @@ +commit 98599e6387147a26d8433e85a4a61ef5c4240e83 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon May 31 14:49:38 2010 +0000 + + added dynamic maps + +diff --git a/conf/postfix-files b/conf/postfix-files +index 7ff93ea..7cae109 100644 +--- a/conf/postfix-files ++++ b/conf/postfix-files +@@ -65,6 +65,10 @@ $queue_directory/saved:d:$mail_owner:-:700:ucr + $queue_directory/trace:d:$mail_owner:-:700:ucr + $daemon_directory/anvil:f:root:-:755 + $daemon_directory/bounce:f:root:-:755 ++$daemon_directory/dict_ldap.so:f:root:-:755 ++$daemon_directory/dict_pcre.so:f:root:-:755 ++$daemon_directory/dict_mysql.so:f:root:-:755 ++$daemon_directory/dict_pgsql.so:f:root:-:755 + $daemon_directory/cleanup:f:root:-:755 + $daemon_directory/discard:f:root:-:755 + $daemon_directory/error:f:root:-:755 +@@ -94,6 +98,11 @@ $daemon_directory/tlsmgr:f:root:-:755 + $daemon_directory/trivial-rewrite:f:root:-:755 + $daemon_directory/verify:f:root:-:755 + $daemon_directory/virtual:f:root:-:755 ++/usr/lib/libpostfix-dns.so.1:f:root:-:755 ++/usr/lib/libpostfix-global.so.1:f:root:-:755 ++/usr/lib/libpostfix-tls.so.1:f:root:-:755 ++/usr/lib/libpostfix-master.so.1:f:root:-:755 ++/usr/lib/libpostfix-util.so.1:f:root:-:755 + $daemon_directory/nqmgr:h:$daemon_directory/qmgr + $daemon_directory/lmtp:h:$daemon_directory/smtp + $command_directory/postalias:f:root:-:755 +@@ -117,6 +126,7 @@ $config_directory/access:f:root:-:644:p1 + $config_directory/aliases:f:root:-:644:p1 + $config_directory/bounce.cf.default:f:root:-:644:1 + $config_directory/canonical:f:root:-:644:p1 ++$config_directory/dynamicmaps.cf:f:root:-:644:p + $config_directory/cidr_table:f:root:-:644:o + $config_directory/generic:f:root:-:644:p1 + $config_directory/generics:f:root:-:644:o +diff --git a/src/dns/Makefile.in b/src/dns/Makefile.in +index bbc5e98..f70cb96 100644 +--- a/src/dns/Makefile.in ++++ b/src/dns/Makefile.in +@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a + LIB_DIR = ../../lib + INC_DIR = ../../include + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_sa_test dns_sa_to_rr_test \ + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/global/Makefile.in b/src/global/Makefile.in +index 56c9b6c..b0c83d6 100644 +--- a/src/global/Makefile.in ++++ b/src/global/Makefile.in +@@ -34,7 +34,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ + canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ + clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ + defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ +- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ ++ deliver_request.o \ + dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ + dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ + ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ +@@ -104,10 +104,13 @@ LIBS = ../../lib/libutil.a + LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = ++LDAPSO = dict_ldap.so ++MYSQLSO = dict_mysql.so ++PGSQLSO = dict_pgsql.so + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + +-all: $(LIB) ++all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) + + $(OBJS): ../../conf/makedefs.out + +@@ -117,14 +120,30 @@ Makefile: Makefile.in + test: $(TESTPROG) + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) ++ ++$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal ++ ++$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal ++ ++$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + +-update: $(LIB_DIR)/$(LIB) $(HDRS) ++../../libexec/$(LDAPSO): $(LDAPSO) ++ cp $(LDAPSO) ../../libexec ++ ++../../libexec/$(MYSQLSO): $(MYSQLSO) ++ cp $(MYSQLSO) ../../libexec ++ ++../../libexec/$(PGSQLSO): $(PGSQLSO) ++ cp $(PGSQLSO) ../../libexec ++ ++update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) + -for i in $(HDRS); \ + do \ + cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ +@@ -492,7 +511,7 @@ lint: + lint $(DEFS) $(SRCS) $(LINTFIX) + + clean: +- rm -f *.o $(LIB) *core $(TESTPROG) junk ++ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk + rm -rf printfck + + tidy: clean +diff --git a/src/global/mail_conf.c b/src/global/mail_conf.c +index c5d3d43..feb7d66 100644 +--- a/src/global/mail_conf.c ++++ b/src/global/mail_conf.c +@@ -182,6 +182,13 @@ void mail_conf_suck(void) + path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); + dict_load_file(CONFIG_DICT, path); + myfree(path); ++ ++#ifndef NO_DYNAMIC_MAPS ++ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); ++ dict_open_dlinfo(path); ++ myfree(path); ++#endif ++ + } + + /* mail_conf_flush - discard configuration dictionary */ +diff --git a/src/global/mail_dict.c b/src/global/mail_dict.c +index 35ecffb..c1ff165 100644 +--- a/src/global/mail_dict.c ++++ b/src/global/mail_dict.c +@@ -45,6 +45,7 @@ typedef struct { + + static const DICT_OPEN_INFO dict_open_info[] = { + DICT_TYPE_PROXY, dict_proxy_open, ++#ifdef NO_DYNAMIC_MAPS + #ifdef HAS_LDAP + DICT_TYPE_LDAP, dict_ldap_open, + #endif +@@ -54,6 +55,7 @@ static const DICT_OPEN_INFO dict_open_info[] = { + #ifdef HAS_PGSQL + DICT_TYPE_PGSQL, dict_pgsql_open, + #endif ++#endif /* NO_DYNAMIC_MAPS */ + 0, + }; + +diff --git a/src/global/mail_params.c b/src/global/mail_params.c +index f5350a1..1bbad7a 100644 +--- a/src/global/mail_params.c ++++ b/src/global/mail_params.c +@@ -79,6 +79,7 @@ + /* char *var_export_environ; + /* char *var_debug_peer_list; + /* int var_debug_peer_level; ++/* int var_command_maxtime; + /* int var_in_flow_delay; + /* int var_fault_inj_code; + /* char *var_bounce_service; +@@ -265,6 +266,7 @@ char *var_import_environ; + char *var_export_environ; + char *var_debug_peer_list; + int var_debug_peer_level; ++int var_command_maxtime; + int var_fault_inj_code; + char *var_bounce_service; + char *var_cleanup_service; +@@ -276,6 +278,7 @@ char *var_showq_service; + char *var_error_service; + char *var_flush_service; + char *var_verify_service; ++char *var_scache_service; + char *var_trace_service; + char *var_proxymap_service; + char *var_proxywrite_service; +diff --git a/src/global/mkmap_open.c b/src/global/mkmap_open.c +index 69a0d57..eb8de71 100644 +--- a/src/global/mkmap_open.c ++++ b/src/global/mkmap_open.c +@@ -81,7 +81,7 @@ + * We use a different table (in dict_open.c) when querying maps. + */ + typedef struct { +- char *type; ++ const char *type; + MKMAP *(*before_open) (const char *); + } MKMAP_OPEN_INFO; + +@@ -156,7 +156,16 @@ MKMAP *mkmap_open(const char *type, const char *path, + */ + for (mp = mkmap_types; /* void */ ; mp++) { + if (mp->type == 0) ++#ifndef NO_DYNAMIC_MAPS ++ { ++ static MKMAP_OPEN_INFO oi; ++ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); ++ oi.type=type; ++ mp=&oi; ++ } ++#else + msg_fatal("unsupported map type: %s", type); ++#endif + if (strcmp(type, mp->type) == 0) + break; + } +diff --git a/src/master/Makefile.in b/src/master/Makefile.in +index 53f65bd..48ca35e 100644 +--- a/src/master/Makefile.in ++++ b/src/master/Makefile.in +@@ -20,7 +20,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + BIN_DIR = ../../libexec + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c + + all: $(PROG) $(LIB) + +@@ -39,12 +39,10 @@ tests: + root_tests: + + $(LIB): $(LIB_OBJ) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR)/$(LIB) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + $(BIN_DIR)/$(PROG): $(PROG) + cp $(PROG) $(BIN_DIR) +diff --git a/src/milter/Makefile.in b/src/milter/Makefile.in +index c28263a..549b868 100644 +--- a/src/milter/Makefile.in ++++ b/src/milter/Makefile.in +@@ -14,7 +14,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -30,12 +30,10 @@ tests: + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/postconf/postconf.c b/src/postconf/postconf.c +index d1ae434..dd604bb 100644 +--- a/src/postconf/postconf.c ++++ b/src/postconf/postconf.c +@@ -965,6 +965,16 @@ static void show_maps(void) + { + ARGV *maps_argv; + int i; ++#ifndef NO_DYNAMIC_MAPS ++ char *path; ++ char *config_dir; ++ ++ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? ++ config_dir : DEF_CONFIG_DIR); /* XXX */ ++ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); ++ dict_open_dlinfo(path); ++ myfree(path); ++#endif + + maps_argv = dict_mapnames(); + for (i = 0; i < maps_argv->argc; i++) +diff --git a/src/postmap/postmap.c b/src/postmap/postmap.c +index e956aed..712d041 100644 +--- a/src/postmap/postmap.c ++++ b/src/postmap/postmap.c +@@ -5,7 +5,7 @@ + /* Postfix lookup table management + /* SYNOPSIS + /* .fi +-/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] ++/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] + /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] + /* [\fIfile_type\fR:]\fIfile_name\fR ... + /* DESCRIPTION +@@ -151,6 +151,8 @@ + /* .sp + /* This feature is available in Postfix version 2.2 and later, + /* and is not available for all database types. ++/* .IP \fB-u\fR ++/* Upgrade the database to the current version. + /* .IP \fB-v\fR + /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR + /* options make the software increasingly verbose. +@@ -723,6 +725,18 @@ static void postmap_seq(const char *map_type, const char *map_name, + dict_close(dict); + } + ++/* postmap_upgrade - upgrade a map */ ++ ++static int postmap_upgrade(const char *map_type, const char *map_name) ++{ ++ DICT *dict; ++ ++ dict = dict_open3(map_type, map_name, O_RDWR, ++ DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); ++ dict_close(dict); ++ return (dict != 0); ++} ++ + /* usage - explain */ + + static NORETURN usage(char *myname) +@@ -743,6 +757,7 @@ int main(int argc, char **argv) + int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; + int open_flags = O_RDWR | O_CREAT | O_TRUNC; + int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; ++ int upgrade = 0; + char *query = 0; + char *delkey = 0; + int sequence = 0; +@@ -787,7 +802,7 @@ int main(int argc, char **argv) + /* + * Parse JCL. + */ +- while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { ++ while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { + switch (ch) { + default: + usage(argv[0]); +@@ -804,8 +819,8 @@ int main(int argc, char **argv) + msg_fatal("out of memory"); + break; + case 'd': +- if (sequence || query || delkey) +- msg_fatal("specify only one of -s -q or -d"); ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); + delkey = optarg; + break; + case 'f': +@@ -831,8 +846,8 @@ int main(int argc, char **argv) + postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; + break; + case 'q': +- if (sequence || query || delkey) +- msg_fatal("specify only one of -s -q or -d"); ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); + query = optarg; + break; + case 'r': +@@ -840,10 +855,15 @@ int main(int argc, char **argv) + dict_flags |= DICT_FLAG_DUP_REPLACE; + break; + case 's': +- if (query || delkey) +- msg_fatal("specify only one of -s or -q or -d"); ++ if (query || delkey || upgrade) ++ msg_fatal("specify only one of -s or -q or -u or -d"); + sequence = 1; + break; ++ case 'u': ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); ++ upgrade=1; ++ break; + case 'v': + msg_verbose++; + break; +@@ -914,6 +934,21 @@ int main(int argc, char **argv) + exit(0); + } + exit(1); ++ } else if (upgrade) { /* Upgrade the map(s) */ ++ int success = 1; ++ if (optind + 1 > argc) ++ usage(argv[0]); ++ while (optind < argc) { ++ if ((path_name = split_at(argv[optind], ':')) != 0) { ++ success &= postmap_upgrade(argv[optind], path_name); ++ } else { ++ success &= postmap_upgrade(var_db_type, path_name); ++ } ++ if (!success) ++ exit(1); ++ optind++; ++ } ++ exit(0); + } else { /* create/update map(s) */ + if (optind + 1 > argc) + usage(argv[0]); +diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in +index 1a8e26d..1f26fd8 100644 +--- a/src/tls/Makefile.in ++++ b/src/tls/Makefile.in +@@ -22,7 +22,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -38,12 +38,10 @@ tests: + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/util/Makefile.in b/src/util/Makefile.in +index 653919c..21e918a 100644 +--- a/src/util/Makefile.in ++++ b/src/util/Makefile.in +@@ -32,21 +32,22 @@ SRCS = alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ + write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ + allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ + upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ +- unix_pass_fd_fix.c dict_cache.c ++ unix_pass_fd_fix.c dict_cache.c load_lib.c + OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ + attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ + attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ + chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ + ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ + dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ +- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ +- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ ++ dict_nisplus.o dict_open.o dict_regexp.o \ ++ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ + dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ + fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ + fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ + host_port.o htable.o inet_addr_host.o inet_addr_list.o \ + inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ + inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ ++ load_lib.o \ + mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ + msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ + mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ +@@ -80,7 +81,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \ + msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ + mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ + open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ +- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ ++ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ + sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ + sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ + stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ +@@ -93,6 +94,7 @@ DEFS = -I. -D$(SYSTYPE) + CFLAGS = $(DEBUG) $(OPT) $(DEFS) + FILES = Makefile $(SRCS) $(HDRS) + INCL = ++PCRESO = dict_pcre.so + LIB = libutil.a + TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ + fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ +@@ -108,10 +110,11 @@ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ + + LIB_DIR = ../../lib + INC_DIR = ../../include ++LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + +-all: $(LIB) ++all: $(LIB) $(PCRESO) + + $(OBJS): ../../conf/makedefs.out + +@@ -120,15 +123,19 @@ Makefile: Makefile.in + + test: $(TESTPROG) + ++$(PCRESO): dict_pcre.o libutil.a ++ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil ++ + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + +-update: $(LIB_DIR)/$(LIB) $(HDRS) ++../../libexec/$(PCRESO): $(PCRESO) ++ cp $(PCRESO) ../../libexec ++ ++update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) + -for i in $(HDRS); \ + do \ + cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ +@@ -150,7 +157,8 @@ lint: + lint $(SRCS) + + clean: +- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp ++ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ ++ junk $(MAKES) *.tmp + rm -rf printfck + + tidy: clean +diff --git a/src/util/dict.h b/src/util/dict.h +index 9829d28..d7dc53c 100644 +--- a/src/util/dict.h ++++ b/src/util/dict.h +@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *); + #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ + #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ + #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ ++#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ + #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) + + /* IMPORTANT: Update the dict_mask[] table when the above changes */ +@@ -138,6 +139,11 @@ extern const char *dict_eval(const char *, const char *, int); + extern DICT *dict_open(const char *, int, int); + extern DICT *dict_open3(const char *, const char *, int, int); + extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); ++#ifndef NO_DYNAMIC_MAPS ++extern void dict_open_dlinfo(const char *path); ++typedef void* (*dict_mkmap_func_t)(const char *); ++dict_mkmap_func_t dict_mkmap_func(const char *dict_type); ++#endif + + #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) + #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) +diff --git a/src/util/dict_db.c b/src/util/dict_db.c +index e4b301d..8dc9c9d 100644 +--- a/src/util/dict_db.c ++++ b/src/util/dict_db.c +@@ -675,6 +675,12 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags, + msg_fatal("set DB cache size %d: %m", dict_db_cache_size); + if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) + msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); ++ if (dict_flags & DICT_FLAG_UPGRADE) { ++ if (msg_verbose) ++ msg_info("upgrading database %s",db_path); ++ if ((errno = db->upgrade(db,db_path,0)) != 0) ++ msg_fatal("upgrade of database %s: %m",db_path); ++ } + #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) + if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) + msg_fatal("open database %s: %m", db_path); +diff --git a/src/util/dict_dbm.c b/src/util/dict_dbm.c +index 3603e44..adc5258 100644 +--- a/src/util/dict_dbm.c ++++ b/src/util/dict_dbm.c +@@ -409,6 +409,10 @@ DICT *dict_dbm_open(const char *path, int open_flags, int dict_flags) + char *dbm_path; + int lock_fd; + ++#ifdef HAVE_GDBM ++ msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", ++ path); ++#endif + /* + * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in + * the time domain) locking while accessing individual database records. +diff --git a/src/util/dict_open.c b/src/util/dict_open.c +index b807bc2..0f4e382 100644 +--- a/src/util/dict_open.c ++++ b/src/util/dict_open.c +@@ -44,6 +44,8 @@ + /* DICT *(*open) (const char *, int, int); + /* + /* ARGV *dict_mapnames() ++/* ++/* void (*)() dict_mkmap_func(const char *dict_type) + /* DESCRIPTION + /* This module implements a low-level interface to multiple + /* physical dictionary types. +@@ -159,6 +161,9 @@ + /* + /* dict_mapnames() returns a sorted list with the names of all available + /* dictionary types. ++/* ++/* dict_mkmap_func() returns a pointer to the mkmap setup function ++/* for the given map type, as given in /etc/dynamicmaps.cf + /* DIAGNOSTICS + /* Fatal error: open error, unsupported dictionary type, attempt to + /* update non-writable dictionary. +@@ -183,6 +188,9 @@ + #include <strings.h> + #endif + ++#include <sys/stat.h> ++#include <unistd.h> ++ + /* Utility library. */ + + #include <argv.h> +@@ -208,6 +216,27 @@ + #include <split_at.h> + #include <htable.h> + ++#ifndef NO_DYNAMIC_MAPS ++#include <load_lib.h> ++#include <vstring.h> ++#include <vstream.h> ++#include <vstring_vstream.h> ++#include <mvect.h> ++ ++ /* ++ * Interface for dynamic map loading. ++ */ ++typedef struct { ++ const char *pattern; ++ const char *soname; ++ const char *openfunc; ++ const char *mkmapfunc; ++} DLINFO; ++ ++static DLINFO *dict_dlinfo; ++static DLINFO *dict_open_dlfind(const char *type); ++#endif ++ + /* + * lookup table for available map types. + */ +@@ -223,7 +252,9 @@ static const DICT_OPEN_INFO dict_open_info[] = { + DICT_TYPE_ENVIRON, dict_env_open, + DICT_TYPE_HT, dict_ht_open, + DICT_TYPE_UNIX, dict_unix_open, ++#ifdef NO_DYNAMIC_MAPS + DICT_TYPE_TCP, dict_tcp_open, ++#endif + #ifdef HAS_SDBM + DICT_TYPE_SDBM, dict_sdbm_open, + #endif +@@ -243,9 +274,11 @@ static const DICT_OPEN_INFO dict_open_info[] = { + #ifdef HAS_NETINFO + DICT_TYPE_NETINFO, dict_ni_open, + #endif ++#ifdef NO_DYNAMIC_MAPS + #ifdef HAS_PCRE + DICT_TYPE_PCRE, dict_pcre_open, + #endif ++#endif /* NO_DYNAMIC_MAPS */ + #ifdef HAS_POSIX_REGEXP + DICT_TYPE_REGEXP, dict_regexp_open, + #endif +@@ -303,8 +336,31 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, + dict_type, dict_name); + if (dict_open_hash == 0) + dict_open_init(); +- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) +- msg_fatal("unsupported dictionary type: %s", dict_type); ++ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { ++#ifdef NO_DYNAMIC_MAPS ++ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); ++#else ++ struct stat st; ++ LIB_FN fn[2]; ++ DICT *(*open) (const char *, int, int); ++ DLINFO *dl=dict_open_dlfind(dict_type); ++ if (!dl) ++ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); ++ if (stat(dl->soname,&st) < 0) { ++ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", ++ myname, dict_type, dl->soname, dict_type); ++ } ++ fn[0].name = dl->openfunc; ++ fn[0].ptr = (void**)&open; ++ fn[1].name = NULL; ++ load_library_symbols(dl->soname, fn, NULL); ++ dict_open_register(dict_type, open); ++ dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); ++#endif ++ } ++ if (msg_verbose>1) { ++ msg_info("%s: calling %s open routine",myname,dict_type); ++ } + if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) + msg_fatal("opening %s:%s %m", dict_type, dict_name); + if (msg_verbose) +@@ -312,6 +368,36 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, + return (dict); + } + ++dict_mkmap_func_t dict_mkmap_func(const char *dict_type) ++{ ++ char *myname="dict_mkmap_func"; ++ struct stat st; ++ LIB_FN fn[2]; ++ dict_mkmap_func_t mkmap; ++ DLINFO *dl; ++#ifndef NO_DYNAMIC_MAPS ++ if (!dict_dlinfo) ++ msg_fatal("dlinfo==NULL"); ++ dl=dict_open_dlfind(dict_type); ++ if (!dl) ++ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); ++ if (stat(dl->soname,&st) < 0) { ++ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", ++ myname, dict_type, dl->soname, dict_type); ++ } ++ if (!dl->mkmapfunc) ++ msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); ++ ++ fn[0].name = dl->mkmapfunc; ++ fn[0].ptr = (void**)&mkmap; ++ fn[1].name = NULL; ++ load_library_symbols(dl->soname, fn, NULL); ++ return mkmap; ++#else ++ return (void(*)())NULL; ++#endif ++} ++ + /* dict_open_register - register dictionary type */ + + void dict_open_register(const char *type, +@@ -345,6 +431,9 @@ ARGV *dict_mapnames() + HTABLE_INFO **ht; + DICT_OPEN_INFO *dp; + ARGV *mapnames; ++#ifndef NO_DYNAMIC_MAPS ++ DLINFO *dlp; ++#endif + + if (dict_open_hash == 0) + dict_open_init(); +@@ -353,6 +442,13 @@ ARGV *dict_mapnames() + dp = (DICT_OPEN_INFO *) ht[0]->value; + argv_add(mapnames, dp->type, ARGV_END); + } ++#ifndef NO_DYNAMIC_MAPS ++ if (!dict_dlinfo) ++ msg_fatal("dlinfo==NULL"); ++ for (dlp=dict_dlinfo; dlp->pattern; dlp++) { ++ argv_add(mapnames, dlp->pattern, ARGV_END); ++ } ++#endif + qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), + dict_sort_alpha_cpp); + myfree((char *) ht_info); +@@ -360,6 +456,87 @@ ARGV *dict_mapnames() + return mapnames; + } + ++#ifndef NO_DYNAMIC_MAPS ++#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) ++ ++void dict_open_dlinfo(const char *path) ++{ ++ char *myname="dict_open_dlinfo"; ++ VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); ++ VSTRING *buf = vstring_alloc(100); ++ char *cp; ++ ARGV *argv; ++ MVECT vector; ++ int nelm=0; ++ int linenum=0; ++ ++ dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); ++ ++ if (!conf_fp) { ++ msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", ++ myname, path); ++ } else { ++ while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { ++ cp = vstring_str(buf); ++ linenum++; ++ if (*cp == '#' || *cp == '\0') ++ continue; ++ argv = argv_split(cp, " \t"); ++ if (argv->argc != 3 && argv->argc != 4) { ++ msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", ++ myname, linenum); ++ } ++ if (STREQ(argv->argv[0],"*")) { ++ msg_warn("%s: wildcard dynamic map entry no longer supported.", ++ myname); ++ continue; ++ } ++ if (argv->argv[1][0] != '/') { ++ msg_fatal("%s: .so name must begin with a \"/\" at line %d", ++ myname, linenum); ++ } ++ if (nelm >= vector.nelm) { ++ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); ++ } ++ dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); ++ dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); ++ dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); ++ if (argv->argc==4) ++ dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); ++ else ++ dict_dlinfo[nelm].mkmapfunc = NULL; ++ nelm++; ++ argv_free(argv); ++ } ++ } ++ if (nelm >= vector.nelm) { ++ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); ++ } ++ dict_dlinfo[nelm].pattern = NULL; ++ dict_dlinfo[nelm].soname = NULL; ++ dict_dlinfo[nelm].openfunc = NULL; ++ dict_dlinfo[nelm].mkmapfunc = NULL; ++ if (conf_fp) ++ vstream_fclose(conf_fp); ++ vstring_free(buf); ++} ++ ++static DLINFO *dict_open_dlfind(const char *type) ++{ ++ DLINFO *dp; ++ ++ if (!dict_dlinfo) ++ return NULL; ++ ++ for (dp=dict_dlinfo; dp->pattern; dp++) { ++ if (STREQ(dp->pattern,type)) ++ return dp; ++ } ++ return NULL; ++} ++ ++#endif /* !NO_DYNAMIC_MAPS */ ++ + #ifdef TEST + + /* +diff --git a/src/util/load_lib.c b/src/util/load_lib.c +new file mode 100644 +index 0000000..b6526ef +--- /dev/null ++++ b/src/util/load_lib.c +@@ -0,0 +1,135 @@ ++/*++ ++/* NAME ++/* load_lib 3 ++/* SUMMARY ++/* library loading wrappers ++/* SYNOPSIS ++/* #include <load_lib.h> ++/* ++/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); ++/* const char *libname; ++/* LIB_FN *libfuncs; ++/* LIB_FN *libdata; ++/* ++/* DESCRIPTION ++/* This module loads functions from libraries, returnine pointers ++/* to the named functions. ++/* ++/* load_library_symbols() loads all of the desired functions, and ++/* returns zero for success, or exits via msg_fatal(). ++/* ++/* SEE ALSO ++/* msg(3) diagnostics interface ++/* DIAGNOSTICS ++/* Problems are reported via the msg(3) diagnostics routines: ++/* library not found, symbols not found, other fatal errors. ++/* LICENSE ++/* .ad ++/* .fi ++/* The Secure Mailer license must be distributed with this software. ++/* AUTHOR(S) ++/* LaMont Jones ++/* Hewlett-Packard Company ++/* 3404 Harmony Road ++/* Fort Collins, CO 80528, USA ++/* ++/* Wietse Venema ++/* IBM T.J. Watson Research ++/* P.O. Box 704 ++/* Yorktown Heights, NY 10598, USA ++/*--*/ ++ ++/* System libraries. */ ++ ++#include "sys_defs.h" ++#include <stdlib.h> ++#include <stddef.h> ++#include <string.h> ++#if defined(HAS_DLOPEN) ++#include <dlfcn.h> ++#elif defined(HAS_SHL_LOAD) ++#include <dl.h> ++#endif ++ ++/* Application-specific. */ ++ ++#include "msg.h" ++#include "load_lib.h" ++ ++extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) ++{ ++ char *myname = "load_library_symbols"; ++ LIB_FN *fn; ++ ++#if defined(HAS_DLOPEN) ++ void *handle; ++ char *emsg; ++ ++ handle=dlopen(libname,RTLD_NOW); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); ++ } ++ ++ if (libfuncs) { ++ for (fn=libfuncs; fn->name; fn++) { ++ *(fn->ptr) = dlsym(handle,fn->name); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, ++ fn->name, libname, emsg); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++ if (libdata) { ++ for (fn=libdata; fn->name; fn++) { ++ *(fn->ptr) = dlsym(handle,fn->name); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, ++ fn->name, libname, emsg); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++#elif defined(HAS_SHL_LOAD) ++ shl_t handle; ++ ++ handle = shl_load(libname,BIND_IMMEDIATE,0); ++ ++ if (libfuncs) { ++ for (fn=libfuncs; fn->name; fn++) { ++ if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { ++ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", ++ myname, fn->name, libname); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++ if (libdata) { ++ for (fn=libdata; fn->name; fn++) { ++ if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { ++ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", ++ myname, fn->name, libname); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++#else ++ msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", ++ myname); ++#endif ++ return 0; ++} +diff --git a/src/util/load_lib.h b/src/util/load_lib.h +new file mode 100644 +index 0000000..adebd25 +--- /dev/null ++++ b/src/util/load_lib.h +@@ -0,0 +1,41 @@ ++#ifndef _LOAD_LIB_H_INCLUDED_ ++#define _LOAD_LIB_H_INCLUDED_ ++ ++/*++ ++/* NAME ++/* load_lib 3h ++/* SUMMARY ++/* library loading wrappers ++/* SYNOPSIS ++/* #include "load_lib.h" ++/* DESCRIPTION ++/* .nf ++ ++ /* ++ * External interface. ++ */ ++/* NULL name terminates list */ ++typedef struct LIB_FN { ++ const char *name; ++ void **ptr; ++} LIB_FN; ++ ++extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); ++ ++/* LICENSE ++/* .ad ++/* .fi ++/* The Secure Mailer license must be distributed with this software. ++/* AUTHOR(S) ++/* LaMont Jones ++/* Hewlett-Packard Company ++/* 3404 Harmony Road ++/* Fort Collins, CO 80528, USA ++/* ++/* Wietse Venema ++/* IBM T.J. Watson Research ++/* P.O. Box 704 ++/* Yorktown Heights, NY 10598, USA ++/*--*/ ++ ++#endif diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index ca034faed..69592378b 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql -pkgver=8.4.3 -pkgrel=3 +pkgver=8.4.4 +pkgrel=0 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" license="BSD" @@ -56,7 +56,7 @@ client() { } -md5sums="7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2 +md5sums="4bf2448ad965bca3940df648c02194df postgresql-8.4.4.tar.bz2 66c197b8186a6df0752fe2aed40c90c4 postgresql.initd 12199d445bfa42aafc2a958012737107 postgresql.confd 7f8de63848c51c8a30c39bec6b1b1606 pg-restore.initd diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD new file mode 100644 index 000000000..d7417ec02 --- /dev/null +++ b/main/privoxy/APKBUILD @@ -0,0 +1,56 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=privoxy +pkgver=3.0.16 +pkgrel=1 +pkgdesc="A web proxy with advanced filtering capabilities" +url="http://www.privoxy.org" +license="GPL" +pkgusers="privoxy" +pkggroups="privoxy" +depends= +makedepends="autoconf automake pcre-dev zlib-dev coreutils" +install="privoxy.pre-install" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz + $pkgname.initd + $pkgname.logrotate + privoxy-3.0.16-gentoo.patch + " + +_builddir="$srcdir"/$pkgname-$pkgver-stable +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/privoxy-3.0.16-gentoo.patch || return 1 + aclocal && autoheader && autoconf +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --localstatedir=/var/ \ + --enable-zlib \ + --enable-dynamic-pcre \ + --with-user=privoxy \ + --with-group=privoxy \ + --sysconfdir=/etc/privoxy \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + rm $pkgdir/var/log/privoxy/* + install -D -m755 "$srcdir"/privoxy.initd "$pkgdir"/etc/init.d/privoxy + install -D -m644 "$srcdir"/privoxy.logrotate \ + "$pkgdir"/etc/logrotate.d/privoxy + find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 + find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 + chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \ + "$pkgdir"/etc/privoxy +} + +md5sums="64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz +170d5679e4c3504f07ef1a4c9859e9b8 privoxy.initd +f2b6a652dbfbc65e5b89024a8ea3da7e privoxy.logrotate +48cce19ecdcf8f17a021ac3aa8f837bc privoxy-3.0.16-gentoo.patch" diff --git a/main/privoxy/privoxy-3.0.16-gentoo.patch b/main/privoxy/privoxy-3.0.16-gentoo.patch new file mode 100644 index 000000000..d445ec1b0 --- /dev/null +++ b/main/privoxy/privoxy-3.0.16-gentoo.patch @@ -0,0 +1,108 @@ +--- privoxy/GNUmakefile.in ++++ privoxy/GNUmakefile.in +@@ -61,10 +61,10 @@ + MAN_DIR = @mandir@ + MAN_DEST = $(MAN_DIR)/man1 + SHARE_DEST = @datadir@ +-DOC_DEST = $(SHARE_DEST)/doc/privoxy ++DOC_DEST = @docdir@ +-VAR_DEST = @localstatedir@ ++VAR_DEST = /var + LOGS_DEST = $(VAR_DEST)/log/privoxy + PIDS_DEST = $(VAR_DEST)/run + + # if $prefix = /usr/local then the default CONFDEST change from + # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy +@@ -901,34 +901,8 @@ + fi ;\ + $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ + for i in $(CONFIGS); do \ +- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ +- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ +- $(ECHO) Installing fresh $$i;\ + $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- elif [ -s "$(CONF_DEST)/$$i" ]; then \ +- $(ECHO) Installing $$i as $$i.new ;\ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ +- NEW=1;\ +- else \ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- fi ;\ + done ;\ +- if [ -n "$$NEW" ]; then \ +- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ +- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ +- fi ;\ +- [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ +- $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ +- $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ +- if [ x$$USER != x ]; then \ +- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \ +- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ +- fi ;\ +- if [ x$$GROUP_T != x ]; then \ +- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \ +- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ +- fi ;\ +- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ + if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ + if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ + $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ +--- privoxy/config ++++ privoxy/config +@@ -267,7 +267,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/privoxy + # + # + # 2.2. templdir +@@ -324,7 +324,7 @@ + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/privoxy + # + # + # 2.4. actionsfile +@@ -464,7 +464,7 @@ + # Any log files must be writable by whatever user Privoxy is + # being run as (on Unix, default user id is "privoxy"). + # +-logfile logfile ++logfile privoxy.log + # + # + # 2.7. trustfile +--- privoxy/default.action.master ++++ privoxy/default.action.master +@@ -564,7 +564,7 @@ + { \ + +change-x-forwarded-for{block} \ + +hide-from-header{block} \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Cautious + +@@ -584,7 +584,7 @@ + +hide-from-header{block} \ + +hide-referrer{conditional-block} \ + +session-cookies-only \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Medium + +@@ -623,7 +623,7 @@ + +hide-referrer{conditional-block} \ + +limit-connect{,} \ + +overwrite-last-modified{randomize} \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Advanced + diff --git a/main/privoxy/privoxy.initd b/main/privoxy/privoxy.initd new file mode 100644 index 000000000..ef984ea3d --- /dev/null +++ b/main/privoxy/privoxy.initd @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy.initd,v 1.2 2007/11/14 05:14:56 mrness Exp $ + +CONFFILE=/etc/${SVCNAME}/config +PIDFILE=/var/run/${SVCNAME}.pid + +depend() { + need net +} + +start() { + if [ ! -f "${CONFFILE}" ]; then + eerror "Configuration file ${CONFFILE} not found!" + return 1 + fi + + ebegin "Starting privoxy" + start-stop-daemon --start --quiet --exec /usr/sbin/privoxy \ + --pidfile "${PIDFILE}" \ + -- \ + --pidfile "${PIDFILE}" \ + --user privoxy.privoxy "${CONFFILE}" + eend $? +} + +stop() { + ebegin "Stopping privoxy" + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" + eend $? +} diff --git a/main/privoxy/privoxy.logrotate b/main/privoxy/privoxy.logrotate new file mode 100644 index 000000000..aa7463bd5 --- /dev/null +++ b/main/privoxy/privoxy.logrotate @@ -0,0 +1,9 @@ +/var/log/privoxy/privoxy.log /var/log/privoxy/jarfile { + missingok + notifempty + create 0640 privoxy privoxy + sharedscripts + postrotate + killall -HUP privoxy 2>/dev/null || true + endscript +} diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install new file mode 100644 index 000000000..38db00288 --- /dev/null +++ b/main/privoxy/privoxy.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup privoxy 2>/dev/null +adduser -S -G privoxy -h /var/log/privoxy -s /bin/false -D privoxy 2>/dev/null +exit 0 + diff --git a/main/py-genshi/APKBUILD b/main/py-genshi/APKBUILD new file mode 100644 index 000000000..7d7f5c0af --- /dev/null +++ b/main/py-genshi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=py-genshi +_realname=Genshi +pkgver=0.6 +pkgrel=0 +pkgdesc="Python toolkit for stream-based generation of output for the web." +url="http://genshi.edgewall.org/" +license="BSD" +depends="python" +makedepends="py-setuptools python-dev" +install= +source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + return 0 +} + +package() { + cd "$_builddir" + python setup.py install --root="$pkgdir" +} + +md5sums="604e8b23b4697655d36a69c2d8ef7187 Genshi-0.6.tar.gz" diff --git a/main/py-setuptools/APKBUILD b/main/py-setuptools/APKBUILD new file mode 100644 index 000000000..2ccca3b4c --- /dev/null +++ b/main/py-setuptools/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Andrew Manison <amanison@anselsystems.com> +# Maintainer: +pkgname=py-setuptools +_pkgname=${pkgname#py-} +pkgver=0.6c11 +pkgrel=0 +pkgdesc="setuptools is a collection of enhancements to the Python distutils" +url="http://pypi.python.org/pypi/setuptools" +license="PSF" +depends="python" +makedepends="python-dev" +install= +subpackages="" +source="http://pypi.python.org/packages/source/s/$_pkgname/$_pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir"/$_pkgname-$pkgver + mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages + python setup.py install --root="$pkgdir" + echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth + + # we don't provide a non-suffixed easy_install + echo "Removing non-suffixed easy_install ( $pkgdir/usr/bin/easy_install)" + rm "$pkgdir"/usr/bin/easy_install +} + +md5sums="7df2a529a074f613b509fb44feefe74e setuptools-0.6c11.tar.gz" diff --git a/main/py-sqlite/APKBUILD b/main/py-sqlite/APKBUILD new file mode 100644 index 000000000..a0ae27156 --- /dev/null +++ b/main/py-sqlite/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Mika Havela <mika.havela@gmail.com> +# Maintainer: Mika Havela <mika.havela@gmail.com> +pkgname=py-sqlite +_realname=pysqlite +pkgver=2.6.0 +pkgrel=0 +pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" +url="http://code.google.com/p/pysqlite/" +license="MIT" +depends="python sqlite" +makedepends="sqlite-dev python-dev" +install= +source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + return 0 +} + +package() { + cd "$_builddir" + python setup.py install --root="$pkgdir" +} + +md5sums="fc92618b3b39d02e6ff10dc467c36640 pysqlite-2.6.0.tar.gz" diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 864ed9bed..580fd5410 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=3.5.2 +pkgver=3.5.3 pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" @@ -117,7 +117,7 @@ tdb() { usr/bin/tdb* } -md5sums="6f8cf649207ccd8c2c17e28c335f4e9d samba-3.5.2.tar.gz +md5sums="7c8d2a34b649380d5df838c3e030dbec samba-3.5.3.tar.gz c8a7f6ac5df2f73dbf023e25ea39927b samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate diff --git a/main/startup-notification/APKBUILD b/main/startup-notification/APKBUILD index 94bc8f002..c9414d4ec 100644 --- a/main/startup-notification/APKBUILD +++ b/main/startup-notification/APKBUILD @@ -1,23 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=startup-notification pkgver=0.10 -pkgrel=1 +pkgrel=2 pkgdesc="Monitor and display application startup" url="http://www.freedesktop.org" license="LGPL" subpackages="$pkgname-dev" -depends="libx11 libsm xcb-util" +depends= makedepends="libx11-dev libsm-dev xcb-util-dev" source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz" -build () -{ +depends_dev="libsm-dev xcb-util-dev" +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } md5sums="bca0ed1c74bc4e483ea2ed12a5717354 startup-notification-0.10.tar.gz" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index b5d54fd03..1beaa580e 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.7.2_p6 +pkgver=1.7.2_p7 _realver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="http://www.sudo.ws/sudo/" license='custom ISC' @@ -27,4 +27,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="c4f1a43e8ba94f6bf06d2211442148c4 sudo-1.7.2p6.tar.gz" +md5sums="3ac78668427a53e12d7639fdfab2f1af sudo-1.7.2p7.tar.gz" diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index 681ac7d89..3e0fecdab 100644 --- a/main/sysklogd/APKBUILD +++ b/main/sysklogd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysklogd pkgver=1.5 -pkgrel=5 +pkgrel=6 pkgdesc="System and kernel log daemons" url="http://www.infodrom.org/projects/sysklogd/" license="GPL BSD" @@ -48,7 +48,7 @@ build () } md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz 6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate -c9274a06835b95feb8aab31523418847 sysklogd.daily +5ba669cf356796bdef20962a143eca72 sysklogd.daily e4c9a51499f1eb8d45dfdfe0d52737a5 sysklogd.initd e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd 3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily index 79e85fb46..ccd63d61e 100755 --- a/main/sysklogd/sysklogd.daily +++ b/main/sysklogd/sysklogd.daily @@ -17,13 +17,14 @@ syslogd_listfiles() { # the sed (in order)- # strips comments; # collapses spaces/tabs to 1 space; - # deletes the "-" in front of the filename; + # deletes the "-" in front of the filename; + # deletes whitespace before ';' # deletes lines that have the "skip" facility # deletes the facility (leaving just the filename) # deletes lines that are not filenames with leading "/" while read a ; do echo "$a"; done < $CONF |\ - sed -n "/^ *#/D; /^[ ]*$/D; s/[ ]\+/ /g; \ - s+ -/+ /+g; /^.*\($skip\)[^ ]* /D; \ + sed -n "/^[ \t]*#/D; /^[ \t]*$/D; s/[ \t]\+/ /g; \ + s+ -/+ /+g; s/ *; */;/; /^.*\($skip\)[^ ]* /D; \ s/^[^ ]* //; /^[^\\/]/D; P" |\ sort | uniq } diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 739e99558..d4d8ca000 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -7,7 +7,7 @@ url="http://syslinux.org" license="GPL" makedepends="nasm perl" depends="mtools" -source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.bz2 +source="http://www.kernel.org/pub/linux/utils/boot/syslinux/3.xx/$pkgname-$pkgver.tar.bz2 $pkgname-3.86-nopie.patch " subpackages="$pkgname-doc" diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD index 2f159f081..620d3535d 100644 --- a/main/terminal/APKBUILD +++ b/main/terminal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=terminal -pkgver=0.4.4 -pkgrel=1 +pkgver=0.4.5 +pkgrel=0 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" url="http://www.xfce.org/projects/terminal/" license="GPL-2" @@ -28,4 +28,4 @@ package() { cd "$srcdir"/Terminal-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="eba7da9acca699d168f4cc11ee9ed7a9 Terminal-0.4.4.tar.bz2" +md5sums="3c707628e2e97c6d9566cd74d400036a Terminal-0.4.5.tar.bz2" diff --git a/main/thunar-media-tags-plugin/APKBUILD b/main/thunar-media-tags-plugin/APKBUILD new file mode 100644 index 000000000..cbcb46ac3 --- /dev/null +++ b/main/thunar-media-tags-plugin/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=thunar-media-tags-plugin +pkgver=0.1.2 +pkgrel=0 +pkgdesc="Media tags plugin for Thunar file manager" +url="http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin" +license="GPL" +depends= +makedepends="thunar-dev taglib-dev" +install= +subpackages= +source="http://mocha.xfce.org/archive/src/thunar-plugins/thunar-media-tags-plugin/${pkgver%.*}/thunar-media-tags-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/lib/*/*.la +} + +md5sums="8a95f0ea4df6f757c1c94eb5442d2ff5 thunar-media-tags-plugin-0.1.2.tar.bz2" diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD index 0c2db0a10..7dcc1b296 100644 --- a/main/thunar/APKBUILD +++ b/main/thunar/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=thunar -pkgver=1.0.1 -pkgrel=7 +pkgver=1.0.2 +pkgrel=1 pkgdesc="File manager for Xfce" url="http://thunar.xfce.org" license="GPL2 LGPL2" @@ -11,15 +11,13 @@ makedepends="pkgconfig libexif-dev xfce4-panel-dev exo-dev pcre-dev intltool gettext-dev libiconv-dev expat-dev startup-notification-dev libsm-dev e2fsprogs-dev gamin-dev libexif-dev jpeg-dev" install= -source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2 - libpng-1.4.patch" +source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2" -depends_dev="exo-dev glib-dev gamin-dev jpeg-dev" +depends_dev="exo-dev glib-dev gamin-dev jpeg-dev startup-notification-dev" _builddir="$srcdir"/Thunar-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/libpng-1.4.patch } build() { @@ -41,5 +39,4 @@ package() { sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop } -md5sums="218373aa45d74b6ba8c69c4d5af3bb19 Thunar-1.0.1.tar.bz2 -ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch" +md5sums="c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2" diff --git a/main/thunar/libpng-1.4.patch b/main/thunar/libpng-1.4.patch deleted file mode 100644 index 7f38165f7..000000000 --- a/main/thunar/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c ---- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:31:35.000000000 -0500 -+++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:34:51.000000000 -0500 -@@ -1169,7 +1169,7 @@ - goto done0; - - /* verify the png signature */ -- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature)))) -+ if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)))) - rewind (fp); - else - goto done0; diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index c13e26a46..e2fff0cf0 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Michael Mason <ms13sp@gmail.com> +# Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tiff pkgver=3.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="Provides support for the Tag Image File Format or TIFF" url="http://www.libtiff.org/" license="GPL" @@ -16,6 +16,7 @@ source="ftp://ftp.remotesensing.org/pub/lib$pkgname/$pkgname-$pkgver.tar.gz tiff2pdf-compression.patch tiff2pdf-octal-printf.patch tiffsplit-fname-overflow.patch + tiff-jpegfix.patch " build() { @@ -28,6 +29,7 @@ build() { patch -p1 < ../tiff-3.8.2-CVE-2008-2327.patch || return 1 patch -p1 < ../libtiff-CVE-2009-2285.patch || return 1 patch -p1 < ../tiff-3.8.2-CVE-2009-2347.patch || return 1 + patch -p1 < ../tiff-jpegfix.patch || return 1 ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -46,4 +48,5 @@ c2c2e22557d9c63011df5777dda6a86b tiff-3.8.2-CVE-2008-2327.patch d3b02693cca83e63005b162edd43016b tiff-3.8.2-CVE-2009-2347.patch b443ffca9d498bb3a88c17da0200025b tiff2pdf-compression.patch d54368687d2645ffbbe6c2df384b11bf tiff2pdf-octal-printf.patch -323352fd60a7bd3ffac8724c3c031669 tiffsplit-fname-overflow.patch" +323352fd60a7bd3ffac8724c3c031669 tiffsplit-fname-overflow.patch +3353687eba89179f55f027bd571a63f5 tiff-jpegfix.patch" diff --git a/main/tiff/tiff-jpegfix.patch b/main/tiff/tiff-jpegfix.patch new file mode 100644 index 000000000..ca57191df --- /dev/null +++ b/main/tiff/tiff-jpegfix.patch @@ -0,0 +1,31 @@ +diff -Nru tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c +--- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-12-22 12:45:49.969811264 -0800 ++++ tiff-3.9.2/libtiff/tif_jpeg.c 2009-12-22 12:47:04.433491064 -0800 +@@ -2014,7 +2014,14 @@ + if( tif->tif_diroff == 0 ) + { + #define SIZE_OF_JPEGTABLES 2000 ++/* ++The following line assumes incorrectly that all JPEG-in-TIFF files will have ++a JPEGTABLES tag generated and causes null-filled JPEGTABLES tags to be written ++when the JPEG data is placed with TIFFWriteRawStrip. The field bit should be ++set, anyway, later when actual JPEGTABLES header is generated, so removing it ++here hopefully is harmless. + TIFFSetFieldBit(tif, FIELD_JPEGTABLES); ++*/ + sp->jpegtables_length = SIZE_OF_JPEGTABLES; + sp->jpegtables = (void *) _TIFFmalloc(sp->jpegtables_length); + _TIFFmemset(sp->jpegtables, 0, SIZE_OF_JPEGTABLES); +diff -Nru tiff-3.9.2.orig/tools/tiff2pdf.c tiff-3.9.2/tools/tiff2pdf.c +--- tiff-3.9.2.orig/tools/tiff2pdf.c 2009-12-22 12:45:49.873825856 -0800 ++++ tiff-3.9.2/tools/tiff2pdf.c 2009-12-22 12:48:16.558526392 -0800 +@@ -3320,6 +3320,9 @@ + while(i<(*striplength)){ + switch( strip[i] ){ + case 0xd8: ++ /* SOI - start of image */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); ++ *bufferoffset+=2; + i+=2; + break; + case 0xc0: diff --git a/main/trac/APKBUILD b/main/trac/APKBUILD new file mode 100644 index 000000000..d4e09e554 --- /dev/null +++ b/main/trac/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=trac +_realname=Trac +pkgver=0.11.7 +pkgrel=1 +pkgusers="tracd" +pkggroups="tracd" +pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." +url="http://trac.edgewall.com/" +license="GPL" +depends="python py-setuptools py-genshi py-sqlite" +makedepends="python-dev" +install="$pkgname.pre-install" +source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz + tracd.confd + tracd.initd" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" +} + +package() { + cd "$_builddir" + install -d -o tracd -g tracd "$pkgdir"/var/lib/trac + install -m755 -D "$srcdir"/tracd.initd "$pkgdir"/etc/init.d/tracd + install -m644 -D "$srcdir"/tracd.confd "$pkgdir"/etc/conf.d/tracd +} + +md5sums="3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz +95b1311ca65e1ffcd51a191542f45ba4 tracd.confd +e53761b1e84c5d68c8e6c4b837e57008 tracd.initd" diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install new file mode 100644 index 000000000..05c659552 --- /dev/null +++ b/main/trac/trac.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +addgroup tracd 2>/dev/null +adduser -s /bin/false -G tracd -D -H tracd 2>/dev/null +exit 0 diff --git a/main/trac/tracd.confd b/main/trac/tracd.confd new file mode 100644 index 000000000..2cb9d292a --- /dev/null +++ b/main/trac/tracd.confd @@ -0,0 +1,13 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Port for tracd +#TRACD_PORT="8000" + +# Options for tracd +#TRACD_OPTS="--env-parent-dir /var/lib/trac/" + +# User and group as which to run tracd +#TRACD_USER="tracd" +#TRACD_GROUP="tracd" diff --git a/main/trac/tracd.initd b/main/trac/tracd.initd new file mode 100755 index 000000000..83f84052d --- /dev/null +++ b/main/trac/tracd.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.4 2010/05/28 14:43:40 arfrever Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting tracd" + # tracd fails to create pidfile if started as non-root user, thus we are asking + # s-s-d to do that. To have correct pid we avoid -d option of tracd and use + # --background option of s-s-d. + start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ + --pidfile /var/run/tracd.pid --make-pidfile --background \ + --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ + --exec /usr/bin/python -- /usr/bin/tracd \ + -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} + eend $? +} + +stop() { + ebegin "Stopping tracd" + start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid + eend $? +} diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 1e8f07b85..71ced6a53 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,7 +1,7 @@ # Maintainer:Carlo Landmeter pkgname=transmission -pkgver=1.74 -pkgrel=2 +pkgver=1.93 +pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" install="$pkgname.pre-install" @@ -46,6 +46,6 @@ cli() { "$subpkgdir"/usr/bin/ } -md5sums="6b1080800c62308179cfc7a691c82d63 transmission-1.74.tar.bz2 +md5sums="f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2 f65b8ae46f8ac89b35844109b3aa0c18 transmission-daemon.initd 89478a70fcd93463e1dd8d751da994da transmission-daemon.confd" diff --git a/main/ttf-linux-libertine/APKBUILD b/main/ttf-linux-libertine/APKBUILD new file mode 100644 index 000000000..2837358cd --- /dev/null +++ b/main/ttf-linux-libertine/APKBUILD @@ -0,0 +1,35 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=ttf-linux-libertine +pkgver=4.4.1 +pkgrel=0 +pkgdesc="Serif (Libertine) and Sans Serif (Biolinum) OpenType fonts with large Unicode coverage" +url="http://linuxlibertine.sourceforge.net/" +license="GPL custom:OFL" +makedepends= +depends="fontconfig encodings mkfontdir mkfontscale" +install= +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/sourceforge/linuxlibertine/LinLibertineFont-$pkgver.tgz" + +build () { + local f + # strip off the version numbers from the filenames. + cd "$srcdir"/LinLibertineFont + for f in *.ttf; do + mv $f ${f%-[0-9]*}.ttf + done + for f in *.otf; do + mv $f ${f%-[0-9]*}.otf + done +} + +package() { + cd "$srcdir"/LinLibertineFont + install -d -m 755 "$pkgdir"/usr/share/fonts/OTF \ + "$pkgdir"/usr/share/fonts/TTF + install -m644 *.ttf "$pkgdir"/usr/share/fonts/TTF || return 1 + install -m644 *.otf "$pkgdir"/usr/share/fonts/OTF || return 1 + install -D -m644 OFL.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1 + install -D -m644 LICENCE.txt "$pkgdir"/usr/share/licenses/$pkgname/README || return 1 +} +md5sums="297f537b31693c92c1aceaa0aeccb115 LinLibertineFont-4.4.1.tgz" diff --git a/main/umix/APKBUILD b/main/umix/APKBUILD new file mode 100644 index 000000000..d057b3908 --- /dev/null +++ b/main/umix/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +# Maintainer: Michael Mason <ms13sp@gmail.com> +pkgname=umix +pkgver=1.0.2 +pkgrel=1 +pkgdesc="Program for adjusting soundcard volumes" +url="http://umix.sf.net" +license="GPL" +depends= +makedepends="ncurses-dev" +install= +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +md5sums="e38fc288273cc8b5b34f8769f06b32ee umix-1.0.2.tar.gz" diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD index a6f579b96..663a97d8a 100644 --- a/main/usbutils/APKBUILD +++ b/main/usbutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=usbutils pkgver=0.87 -pkgrel=1 +pkgrel=2 pkgdesc="USB Device Utilities" url="http://linux-usb.sourceforge.net/" license="GPL" @@ -23,6 +23,9 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir"/usr/lib/pkgconfig + mv "$pkgdir"/usr/share/hwdata/pkgconfig/usbutils.pc \ + "$pkgdir"/usr/lib/pkgconfig } md5sums="c19a11092dd0f5a5c6a93b0599740fe5 usbutils-0.87.tar.gz" diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index bd315fa3b..7aeb2803e 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=wireshark -pkgver=1.2.6 -pkgrel=2 +pkgver=1.2.8 +pkgrel=0 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" license="GPLv2" @@ -12,10 +12,19 @@ makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 + wireshark-1.1.2--as-needed.patch + wireshark-1.2.8-zlib-1.2.5-capture.patch wireshark.desktop wireshark.png" # depends_dev="somepackage-dev" +prepare() { + cd "$srcdir"/$pkgname-$pkgver + for i in "$srcdir"/*.patch; do + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done +} build() { cd "$srcdir"/$pkgname-$pkgver @@ -64,6 +73,8 @@ tshark() { mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark } -md5sums="f3e0917ed393366bbf96c53b58cb0931 wireshark-1.2.6.tar.bz2 +md5sums="3a75d4f62317e52b8b39a1e9e37f1553 wireshark-1.2.8.tar.bz2 +cc87d7eb31f256df751b3371b1c426e9 wireshark-1.1.2--as-needed.patch +cc4fbe2db149f2ee42dd0593944a69fe wireshark-1.2.8-zlib-1.2.5-capture.patch 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop e771800a8c977fe223583a453bc27397 wireshark.png" diff --git a/main/wireshark/wireshark-1.1.2--as-needed.patch b/main/wireshark/wireshark-1.1.2--as-needed.patch new file mode 100644 index 000000000..7da659c09 --- /dev/null +++ b/main/wireshark/wireshark-1.1.2--as-needed.patch @@ -0,0 +1,20 @@ +diff --git a/epan/Makefile.am b/epan/Makefile.am +index b2a569d..717e233 100644 +--- a/epan/Makefile.am ++++ b/epan/Makefile.am +@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \ + dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ + @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ + @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ ++ ${top_builddir}/wiretap/libwiretap.la \ + ${top_builddir}/wsutil/libwsutil.la -lm + + libwireshark_la_DEPENDENCIES = \ +@@ -137,6 +138,7 @@ libwireshark_la_DEPENDENCIES = \ + libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \ + dfilter/libdfilter.la dissectors/libdissectors.la \ + dissectors/libdirtydissectors.la $(wslua_lib) \ ++ ${top_builddir}/wiretap/libwiretap.la \ + ${top_builddir}/wsutil/libwsutil.la + + #EXTRA_PROGRAMS = reassemble_test diff --git a/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch new file mode 100644 index 000000000..312002740 --- /dev/null +++ b/main/wireshark/wireshark-1.2.8-zlib-1.2.5-capture.patch @@ -0,0 +1,30 @@ +http://anonsvn.wireshark.org/viewvc?view=rev&revision=32715 + +--- trunk/wiretap/wtap.c 2010/05/07 19:24:32 32714 ++++ trunk/wiretap/wtap.c 2010/05/07 19:45:47 32715 +@@ -35,6 +35,10 @@ + #include <unistd.h> + #endif + ++#ifdef HAVE_LIBZ ++#include <zlib.h> ++#endif ++ + #include "wtap-int.h" + #include "wtap.h" + +@@ -646,6 +650,14 @@ + */ + wth->phdr.pkt_encap = wth->file_encap; + ++#if defined(ZLIB_VERNUM) && ZLIB_VERNUM == 0x1250 ++ /* Reset EOF */ ++ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof before seek: %d", gzeof(wth->fh)); */ ++ if (gzeof(wth->fh)) ++ gzseek(wth->fh, 0, SEEK_CUR); ++ /* g_log(NULL, G_LOG_LEVEL_DEBUG, "wtap_read: eof after seek: %d", gzeof(wth->fh)); */ ++#endif ++ + if (!wth->subtype_read(wth, err, err_info, data_offset)) + return FALSE; /* failure */ + diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD index 9fe4bbe2c..c5c67a59d 100644 --- a/main/xchat/APKBUILD +++ b/main/xchat/APKBUILD @@ -1,23 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xchat -pkgver=2.8.6 -pkgrel=4 +pkgver=2.8.8 +pkgrel=0 pkgdesc="A GTK+ based IRC client" url="http://www.xchat.org/" license="GPL" makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev libxext-dev" source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2 - http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff - depreciated-macros.patch - $pkgname-gtk2.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 < ../xc286-smallfixes.diff || return 1 - patch -p1 -i "$srcdir"/depreciated-macros.patch || return 1 - patch -p1 < ../xchat-gtk2.patch || return 1 + for i in "$srcdir"/*.patch; do + [ -r "$i" ] || continue + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done } @@ -42,7 +42,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2 -eb68b6261bf6740cb5f223627eb8f384 xc286-smallfixes.diff -daee42354f95ca54a84248c3cb690fee depreciated-macros.patch -f3fe00982c0bec93152ed0b32438ef87 xchat-gtk2.patch" +md5sums="6775c44f38e84d06c06c336b32c4a452 xchat-2.8.8.tar.bz2" diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch deleted file mode 100644 index 1b86be2f1..000000000 --- a/main/xchat/depreciated-macros.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/fe-gtk/fe-gtk.c 2008-02-24 08:39:44.000000000 +0000 -+++ b/src/fe-gtk/fe-gtk.c.new 2010-04-01 18:10:31.840778707 +0000 -@@ -819,7 +819,8 @@ - switch (info_type) - { - case 0: /* window status */ -- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window))) -+ if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) -+ - return 2; /* hidden (iconified or systray) */ - #if GTK_CHECK_VERSION(2,4,0) - if (gtk_window_is_active (GTK_WINDOW (sess->gui->window))) ---- a/src/fe-gtk/menu.c 2008-06-08 07:59:37.000000000 +0000 -+++ b/src/fe-gtk/menu.c.new 2010-04-01 18:15:54.527573869 +0000 -@@ -1670,7 +1670,7 @@ - menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) - { - /* GTK2.2 behaviour */ -- return GTK_WIDGET_IS_SENSITIVE (widget); -+ return gtk_widget_is_sensitive (widget); - } - - #endif ---- a/src/fe-gtk/maingui.c 2008-04-01 08:53:41.000000000 +0000 -+++ b/src/fe-gtk/maingui.c.new 2010-04-01 18:21:56.400181435 +0000 -@@ -599,7 +599,7 @@ - int num; - GtkWidget *f = NULL; - -- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box)) -+ if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) - f = current_sess->gui->input_box; - - num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box); -@@ -809,8 +809,8 @@ - static void - mg_hide_empty_pane (GtkPaned *pane) - { -- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) && -- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2))) -+ if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && -+ (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) - { - gtk_widget_hide (GTK_WIDGET (pane)); - return; -@@ -2563,9 +2563,9 @@ - { - int handle_size; - --/* if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1))) -+/* if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1))) - return; -- if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2))) -+ if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2))) - return;*/ - - gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL); diff --git a/main/xchat/xchat-gtk2.patch b/main/xchat/xchat-gtk2.patch deleted file mode 100644 index 4e13a2cf5..000000000 --- a/main/xchat/xchat-gtk2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 -05:48:02.000000000 +0100 -+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 -02:18:39.000000000 +0200 -@@ -270,6 +270,6 @@ - xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); - void gtk_xtext_buffer_free (xtext_buffer *buf); - void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); --GtkType gtk_xtext_get_type (void); -+GType gtk_xtext_get_type (void); - - #endif diff --git a/main/xe-guest-utilities/APKBUILD b/main/xe-guest-utilities/APKBUILD index 5b4e48105..02b2115bd 100644 --- a/main/xe-guest-utilities/APKBUILD +++ b/main/xe-guest-utilities/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Cedric Schieli <cschieli@gmail.com> -# Maintainer: Citrix +# Maintainer: Cedric Schieli <cschieli@gmail.com> pkgname=xe-guest-utilities _major=5.5.0 _minor=458 diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD index 600ee7fb5..00dee6916 100644 --- a/main/xfce-utils/APKBUILD +++ b/main/xfce-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce-utils -pkgver=4.6.1 -pkgrel=2 +pkgver=4.6.2 +pkgrel=0 pkgdesc="Utilities for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -10,10 +10,9 @@ depends="hicolor-icon-theme" makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev libsm-dev expat-dev e2fsprogs-dev" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1 ./configure --prefix=/usr \ @@ -23,6 +22,10 @@ build () --disable-static \ --with-xsession-prefix=/etc/X11/ make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="1aa2362b11e79e56d52ce0d265faf1b6 xfce-utils-4.6.1.tar.bz2" +md5sums="5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2" diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD index 64238984d..5787f36ed 100644 --- a/main/xfce4-appfinder/APKBUILD +++ b/main/xfce4-appfinder/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-appfinder -pkgver=4.6.1 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="Xfce application finder" url="http://www.xfce.org/" license="GPL-2" @@ -10,11 +10,9 @@ makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev startup-notification-dev libsm-dev expat-dev e2fsprogs-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 - $install" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,9 +20,10 @@ build () --localstatedir=/var \ --disable-static || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="a1bc7d88100cfd92714a300be531589b xfce4-appfinder-4.6.1.tar.bz2 -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-install -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-upgrade -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-deinstall" +md5sums="7752e43578b821e35010bcd3762da166 xfce4-appfinder-4.6.2.tar.bz2" diff --git a/main/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD index b68c6fa1e..c27b254ce 100644 --- a/main/xfce4-mixer/APKBUILD +++ b/main/xfce4-mixer/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-mixer pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="The volume control plugin for the Xfce panel" url="http://www.xfce.org/" license="GPL2" depends="hicolor-icon-theme" makedepends="pkgconfig xfce4-panel-dev gstreamer-dev intltool gst-plugins-base-dev expat-dev libsm-dev e2fsprogs-dev" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 - $install" +install= +source="http://archive.xfce.org/src/apps/xfce4-mixer/4.6/xfce4-mixer-$pkgver.tar.bz2 + " -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,9 +21,10 @@ build () --disable-static \ --with-sound=alsa || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="a99e2455445480ef5081fe69454a46fc xfce4-mixer-4.6.1.tar.bz2 -db51db79681eadc47be4932355a77c25 xfce4-mixer.post-install -db51db79681eadc47be4932355a77c25 xfce4-mixer.post-upgrade -db51db79681eadc47be4932355a77c25 xfce4-mixer.post-deinstall" +md5sums="a99e2455445480ef5081fe69454a46fc xfce4-mixer-4.6.1.tar.bz2" diff --git a/main/xfce4-mixer/xfce4-mixer.post-deinstall b/main/xfce4-mixer/xfce4-mixer.post-deinstall deleted file mode 120000 index 59bfac9d7..000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-deinstall +++ /dev/null @@ -1 +0,0 @@ -xfce4-mixer.post-install
\ No newline at end of file diff --git a/main/xfce4-mixer/xfce4-mixer.post-install b/main/xfce4-mixer/xfce4-mixer.post-install deleted file mode 100644 index c523d78da..000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - diff --git a/main/xfce4-mixer/xfce4-mixer.post-upgrade b/main/xfce4-mixer/xfce4-mixer.post-upgrade deleted file mode 120000 index 59bfac9d7..000000000 --- a/main/xfce4-mixer/xfce4-mixer.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -xfce4-mixer.post-install
\ No newline at end of file diff --git a/main/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD new file mode 100644 index 000000000..6b4be6b4d --- /dev/null +++ b/main/xfce4-notes-plugin/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: +pkgname=xfce4-notes-plugin +pkgver=1.7.6 +pkgrel=0 +pkgdesc="Notes plugin for the Xfce4 desktop" +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +license="GPL" +depends= +makedepends="xfce4-panel-dev libunique-dev" +install= +subpackages= +source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="a9fff3633f2d0b87f57f4aa93a8a3784 xfce4-notes-plugin-1.7.6.tar.bz2" diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD index deac0568e..4094d48d3 100644 --- a/main/xfce4-panel/APKBUILD +++ b/main/xfce4-panel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-panel -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.4 +pkgrel=0 pkgdesc="Panel for the Xfce desktop environment" url="http://www.xfce.org/" license="GPL-2" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="0b715abb929220f136483ccd7303ff62 xfce4-panel-4.6.3.tar.bz2" +md5sums="82f10a42aefca4cc26a6633e7478cc65 xfce4-panel-4.6.4.tar.bz2" diff --git a/main/xfce4-session/APKBUILD b/main/xfce4-session/APKBUILD index 8eb92efd5..d5ddddebc 100644 --- a/main/xfce4-session/APKBUILD +++ b/main/xfce4-session/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-session -pkgver=4.6.1 -pkgrel=3 +pkgver=4.6.2 +pkgrel=0 pkgdesc="A session manager for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -11,7 +11,7 @@ makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool e2fsprogs-dev zlib-dev" depends="hicolor-icon-theme" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2 busybox-shutdown.patch" depends_dev="libxfcegui4-dev xfconf-dev" @@ -41,5 +41,5 @@ package() { "$pkgdir"/usr/bin/xfce4-tips } -md5sums="7628be41ed3511a20cff5673d9d39858 xfce4-session-4.6.1.tar.bz2 +md5sums="9d9890130e45e0e9476591ed9ba2c9d5 xfce4-session-4.6.2.tar.bz2 bfd9132f08f4a92efbe982fb911c511c busybox-shutdown.patch" diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD index b62728023..e6bab01dd 100644 --- a/main/xfce4-settings/APKBUILD +++ b/main/xfce4-settings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-settings -pkgver=4.6.4 -pkgrel=2 +pkgver=4.6.5 +pkgrel=0 pkgdesc="Settings manager for xfce" url="http://www.xfce.org/" license="GPL-2" @@ -11,7 +11,6 @@ makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev autoconf automake libtool" source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - xfce4-settings-4.7.1-libxklavier.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -49,5 +48,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2 -9a03696ed6200801d296c8adf6816a06 xfce4-settings-4.7.1-libxklavier.patch" +md5sums="f988cb732913b5fbc115ad7105d2231e xfce4-settings-4.6.5.tar.bz2" diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD index c267f24d7..704099fb9 100644 --- a/main/xfconf/APKBUILD +++ b/main/xfconf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfconf -pkgver=4.6.1 -pkgrel=2 +pkgver=4.6.2 +pkgrel=0 pkgdesc="xfconf.. thingie" url="http://www.xfce.org/" license="GPL-2" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev" +makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev + intltool" source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" depends_dev="glib-dev dbus-dev dbus-glib-dev" @@ -27,4 +28,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="d4d3018767ea9eb4b57cc57d4038023b xfconf-4.6.1.tar.bz2" +md5sums="5ff93c15077c6dbbcd38c437bc1ab2ef xfconf-4.6.2.tar.bz2" diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD index f0a66cc0f..5374a4479 100644 --- a/main/xfdesktop/APKBUILD +++ b/main/xfdesktop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfdesktop -pkgver=4.6.1 -pkgrel=3 +pkgver=4.6.2 +pkgrel=0 pkgdesc="A desktop manager for Xfce" url="http://www.xfce.org/" license="GPL-2" @@ -12,7 +12,7 @@ makedepends="pkgconfig libxfce4menu-dev thunar-dev intltool gettext-dev libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev e2fsprogs-dev" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver build() { @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2" +md5sums="e800ea9fee7a5c5eaf2ae96e23a83e3a xfdesktop-4.6.2.tar.bz2" diff --git a/main/xfwm4-themes/APKBUILD b/main/xfwm4-themes/APKBUILD index 78d9a6868..8d711760b 100644 --- a/main/xfwm4-themes/APKBUILD +++ b/main/xfwm4-themes/APKBUILD @@ -8,10 +8,9 @@ license="GPL2" depends="xfwm4" makedepends="pkgconfig" options="!strip" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/art/xfwm4-themes/4.6/xfwm4-themes-${pkgver}.tar.bz2" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -19,6 +18,10 @@ build () --localstatedir=/var \ --disable-static make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } md5sums="4dc5cb29cbd40e3b9dece12a85e20854 xfwm4-themes-4.6.0.tar.bz2" diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD index 9ca4fa568..2fdc51708 100644 --- a/main/xfwm4/APKBUILD +++ b/main/xfwm4/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfwm4 -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=1 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" url="http://www.xfce.org/" @@ -8,12 +8,10 @@ license="GPL-2" depends="hicolor-icon-theme" makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs" -install="xfwm4.post-install xfwm4.post-upgrade xfwm4.post-deinstall" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 - $install" +install= +source="http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -23,9 +21,10 @@ build () --enable-compositor \ --enable-xsync || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="538ff2554a23bf877d336e573884da9a xfwm4-4.6.1.tar.bz2 -db51db79681eadc47be4932355a77c25 xfwm4.post-install -db51db79681eadc47be4932355a77c25 xfwm4.post-upgrade -db51db79681eadc47be4932355a77c25 xfwm4.post-deinstall" +md5sums="3e6c0c54b028b6ea60e865e55ecdf3f8 xfwm4-4.6.2.tar.bz2" diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 1dbb5b188..2ae98aba2 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.6 -pkgrel=2 +pkgver=1.7.7 +pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" -subpackages="$pkgname-dev $pkgname-doc xfbdev" +subpackages="$pkgname-dev $pkgname-doc xfbdev xvfb" depends=" font-misc-misc font-cursor-misc @@ -112,6 +112,7 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install || return 1 + chmod u+s "$pkgdir"/usr/bin/Xorg install -m755 -d "$pkgdir"/etc/X11 || return 1 install -m755 -d "$pkgdir"/var/lib/xkb || return 1 @@ -126,6 +127,12 @@ xfbdev() { mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/ } +xvfb() { + pkgdesc="Virtual Framebuffer 'fake' X server" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/ +} + xephyr() { pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer" depends= @@ -133,5 +140,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="178225f499ec10fa9d312d1c339e6a39 xorg-server-1.7.6.tar.bz2 +md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD index f024570a4..34e6e30e4 100644 --- a/main/yasm/APKBUILD +++ b/main/yasm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=yasm -pkgver=0.8.0 -pkgrel=1 +pkgver=1.0.1 +pkgrel=0 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" url="http://www.tortall.net/projects/yasm/" license="custom" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz" +md5sums="2174fc3b6b74de07667f42d47514c336 yasm-1.0.1.tar.gz" |