Mercurial > linux > patch-history
changeset 0:628bbd5e732e
lots of patches
author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
---|---|
date | Wed, 13 Feb 2008 23:06:25 -0500 |
parents | |
children | 8f8b7c2715df |
files | ALSA/patch-2.6.0-test1_bug641 vanilla/patch-2.6.0-test1_bug939 vanilla/patch-2.6.0-test2_bug1043 vanilla/patch-2.6.0-test2_bug267 vanilla/patch-2.6.0-test2_bug984 vanilla/patch-2.6.0-test2_bug993 |
diffstat | 6 files changed, 159 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ALSA/patch-2.6.0-test1_bug641 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,51 @@ +diff -Naur -x dontdiff linux-2.6.0-test1-vanilla/sound/synth/emux/soundfont.c linux-2.6.0-test1-eva/sound/synth/emux/soundfont.c +--- linux-2.6.0-test1-vanilla/sound/synth/emux/soundfont.c 2003-07-13 23:36:41.000000000 -0400 ++++ linux-2.6.0-test1-eva/sound/synth/emux/soundfont.c 2003-07-18 04:31:36.000000000 -0400 +@@ -66,15 +66,11 @@ + static int + lock_preset(snd_sf_list_t *sflist, int nonblock) + { +- unsigned long flags; +- spin_lock_irqsave(&sflist->lock, flags); +- if (sflist->sf_locked && nonblock) { +- spin_unlock_irqrestore(&sflist->lock, flags); +- return -EBUSY; +- } +- spin_unlock_irqrestore(&sflist->lock, flags); +- down(&sflist->presets_mutex); +- sflist->sf_locked = 1; ++ if (nonblock) { ++ if (down_trylock(&sflist->presets_mutex)) ++ return -EBUSY; ++ } else ++ down(&sflist->presets_mutex); + return 0; + } + +@@ -86,7 +82,6 @@ + unlock_preset(snd_sf_list_t *sflist) + { + up(&sflist->presets_mutex); +- sflist->sf_locked = 0; + } + + +@@ -1356,7 +1351,6 @@ + + init_MUTEX(&sflist->presets_mutex); + spin_lock_init(&sflist->lock); +- sflist->sf_locked = 0; + sflist->memhdr = hdr; + + if (callback) +diff -Naur -x dontdiff linux-2.6.0-test1-vanilla/include/sound/soundfont.h linux-2.6.0-test1-eva/include/sound/soundfont.h +--- linux-2.6.0-test1-vanilla/include/sound/soundfont.h 2003-07-13 23:39:23.000000000 -0400 ++++ linux-2.6.0-test1-eva/include/sound/soundfont.h 2003-07-18 04:35:12.000000000 -0400 +@@ -95,7 +95,6 @@ + int zone_locked; /* locked time for zone */ + int sample_locked; /* locked time for sample */ + snd_sf_callback_t callback; /* callback functions */ +- char sf_locked; /* font lock flag */ + struct semaphore presets_mutex; + spinlock_t lock; + snd_util_memhdr_t *memhdr;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vanilla/patch-2.6.0-test1_bug939 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,11 @@ +--- linux-2.6.0-test1-vanilla/arch/h8300/README 2003-07-13 23:36:33.000000000 -0400 ++++ linux-2.6.0-test1-eva/arch/h8300/README 2003-07-17 02:03:21.000000000 -0400 +@@ -16,7 +16,7 @@ + + 3.H8MAX + Under development +- see http://www.strawbelly-linux.com (Japanese Only) ++ see http://www.strawberry-linux.com (Japanese Only) + + * Toolchain Version + gcc-3.1 or higher and patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vanilla/patch-2.6.0-test2_bug1043 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,20 @@ +--- linux-2.6.0-test2-vanilla/fs/Kconfig 2003-07-27 13:03:14.000000000 -0400 ++++ linux-2.6.0-test2-js/fs/Kconfig 2003-08-06 16:08:03.000000000 -0400 +@@ -210,7 +210,7 @@ + + In general, ReiserFS is as fast as ext2, but is very efficient with + large directories and small files. Additional patches are needed +- for NFS and quotas, please see <http://www.reiserfs.org/> for links. ++ for NFS and quotas, please see <http://www.namesys.com/> for links. + + It is more easily extended to have features currently found in + database and keyword search systems than block allocation based file +@@ -218,7 +218,7 @@ + plugins consistent with our motto ``It takes more than a license to + make source code open.'' + +- Read <http://www.reiserfs.org/> to learn more about reiserfs. ++ Read <http://www.namesys.com/> to learn more about reiserfs. + + Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vanilla/patch-2.6.0-test2_bug267 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,11 @@ +--- linux-2.6.0-test2-vanilla/scripts/ver_linux 2003-07-27 13:04:06.000000000 -0400 ++++ linux-2.6.0-test2-used/scripts/ver_linux 2003-08-04 19:09:51.000000000 -0400 +@@ -28,7 +28,7 @@ + + mount --version | awk -F\- '{print "mount ", $NF}' + +-depmod -V 2>&1 | grep version | awk 'NR==1 {print "module-init-tools ",$NF}' ++depmod -V 2>&1 | grep "module-init-tools" | awk 'NR==1 {print "module-init-tools ",$NF}' + + tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ + 'NR==1 {print "e2fsprogs ", $2}'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vanilla/patch-2.6.0-test2_bug984 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,55 @@ +--- linux-2.6.0-test2-vanilla/README 2003-07-27 13:08:22.000000000 -0400 ++++ linux-2.6.0-test2-tmp/README 2003-07-27 15:14:20.000000000 -0400 +@@ -1,12 +1,9 @@ +- Linux kernel release 2.5.xx ++ Linux kernel release 2.6.xx + +-These are the release notes for Linux version 2.5. Read them carefully, ++These are the release notes for Linux version 2.6. Read them carefully, + as they tell you what this is all about, explain how to install the + kernel, and what to do if something goes wrong. + +-NOTE! As with all odd-numbered releases, 2.5.x is a development kernel. +-For stable kernels, see the 2.4.x maintained by Marcelo Tosatti. +- + WHAT IS LINUX? + + Linux is a Unix clone written from scratch by Linus Torvalds with +@@ -55,7 +52,7 @@ + directory where you have permissions (eg. your home directory) and + unpack it: + +- gzip -cd linux-2.5.XX.tar.gz | tar xvf - ++ gzip -cd linux-2.6.XX.tar.gz | tar xvf - + + Replace "XX" with the version number of the latest kernel. + +@@ -64,15 +61,15 @@ + files. They should match the library, and not get messed up by + whatever the kernel-du-jour happens to be. + +- - You can also upgrade between 2.5.xx releases by patching. Patches are ++ - You can also upgrade between 2.6.xx releases by patching. Patches are + distributed in the traditional gzip and the new bzip2 format. To + install by patching, get all the newer patch files, enter the +- top level directory of the kernel source (linux-2.5.xx) and execute: ++ top level directory of the kernel source (linux-2.6.xx) and execute: + +- gzip -cd ../patch-2.5.xx.gz | patch -p1 ++ gzip -cd ../patch-2.6.xx.gz | patch -p1 + + or +- bzip2 -dc ../patch-2.5.xx.bz2 | patch -p1 ++ bzip2 -dc ../patch-2.6.xx.bz2 | patch -p1 + + (repeat xx for all versions bigger than the version of your current + source tree, _in_order_) and you should be ok. You may want to remove +@@ -99,7 +96,7 @@ + + SOFTWARE REQUIREMENTS + +- Compiling and running the 2.5.xx kernels requires up-to-date ++ Compiling and running the 2.6.xx kernels requires up-to-date + versions of various software packages. Consult + ./Documentation/Changes for the minimum version numbers required + and how to get updates for these packages. Beware that using
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vanilla/patch-2.6.0-test2_bug993 Wed Feb 13 23:06:25 2008 -0500 @@ -0,0 +1,11 @@ +--- linux-2.6.0-test2-vanilla/Documentation/Changes 2003-07-27 13:09:27.000000000 -0400 ++++ linux-2.6.0-test2-tmp/Documentation/Changes 2003-07-27 15:18:28.000000000 -0400 +@@ -2,7 +2,7 @@ + ===== + + This document is designed to provide a list of the minimum levels of +-software necessary to run the 2.5 kernels, as well as provide brief ++software necessary to run the 2.6 kernels, as well as provide brief + instructions regarding any other "Gotchas" users may encounter when + trying life on the Bleeding Edge. If upgrading from a pre-2.4.x + kernel, please consult the Changes file included with 2.4.x kernels for