commit 63953523341bcafe5928bf6e99bffd7db94b471e
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu Jul 28 15:44:44 2005 -0700
Linux 2.6.13-rc4
commit bafd2df5d0049bccc74947fece37963e3f68fadc
Author: Joachim Nilsson <joachim.nilsson@vmlinux.org>
Date: Fri Jul 29 00:18:03 2005 +0200
[PATCH] fix gconfig crash
I ran glade-2 on the glade file, fixed two missing stock icons and
cleaned up the C code that inserts the single/split/full modes. The
rest of the patch is minor cleanups only. I refrained from using all
the included xpm icons in images.c (like qconf.cc does) in favour of
using the stock Gtk+ icons instead. Oh, yes there was a "back" bug
in split mode that I also removed, oh well...
It has been tested with success by several people, including
Jesper Juhl, Randy Dunlap and myself.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu Jul 28 10:34:47 2005 -0700
Revert broken "statement with no effect" warning fix
It may shut up gcc, but it also incorrectly changes the semantics of the
smp_call_function() helpers.
You can fix the warning other ways if you are interested (create another
inline function that takes no arguments and returns zero), but
preferably gcc just shouldn't complain about unused return values from
statement expressions in the first place.
commit 7b70888a192eff457c2ca0a4ffa04815f5e19734
Merge: cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 0a97af41b0e77f834acc0870155de616a373e899
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu Jul 28 08:41:58 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
commit cd85c8b4457a52d3545fdb9532082b2c1ebd5f21
Author: Steven Rostedt <rostedt@goodmis.org>
Date: Thu Jul 28 08:45:06 2005 -0400
[PATCH] speed up on find_first_bit for i386 (let compiler do the work)
Avoid using "rep scas", just let the compiler select a sequence of
regular instructions.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 79a8810221ee9ea96c4e5a5817afb88f22ea698c
Author: Richard Henderson <rth@twiddle.net>
Date: Thu Jul 28 01:07:41 2005 -0700
[PATCH] alpha: fix "statement with no effect" warnings
Apparently gcc 4.0 complains about "({ 0; });", which leads to -Werror
breakage in one of the alpha oprofile modules.
One might could argue that this is a gcc bug, in that statement-expressions
should be considered to be function-like rather than statement-like for the
purposes of this warning. But it's just as easy to use an inline function
in the first place, side-stepping the issue.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 11be00cba6be114f861123cfc6779f195a615d22
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu Jul 28 01:07:39 2005 -0700
[PATCH] PCDP: if PCDP contains parity information, use it
If the PCDP supplies parity, use it (only none/even/odd supported), and
don't append parity/stop bit arguments unless baud is present.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8b378def5a386c4a7f15b51ed79802badb9f5a70
Author: Tony Luck <tony.luck@intel.com>
Date: Thu Jul 28 01:07:38 2005 -0700
[PATCH] e1000: no need for reboot notifier
sys_reboot() now calls device_suspend(), so it is no longer necessary for
the e1000 driver to register a reboot notifier [in fact doing so results in
e1000_suspend() getting called twice].
(akpm: we need to fast-track this. It's causing ia64 to oops on shutdown)
Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: <cramerj@intel.com>
Cc: <john.ronciak@intel.com>
Cc: <ganesh.venkatesan@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f5c1d5b2aaf9a98f15a6dcdfbba1f494d0aaae52
Author: James Morris <jmorris@redhat.com>
Date: Thu Jul 28 01:07:37 2005 -0700
[PATCH] SELinux: default labeling of MLS field
Implement kernel labeling of the MLS (multilevel security) field of
security contexts for files which have no existing MLS field. This is to
enable upgrades of a system from non-MLS to MLS without performing a full
filesystem relabel including all of the mountpoints, which would be quite
painful for users.
With this patch, with MLS enabled, if a file has no MLS field, the kernel
internally adds an MLS field to the in-core inode (but not to the on-disk
file). This MLS field added is the default for the superblock, allowing
per-mountpoint control over the values via fixed policy or mount options.
This patch has been tested by enabling MLS without relabeling its
filesystem, and seems to be working correctly.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e1699f508ab5098de4b258268fa8913db38d9d35
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Thu Jul 28 01:07:34 2005 -0700
[PATCH] cs89x0: collect tx_bytes statistics
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ac12259f2984d96454affc147f9d63f2ac2ac1f8
Author: Giancarlo Formicuccia <giancarlo.formicuccia@gmail.com>
Date: Thu Jul 28 01:07:33 2005 -0700
[PATCH] Fix incorrect Asus k7m irq router detection
This patch:
http://marc.theaimsgroup.com/?l=bk-commits-head&m=111...
uncovered a k7m bios bug, where the VT82C686A router is reported as
being "586-compatible". The two chips have different pirq mapping, so
this leads to "irq routing conflict" on many pci devices.
The suggested fix was discussed with Aleksey Gorelov, who helped me
to identify the problem as a probable bios bug.
Signed-off-by: Giancarlo Formicuccia <giancarlo.formicuccia@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ad2b93123d2b3cb4ba9a98dd5f62acb6d6b50391
Author: Mike Miller <mike.miller@hp.com>
Date: Thu Jul 28 01:07:31 2005 -0700
[PATCH] cciss per disk queue
This patch adds per disk queue functionality to cciss. Sometime back I
submitted a patch but it looks like only part of what I needed. In the 2.6
kernel if we have more than one logical volume the driver will Oops during
rmmod. It seems all of the queues actually point back to the same queue.
So after deleting the first volume you hit a null pointer on the second
one.
This has been tested in our labs. There is no difference in performance,
it just fixes the Oops.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit eaaf9c68e75edf0fa51c5770eb68c2a6cb5ff66b
Author: Daniel Ritz <daniel.ritz@gmx.ch>
Date: Thu Jul 28 01:07:30 2005 -0700
[PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridges
Older O2Micro bridges have problems with both read prefetch and write burst
depending on the combination of the chipset, bridge, cardbus card. safest is
to disable read prefetch and write burst on those old bridges.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d8c4b4195c7d664baf296818bf756775149232d3
Author: Daniel Ritz <daniel.ritz@gmx.ch>
Date: Thu Jul 28 01:07:28 2005 -0700
[PATCH] yenta: free_irq() on suspend.
Resume doesn't seem to work without.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a1b274fbe3f00469fb8a68806469ec7746c7f648
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu Jul 28 01:07:27 2005 -0700
[PATCH] pcmcia: fix sharing IRQs and request_irq without IRQ_HANDLE_PRESENT
Debugging and description from: Noah Misch <noah@cs.caltech.edu>
When a driver calls pcmcia_request_irq with IRQ_HANDLE_PRESENT unset, it looks
for an open IRQ by request_irq()ing with a dummy handler and NULL dev_info.
free_irq uses dev_info as a key for identifying the handler to free among
those sharing an IRQ, so request_irq returns -EINVAL if dev_info is NULL and
the IRQ may be shared. That unknown error code is the -EINVAL.
It looks like only pcnet_cs and axnet_cs are affected. Most other drivers let
pcmcia_request_irq install their interrupt handlers. sym53c500_cs requests
its IRQ manually, but it cannot share an IRQ.
The appended patch changes pcmcia_request_irq to pass an arbitrary, unique,
non-NULL dev_info with the dummy handler.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 661d04c6f08c16ae63fb3be05d59ee99c6f3de52
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu Jul 28 01:07:26 2005 -0700
[PATCH] pcmcia: update documentation
Update the PCMCIA documentation to reflect some more, though older, changes.
Parts extracted from an e-mail from Randy Dunlap with his consent.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d277ad0eaa056c632707271192ec5896548f15d6
Author: Komuro <komurojun-mbn@nifty.com>
Date: Thu Jul 28 01:07:24 2005 -0700
[PATCH] pcmcia: fix many device IDs
If the product-id-string contains the '+' , '&' ,'_', it was not converted
properly from the /etc/pcmcia/config(pcmcia-cs config file).
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2e5a3e79091615c5eae871ad9e794ed48753ae05
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu Jul 28 01:07:23 2005 -0700
[PATCH] pcmcia: avoid duble iounmap of one address
Avoid double iounmap of one address, and disable cis_virt if set_mem_map
failed.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dc33a4a36cad02b939b9a4fb2f15ade17d61cdaf
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Thu Jul 28 01:07:22 2005 -0700
[PATCH] pcmcia: update au1000 to work with recent changes
Get the au1000 PCMCIA socket drivers to work.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b2e0743a515c3317b0f9c93fb1c5e082c87474a2
Author: Jar <jar@pcuf.fi>
Date: Thu Jul 28 01:07:21 2005 -0700
[PATCH] pcmcia: remove duplicates in orinoco_cs
Remove duplicates from the device id table.
Signed-off-by: Jarkko Raja <jar@pcuf.fi>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ba5bb6b58490693fb9b5de3ffee48c6dc9ae0d6c
Author: Pavel Roskin <proski@gnu.org>
Date: Thu Jul 28 01:07:20 2005 -0700
[PATCH] pcmcia: fix comment
There are two problems with the message about missing callback functions: it's
not written in correct English and it lacks newline at the end.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 698e22c4bf7dad25d63f5c2ec6ca07047579c434
Author: Pavel Roskin <proski@gnu.org>
Date: Thu Jul 28 01:07:19 2005 -0700
[PATCH] pcmcia: ide-cs id_table update
SanDisk ConnectPlus has two functions. Function 0 is prism2 card, currently
only supported by HostAP (not in the kernel). Function 1 is 128M flash,
supported by ide-cs. This patch adds an entry for function 1 to ide-cs.c.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a5453be48e8def75a9c1b2177b82fa0e692c6e3a
Author: Andrew Morton <akpm@osdl.org>
Date: Thu Jul 28 01:07:18 2005 -0700
[PATCH] bio_clone fix
Fix bug introduced in 2.6.11-rc2: when we clone a BIO we need to copy over the
current index into it as well.
It corrupts data with some MD setups.
See http://bugzilla.kernel.org/show_bug.cgi?id=4946
Huuuuuuuuge thanks to Matthew Stapleton <matthew4196@gmail.com> for doggedly
chasing this one down.
Acked-by: Jens Axboe <axboe@suse.de>
Cc: <linux-raid@vger.kernel.org>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0a97af41b0e77f834acc0870155de616a373e899
Author: Jaroslav Kysela <perex@suse.cz>
Date: Thu Jul 28 15:50:42 2005 +0200
[ALSA] version 1.0.9b
commit da8ea98b21236f29a5df723e3cc5abdc6530c07c
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jul 28 15:22:55 2005 +0200
[ALSA] wavefront - declare initialization data as static
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 69c3e5f8562c7854d9dd8d7820a89286f9440e41
Author: Takashi Iwai <tiwai@suse.de>
Date: Wed Jul 27 17:30:14 2005 +0200
[ALSA] via82xx - Fix dxs_support of twinhead laptop
VIA82xx driver
Changed the dxs_support value of twinhead laptop to DXS_SRC.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit eeacb5457cf5f0802fb29f385befa0b1d166cadb
Author: Sergey Ulanov <Sergey.Ulanov@asplinux.ru>
Date: Wed Jul 27 17:28:58 2005 +0200
[ALSA] Jack Sense support for AD1980 and AD1888
AC97 Codec
Attached patch adds 'Jack Sense' controls for AD1980 and AD1888 chips.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 7b566054b33474cdd674289a8c7dd282c02e536e
Author: Takashi Iwai <tiwai@suse.de>
Date: Wed Jul 27 17:26:59 2005 +0200
[ALSA] vx-driver - Fix the calculation of frequency parameter
Digigram VX core
Fixed the calculation of frequency parameter of vx boards.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit fb92e6f05e84f6c217d786208e2ed5acf633b6ce
Author: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Date: Wed Jul 27 17:25:08 2005 +0200
[ALSA] hda driver, correct bug in model 'auto'
HDA Codec driver
- Correct some index variable inversion in patch_cmedia.c
Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 5a0f217d96656068f0f1e5cda16c35945f979b16
Author: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Tue Jul 26 13:42:31 2005 +0200
[ALSA] sound/core Fix the sparse warning 'implicit cast to nocast type'
Memalloc module,ALSA Core,Instrument layer
Fix the sparse warning 'implicit cast to nocast type'
File/Subsystem:sound/core
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 854af9578cb84e4ca3cb1551a6be40c4e81bb455
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 25 16:19:10 2005 +0200
[ALSA] usb-audio - change quirk type handling
USB generic driver
Make the quirk type an enum instead of a #defined integer, and use a
table for the quirk constructor functions instead of a big switch
statement.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit f38275fe994c333b809796230f4f98090f8d919b
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 25 16:17:29 2005 +0200
[ALSA] usb-audio - add support for Miditech USB MIDI keyboards
USB generic driver
Add support for Miditech Midistart and MidiStudio keyboards (another
case of devices using the standard protocol but having no descriptors).
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit d06e4c4001cf26147a6af0718703368944f0df32
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Thu Jul 21 08:01:22 2005 +0200
[ALSA] seq-midi - silently ignore non-MIDI events
ALSA sequencer
When non-MIDI sequencer events are sent to a RawMIDI port, silently
ignore them instead of returning a confusing error code which may upset
the sequencer and abort the current write() to /dev/snd/seq.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit 7858ffa062886706026cfff3ba80b8400b520501
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 11 15:37:19 2005 +0200
[ALSA] ac97 - remove unused variable
AC97 Codec
remove a variable made obsolete by the last change
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit c9eab129fcbcef364b34fb3a70cb2531847e1edf
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sun Jul 10 12:04:29 2005 +0200
[ALSA] ac97: Fix volume control bit size detection for STAC9704.
AC97 Codec
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit 7c1d549aa9b22365fe5405c372f840cdbc6315f5
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sun Jul 10 11:50:36 2005 +0200
[ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit b27c187f95cd6c9f13f26a5088bea384ac557b45
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sat Jul 9 10:54:37 2005 +0200
[ALSA] Fix-up sleeping in sound/usb
USB generic driver,USB USX2Y
Description: Fix-up sleeping in sound/usb. Replace big_mdelay() with
msleep() to guarantee the task delays as expected. This also involved
replacing/removing custom sleep functions.
Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 989a0b248bbf32c89e60dc6f02219e446b320712
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sat Jul 9 10:53:24 2005 +0200
[ALSA] Fix-up sleeping in sound/ppc
PPC AWACS driver,PPC PMAC driver,PPC Tumbler driver
Description: Fix-up sleeping in sound/ppc. Replace big_mdelay() with
msleep() to guarantee the task delays as expected. This also involved
replacing/removing custom sleep functions.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit ef21ca24faf28df6d06939e77d5032a313490289
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sat Jul 9 10:13:22 2005 +0200
[ALSA] sound/pci: fix-up sleeping paths
ENS1370/1+ driver,ES1968 driver,Intel8x0 driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,ALI5451 driver,CS46xx driver
MIXART driver,RME HDSP driver,Trident driver,YMFPCI driver
Description: Fix-up sleeping in sound/pci. These changes fall under the
following two categories:
1) Replace schedule_timeout() with msleep() to guarantee the
task delays as expected. This also involved replacing/removing
custom sleep functions.
2) Do not assume jiffies will only increment by one if you
request a 1 jiffy sleep, i.e. use time_after/time_before in
while loops.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 072c01194df6e4843582d09380b780987f642d6d
Author: Jaroslav Kysela <perex@suse.cz>
Date: Sat Jul 9 10:07:55 2005 +0200
[ALSA] ens1371 - added extra delay for ac97 codec initialization
ENS1370/1+ driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 856def8a4695066e6cbd2919c5987f1df23dbe8a
Author: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri Jul 8 13:53:42 2005 +0200
[ALSA] typo-fix and snd_assert()-expression-split
ALSA Core
This patch corrects a typo in the kerneldocs of snd_info_get_str().
It also splits the expressions of snd_assert() in snd_info_unregister()
into one-expression-per-call for better debugging.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 5b738babf13d51285710ed57336ee5f072ac9490
Author: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri Jul 8 09:29:18 2005 +0200
[ALSA] fix compiler warning
GUS Library
This patch fixes a compiler warning if sequencer is disabled.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit ae3a72d8cb4e5b30606c5e3ac9c59b729117579a
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Wed Jul 6 22:36:18 2005 +0200
[ALSA] snd-emu10k1: Fixes recognition of Audigy ES.
EMU10K1/EMU10K2 driver
Fixes ALSA bug #1237.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit e66bc8b2a7d85166935a2da651b94efb9e7a2f11
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Wed Jul 6 22:21:51 2005 +0200
[ALSA] emu10k1: Add module option uint subsystem.
EMU10K1/EMU10K2 driver
It allows the user to force the snd-emu10k1 module to think the user
has a particular sound card. Useful if their particular sound card
is not yet recognised.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit 2201987c562f7c810440d399ef7a85fe79be01e7
Author: Jaroslav Kysela <perex@suse.cz>
Date: Tue Jul 5 10:27:09 2005 +0200
[ALSA] via82xx - changed MSI K7T266 Pro2 - 4005:4710 in white list (SRC enable)
VIA82xx driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit e3ea4d896109edd64dc549ecaeeff8d89025fb57
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Jul 4 18:12:39 2005 +0200
[ALSA] hdsp - Add 'Sample Clock Source Locking' control
RME HDSP driver
Added 'Sample Clock Source Locking' control. If this switch is on,
the clock source can't be changed via PCM hw_params API (as sample rate).
This will fix the problem of OSS-emulation, for example.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 4e55096e27d745908e44c6abd2cc0c5b615854a4
Author: Matt <matt@embeddedalley.com>
Date: Mon Jul 4 17:51:39 2005 +0200
[ALSA] hda: add sigmatel hp detect support
HDA Codec driver
Adds support for detecting hp insertion/removal and enable/disable of
lineouts based on unsolicited events.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 41e2fce431070cb2d91391808077378582d3e6b1
Author: Matt <matt@embeddedalley.com>
Date: Mon Jul 4 17:49:55 2005 +0200
[ALSA] hda: enable unsolicited responses
HDA Intel driver
Patch enables unsolicited responses on the HDA controller. Without
the UREN bit set, the controller will not place unsolicited responses
in a RIRB.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit bbd4615cdb68de943b2814e956ec14899606dc45
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 4 09:21:45 2005 +0200
[ALSA] usb-audio - use bDeviceSubClass to detect MOTU FastLane
USB generic driver
MOTU builds other USB MIDI interfaces with the same product ID as the
FastLane, so we have to check the bDeviceSubClass field to differentiate
between them.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit 6155aff84b98b2aa35eaa4384b539dfbab86afcc
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 4 09:20:42 2005 +0200
[ALSA] usb-audio - rename QUIRK_MIDI_MOTU to QUIRK_MIDI_RAW
USB generic driver
Rename the protocol used by the MOTU FastLane to 'raw' because it might
be useful with other devices, and there are other MOTU interfaces that
do not use this protocol.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit b1c6ef52e2623c81c2124801c783a903f6e5437a
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jul 4 09:18:46 2005 +0200
[ALSA] usb-audio - enable high speed transfers with Audiy 2 NX
USB generic driver
This patch enables the boot commands to activate high speed mode (and
associated sample formats like 8 channels with 24 bits at 96 kHz) on the
SB Audigy 2 NX.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit 88dc0e5dadf9b0cb529c89b12cd10f75d5b1bce4
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sun Jul 3 12:54:29 2005 +0200
[ALSA] emu10k1: Added tested status comments.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit a6f6192bb38a76c4ad44c894144b1fbf3d14606b
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sun Jul 3 12:32:40 2005 +0200
[ALSA] emu10k1: Sort by card id.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit 3818152e64866b54020b5656ff5fdd0f5e085183
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sat Jul 2 18:03:37 2005 +0200
[ALSA] snd-emu10k1: Tidy mixer controls.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit e0474e53985c5fac97a5bb85d66ec0d017b5faf3
Author: James Courtier-Dutton <James@superbug.co.uk>
Date: Sat Jul 2 16:33:34 2005 +0200
[ALSA] snd-emu10k1: Card capabilities tidy up.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
commit 7bc71ecd6477db90221efc08fb742b3df4f49b46
Author: Jaroslav Kysela <perex@suse.cz>
Date: Sat Jul 2 15:20:57 2005 +0200
[ALSA] via82xx - added MSI K7T266 Pro2 - 4005:4710 to white list (DXS enable)
VIA82xx driver
Reporter: Marko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 0ac2ac0ad7d1e8c84241d1c40b0d196b9b7c8104
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Fri Jul 1 16:19:39 2005 +0200
[ALSA] usb-audio: add support for an unknown Yamaha USB MIDI device
USB generic driver
Add a quirk for the Yamaha USB MIDI device with USB ID 0x103d.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit 2c484df0d249323d223f7f58e0f3b992b7414be8
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 18:54:04 2005 +0200
[ALSA] Add ARM PXA2xx AC97 driver
Documentation,ARM,/arm/Makefile,ARM PXA2XX driver
Added ARM PXA2xx AC97 driver by Nicolas Pitre
(moved from alsa-driver tree).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 1bd9debf25b8a5f5029d7619f43e4a9a775973d3
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 18:26:20 2005 +0200
[ALSA] Add DBRI driver on Sparcs
Documentation,SPARC,/sparc/Makefile
Add the DBRI driver on Sparcs by Martin Habets <mhabets@users.sourceforge.net>
(moved from alsa-driver tree).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit ab79509a95b1d22c40d4a87823b6a48bc9a12af5
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 18:13:54 2005 +0200
[ALSA] Add help texts to Kconfig
SPARC
Added simple help texts to Kconfig of Sparc sound drivers.
(Better texts are appreciated :)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 5ba1e7b594db4d0e1f88ace87c1cb295761ca5c9
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 13:47:58 2005 +0200
[ALSA] maestro3 - Clean up
Maestro3 driver
- Clean up maestro3 code
- Use msleep()
- Don't enable hw-vol irq when not defined
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 52b723888c1a55d34551f9b0b9d9296e0e3e8d3c
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 13:47:06 2005 +0200
[ALSA] Fix resume of intel8x0
Intel8x0 driver,AC97 Codec
Fix resume of intel8x0 driver. The ac97 codec didn't restore some registers
properly, and the restore of ICH4 SPDIF and SDIN settings was missing.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 2eff7ec81eb586076974cb0918dffc5f4ad763d5
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 13:45:20 2005 +0200
[ALSA] cmipci - Add Mic Boost capture switch
CMIPCI driver
Added 'Mic Boost Capture Switch' and 'Phone' switches.
The existing playback switch is renamed as 'Mic Boost Playback Switch'.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 174d52204500a63c19e6613e49db3fcfe4e9d35a
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 13:42:39 2005 +0200
[ALSA] vxpocket - Remove unused code
Digigram VX Pocket driver
Removed unused files (dropped by the last change).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 6d00a3127972e7853d6296ffc1e72c5b1a23d937
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 13:40:51 2005 +0200
[ALSA] Fix and clean-up of vxpocket driver
Documentation,PCMCIA Kconfig,Digigram VX Pocket driver
- Fixed Oops with request_firmware()
- Detect the card type in runtime (vxpoocket v2 or 440)
- snd-vxp440 driver is merged to snd-vxpocket
- Clean up the code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 82fe0c5803f4c77ffeb4c1c2367defb3dcedad45
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 10:54:33 2005 +0200
[ALSA] Use kstrdup
HDA Codec driver
Use the new kstrdup() function instead of in-house one.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 0884484762f731a1d5446c0b618a74c5957dea4f
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jun 30 09:55:31 2005 +0200
[ALSA] Fix dependency of GUS driver
ALSA sequencer
Add the missing snd-seq-midi-emul to SND_GUS_SYNTH list.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit d5750f67853350373fc1d5698c3a58ea16eddf4c
Author: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Wed Jun 29 19:31:06 2005 +0200
[ALSA] cleanup and typo-correction
ALSA Core
This patch changes, adds and remove some comments, which will
make now more sense and fit on a 80-char line. It also changes
the order of snd_power_wait() to make the file more readable.
It removes the device.c comment in front of _snd_minor,
cause snd_minor has nothing to do with device.c.
The both typos in the kernel-docs were corrected too.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit a3352f01ea2d38b0d5b7b63de754e94b9aba0390
Author: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Wed Jun 29 19:30:42 2005 +0200
[ALSA] Fix two typos and changes on snd_assert()
ALSA Core
Both typos were in the kerneldocs.
I splitted the snd_assert() calls in one-expression-per-call for better
debugging.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 7a318a70a42057692f191ff49c289cd3e27e21f5
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Jun 28 14:16:21 2005 +0200
[ALSA] hda-codec - Add entry for Acer APFV
HDA Codec driver
Added the model entry for Acer APFV.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit b6482d48e536729829025262d6529df09ae20396
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Jun 27 15:32:43 2005 +0200
[ALSA] hda-codec - Add 6stack model for ALC880
Documentation,HDA Codec driver
- Added a new '6stack' model for ALC880.
- Fixed the typo in 6stack-digout model name.
- Added description for missing models in ALSA-Configuration.txt.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 548e7823bc33b8cde4de59dfafe0fd69d951d3b5
Author: Harald Welte <laforge@gnumonks.org>
Date: Mon Jun 27 15:10:56 2005 +0200
[ALSA] Add new pci device id (SB400) to atiixp-modem
ATIIXP-modem driver
I didn't actually test whether the modem works, but at least the driver
loads and initializes fine. Please consider inclusion.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit b95eed7cde4a44476fa12e776e090fc494059458
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Jun 27 15:07:33 2005 +0200
[ALSA] trident - Shut up compile warnings
Trident driver
Shut up compile warnings about uninitialized variables.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit ff6fdc37fbe66e24ef9ad7c23a278ff757480dda
Author: Matt <matt@embeddedalley.com>
Date: Mon Jun 27 15:06:52 2005 +0200
[ALSA] hda-codec - SigmaTel HDA resume support
HDA Codec driver
Adds resume support to the SigmaTel HDA patch. Please apply.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit c7d4b2fa3169a1206450bc445d1997a17479644f
Author: Matt <matt@embeddedalley.com>
Date: Mon Jun 27 14:59:41 2005 +0200
[ALSA] hda-codec - SigmaTel HDA multichannel support
HDA Codec driver
Adds 6/8 channel support to the SigmaTel HDA patch. Please apply.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit b4d3f9d452ec574e0ffb292267427f69bb470631
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jun 27 08:18:27 2005 +0200
[ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX
USB generic driver
On the SB Audigy 2 NX, capturing with sample rates that are not a
multiple of 48 kHz does not seem to work, so disable it.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit 573567e07bb4470ff177f17d1adca3f3bd310221
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Jun 27 08:17:30 2005 +0200
[ALSA] usb-audio - high speed audio support
USB generic driver
Add support for endpoints with bInterval > 1, and decoding of the
wMaxPacketSize field of high-speed endpoints.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
commit b0af0de5cb57c96b0c3d739005172152b7de0ce8
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Jun 21 14:49:19 2005 +0200
[ALSA] hda-codec - Fix oops with ALC880
HDA Codec driver
- Fixed oops with ALC880 auto-config mode
- Fixed a wrong config table entry for ALC880
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 145794dc09117b31b6730096558e52b673af7b84
Author: Jaroslav Kysela <perex@suse.cz>
Date: Mon Jun 20 10:42:44 2005 +0200
[ALSA] ak4114: removed duplicate wake_up()
AK4114 receiver
- wake_up(&runtime->sleep) is already called in snd_pcm_post_stop()
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
commit 577a4f8102d54b504cb22eb021b89e957e8df18f
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 27 22:10:59 2005 -0700
[PATCH] More qla2xxx configuration fixes
This adds the appropriate FW_LOADER pre-requisite and a separate entry
for ISP24xx support.
Thanks to Adrian Bunk and Jesper Juhl for their efforts in fixing this
quirk.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 79d81907594e1ec4d5171653dde7cb9e9cb87de2
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 20:38:56 2005 -0700
[IB/ucm]: Clean up userspace CM
Only print debug messages when debug_level is set.
Eliminate NULL checks prior to calling kfree.
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Libor Michalek <libor@topspin.com>
commit 2868bd281fef21d1e73d6b7648a41efc3d75f10c
Merge: 6d376756f2cf3478d5a4fdb8d18e958948366b9d 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af
Author: Roland Dreier <roland@eddore.topspincom.com>
Date: Wed Jul 27 19:12:56 2005 -0700
Merge /scratch/Ksrc/linux-git/
commit 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af
Author: Richard Henderson <rth@twiddle.net>
Date: Wed Jul 27 17:10:52 2005 -0700
[PATCH] new alpha syscalls
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 340d10e47238daeb5e5eb27df25b4e7ec71f6571
Merge: e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82 48b0e5487fcdcb3421bda67666277348b2bd2661
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 17:09:10 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 17:08:21 2005 -0700
Fix up qla2xxx configuration bogosity
If we haven't configured the qla24xx driver, then the Makefile shouldn't
do it for us.
This also means that we can avoid the unnecessary selection of FC_ATTRS.
Debugged by James Bottomley
commit e4ff4d7f9d85a2bc714307eb9113617182e62845
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 10:41:23 2005 -0700
[PATCH] Avoid device suspend on reboot
My fairly ordinary x86 test box gets stuck during reboot on the
wait_for_completion() in ide_do_drive_cmd():
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 49302d0c42592b37f49ae96e0f06a3599cf5a8a0
Merge: 839c5d2511fadc35cc4e8a8ffa833d76668700b2 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 16:42:22 2005 -0700
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
commit 839c5d2511fadc35cc4e8a8ffa833d76668700b2
Merge: 96fad28a781069eb40156f78b8f50c349805b652 5e43db7730e7cef7d37968ea789c41392519a864
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 16:37:59 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 96fad28a781069eb40156f78b8f50c349805b652
Merge: 3334c39f1815d2911238c43f40840c3c7b378165 b833961bd30eec201b9a94eec36aa7ac96f9c9c0
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 16:37:03 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commit 3334c39f1815d2911238c43f40840c3c7b378165
Merge: 71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5 614d73edae68836f7659ee8efec90878e6215fb1
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 27 16:36:08 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
commit 71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5
Author: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Wed Jul 27 04:55:54 2005 -0300
[PATCH] ppc32: 8xx remove BROKEN Kconfig entry
8xx is not BROKEN anymore.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bf85fa6c878aa3968df47d7f70a2b506c3e53b99
Author: Anton Wöllert <a.woellert@gmail.com>
Date: Wed Jul 27 04:45:17 2005 -0300
[PATCH] ppc32: 8xx avoid icbi misbehaviour in __flush_dcache_icache_phys
On 8xx, in the case where a pagefault happens for a process who's not
the owner of the vma in question (ptrace for instance), the flush
operation is performed via the physical address.
Unfortunately, that results in a strange, unexplainable "icbi"
instruction fault, most likely due to a CPU bug (see oops below).
Avoid that by flushing the page via its kernel virtual address.
Oops: kernel access of bad area, sig: 11 [#2]
NIP: C000543C LR: C000B060 SP: C0F35DF0 REGS: c0f35d40 TRAP: 0300 Not tainted
MSR: 00009022 EE: 1 PR: 0 FP: 0 ME: 1 IR/DR: 10
DAR: 00000010, DSISR: C2000000
TASK = c0ea8430[761] 'gdbserver' THREAD: c0f34000
Last syscall: 26
GPR00: 00009022 C0F35DF0 C0EA8430 00F59000 00000100 FFFFFFFF 00F58000
00000001
GPR08: C021DAEF C0270000 00009032 C0270000 22044024 10025428 01000800
00000001
GPR16: 007FFF3F 00000001 00000000 7FBC6AC0 00F61022 00000001 C0839300
C01E0000
GPR24: 00CD0889 C082F568 3000AC18 C02A7A00 C0EA15C8 00F588A9 C02ACB00
C02ACB00
NIP [c000543c] __flush_dcache_icache_phys+0x38/0x54
LR [c000b060] flush_dcache_icache_page+0x20/0x30
Call trace:
[c000b154] update_mmu_cache+0x7c/0xa4
[c005ae98] do_wp_page+0x460/0x5ec
[c005c8a0] handle_mm_fault+0x7cc/0x91c
[c005ccec] get_user_pages+0x2fc/0x65c
[c0027104] access_process_vm+0x9c/0x1d4
[c00076e0] sys_ptrace+0x240/0x4a4
[c0002bd0] ret_from_syscall+0x0/0x44
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 59904159c316f7bc02d00ff7b0dc3f9d3afd07fd
Author: Jesper Juhl <juhl-lkml@dif.dk>
Date: Wed Jul 27 11:46:10 2005 -0700
[PATCH] Update CREDITS entry and listings in source files for Jesper Juhl
a) update entry in CREDITS for Jesper Juhl
b) remove email address from source files so it's only listed in credits.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 77933d7276ee8fa0e2947641941a6f7a100a327b
Author: Jesper Juhl <juhl@dif.dk>
Date: Wed Jul 27 11:46:09 2005 -0700
[PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of
the declaration. This patch fixes all remaining occurrences of "inline
static" up with "static inline" in the entire kernel tree (140 occurrences in
47 files).
While making this change I came across a few lines with trailing whitespace
that I also fixed up, I have also added or removed a blank line or two here
and there, but there are no functional changes in the patch.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 03e259a9cdbd0583e71468293aaa1ccadbdaeff1
Author: Michal Januszewski <spock@gentoo.org>
Date: Wed Jul 27 11:46:08 2005 -0700
[PATCH] fbdev: update info->cmap when setting cmap from user-/kernelspace.
The fb_info struct, as defined in include/linux/fb.h, contains an element
that is supposed to hold the current color map:
struct fb_cmap cmap; /* Current cmap */
This cmap is currently never updated when either fb_set_cmap() or
fb_set_user_cmap() are called. As a result, info->cmap contains the
default cmap that was set by a device driver/fbcon and a userspace
application using the FBIOGETCMAP ioctl will not always get the *currently*
used color map.
The patch fixes this by making sure the cmap is copied to info->cmap after
it is set correctly. It moves most of the code that is responsible for
setting the cmap to fb_set_cmap() and out of fb_set_user_cmap() to avoid
code-duplication.
Signed-off-by: Michal Januszewski <spock@gentoo.org>
Cc: <linux-fbdev-devel@lists.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dbd4f12859307c20a4c65a7de4cdd5f9f518dc7a
Author: Michal Januszewski <spock@gentoo.org>
Date: Wed Jul 27 11:46:06 2005 -0700
[PATCH] fbcon: don't repaint the cursor when it is disabled.
Currently even when the cursor is disabled (`setterm -cursor off`), it is
still repainted as a black rectangle the size of a single char. This can
be seen, for example, by chvt'ing to a free tty, disabling the cursor and
doing `dd if=3D/dev/urandom of=3D/dev/fb0`.
The patch changes this behaviour by avoiding painting anything when the
cursor is disabled.
Signed-off-by: Michal Januszewski <spock@gentoo.org>
Cc: <linux-fbdev-devel@lists.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d210224732b3d32e802e3537499297d387852166
Author: Jon Smirl <jonsmirl@gmail.com>
Date: Wed Jul 27 11:46:05 2005 -0700
[PATCH] fbdev: colormap fixes
Color maps have up to 256 entries. 4096/256 allows for 16 characters per
line. The format for a cmap entry is "%02x%c%4x%4x%4x\n" %02x entry %c
transp %4x red %4x blue %4x green
You can read the color_map with cat fb0/color_map.
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3ca34fcbfbf8a7cbe99d54ae81c4e28fdc6f4ac6
Author: Jon Smirl <jonsmirl@gmail.com>
Date: Wed Jul 27 11:46:05 2005 -0700
[PATCH] radeonfb: clean up EDID sysfs attribute
radeonfb does not clean up EDID sysfs attribute
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5a340cce09f5dfd89b7b7eea1a52d1a2d1c99a2e
Author: Jon Smirl <jonsmirl@gmail.com>
Date: Wed Jul 27 11:46:04 2005 -0700
[PATCH] fbmem: use unregister_chrdev() on unload
fbdev is missing unregister_chrdev() on unload.
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0a793b77f786022bd0fef1a18142c1b9be9e421d
Author: Jon Smirl <jonsmirl@gmail.com>
Date: Wed Jul 27 11:46:03 2005 -0700
[PATCH] fbmon: horizontal frequency rounding fix
Fix rounding error when mode frequency is very close to monitor limit
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4e4b7952cd34af4dd78e012265d4bc858db6adf3
Author: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Wed Jul 27 11:46:01 2005 -0700
[PATCH] cpm_uart: use DPRAM for early console
m8xx_cpm_hostalloc() can't rely on using the coherent DMA allocator early
on boot because the VM is not fully up yet. Change it to use the on-board
DPRAM instead.
The current code relies on the "bootmem_page" allocated by
m8xx_cpm_reset(), which must be killed.
This is done in v2.4 but has never been forward ported to v2.6.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Pantelis Antoniou <panto@intracom.gr>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6ddcc9197beef7cba993c38cdcad45aefb557d33
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:46:00 2005 -0700
[PATCH] dvb: rename lgdt3302 frontend module to lgdt330x
Rename lgdt3302 to lgdt330x, to make way for the addition of lgdt3303
support in future revisions.
I am changing the name of this module now so that hopefully the name will
be changed before the release of 2.6.13 ... It wouldn't make sense to
release 2.6.13 with the name lgdt3302 in it, which will only be renamed to
lgdt330x in later versions.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9d2599d98e9cb511f326b2d1b353e462bc360774
Author: Michael Hunold <hunold@linuxtv.org>
Date: Wed Jul 27 11:46:00 2005 -0700
[PATCH] v4l: fix tuning with MXB driver
I noticed that some past changes to the gerneric Video4Linux tuner module
for analog tuners broke my "Multimedia eXtension Board" driver.
The tuner driver was made aware of Video4Linux2 tuning ioctls, but my
driver was not ported and still uses the Video4Linux1 ioctls. This does
not work anymore as intendend, the tuning is currently broken.
The attached patch fixes non-working tuning in MXB driver introduced by
some recent generic tuner changes by replacing Video4Linux1 tuner ioctls
with proper Video4Linux2 tuner ioctls.
- fix non-working tuning in MXB driver introduced by some recent generic
tuner changes by replacing Video4Linux1 tuner ioctls with proper
Video4Linux2 tuner ioctls
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 29780bb7af61752924cf4814f2d8180747b38105
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:59 2005 -0700
[PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
The #define CONFIG_DVB_* are actually CFLAGS set by Makefile. CONFIG_*
namespace is reserved for Kconfig. This renames them back to HAVE_*
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 84de2eff1390a89a76507abc3073dad8de751869
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:58 2005 -0700
[PATCH] v4l: hybrid dvb: move #defines to Makefile
This patch moves #define from cx88-dvb.c and saa7134-dvb.c into Makefile as
CFLAGS, allowing code compatability with video4linux cvs.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0b1cd0c77429083d6ceb379b1d15c6bca165e90b
Author: Michael Krufky <mike@krufky.com>
Date: Wed Jul 27 11:45:57 2005 -0700
[PATCH] v4l: hybrid dvb: fix warnings with -Wundef
This patch adds a missing #ifdef to saa7134-dvb.c (thanks to Mauro Carvalho
Chehab) and changes #if to #ifdef in both files.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d975872c5c94615a12040009cde71c82cddeb1be
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:56 2005 -0700
[PATCH] dvb/v4l: cx88 cleanup
Remove unneeded comment.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 723d52e6a6391e8c4954dca0a7efd3645181981f
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:56 2005 -0700
[PATCH] lgdt3302: warning fix
warning: `i2c_readbytes' defined but not used
This code will either be re-enabled or deleted in a future patch.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0ccef6dbb08770bf21ffc82094c2117bd7977ff8
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:55 2005 -0700
[PATCH] dvb/4vl: RF input selection fir
Select the RF input connector based upon the type of demodulation selected.
ANT RF connector is selected for 8-VSB and CABLE RF connector is selected
for QAM64/QAM256. This only affects the cards that use the Microtune 4042
tuner.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b6aef071bdef0cd9f69113bb3575aa45fafdbbbf
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:54 2005 -0700
[PATCH] dvb/v4l: lgdt3302: isolate tuner
Remove the dvb_pll_desc from the frontend and replace with a
pll_set-callback to isolate the tuner programming from the frontend.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7fd0f3acfa7dfc6e8aba7ce1639b8590ddb98fea
Author: Michael Krufky <mkrufky@m1k.net>
Date: Wed Jul 27 11:45:53 2005 -0700
[PATCH] v4l: fix regression modprobe bttv freezes the computer
Remove redundant bttv_reset_audio() which caused the computer to freeze
with some bt8xx based DVB cards when loading the bttv driver.
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b96d611f373b2cbf5ffc093d859b3a9b1009e096
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:45:52 2005 -0700
[PATCH] VIDEO_SAA7134 must depend on SOUND
VIDEO_SAA7134=y and SOUND=n results in the following compile error:
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x4fafcb): In function `saa7134_initdev':
: undefined reference to `unregister_sound_dsp'
drivers/built-in.o(.text+0x4fb141): In function `saa7134_initdev':
: undefined reference to `register_sound_dsp'
drivers/built-in.o(.text+0x4fb17c): In function `saa7134_initdev':
: undefined reference to `register_sound_mixer'
drivers/built-in.o(.text+0x4fb339): In function `saa7134_finidev':
: undefined reference to `unregister_sound_mixer'
drivers/built-in.o(.text+0x4fb341): In function `saa7134_finidev':
: undefined reference to `unregister_sound_dsp'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 82ee3e6fa347dcba19e36afb23a01020bc2e77e2
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:45:51 2005 -0700
[PATCH] drivers/media/video/tveeprom.c: possible cleanups
This patch contains the following possible cleanups:
- make two needlessly global structs static
- #if 0 the EXPORT_SYMBOL'ed but unused function tveeprom_dump
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9e00e48626474854bf712372fe6656ef4621af0f
Author: Gregory B Frost <frosts1@hotkey.net.au>
Date: Wed Jul 27 11:45:48 2005 -0700
[PATCH] DVICO Fusion DVB-T1 Tuner (LG-Z201) fix
It is a small modification to the table that defines the way that the
LG-Z201 tuner is controlled for the DVICO Fusion DVB-T1 tuner card.
I believe that a mistake was made when the dvb tuner code was reorganised
(to use a generic table for the tuner information instead of inline code)
and as a result, the DVICO card doesn't tune properly.
The modification I have made to the table makes it behave like it did with
the old inline tuner code that worked. The patch is on top of the 2.6.12
kernel.
Signed-off-by: Gregory B Frost <frosts1@hotkey.net.au>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 617b586bca4eda775f93915b8efd586dddf7903c
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:47 2005 -0700
[PATCH] IB: Add core locking documentation to Infiniband
Add core locking documentation to Infiniband
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f13f9f501a6eee14e495aba56ec6f70cf2328180
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:46 2005 -0700
[PATCH] IB: Eliminate sparse warnings in SA client
Eliminate sparse warnings in SA client
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8fd65b096a7ba1fff69c7991f481ebac5498673e
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:45 2005 -0700
[PATCH] IB: Hook up userspace CM to the make system
Hook up userspace CM to the make system
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2d0d099f1950bda2f712364a3bf74f20ddb61190
Author: Tom Duffy <tduffy@sun.com>
Date: Wed Jul 27 11:45:45 2005 -0700
[PATCH] Add kernel portion of user CM implementation (fix)
Include the patch openib-general changing class_simple to class.
Signed-off-by: Tom Duffy <tduffy@sun.com>
Cc: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a5b74540770cb28b8ae779d0c27e228fe7500669
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:44 2005 -0700
[PATCH] IB: Add kernel portion of user CM implementation
Add kernel portion of user CM implementation
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8aa009191d157de53735646552421f3d1595364a
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:43 2005 -0700
[PATCH] IB: Add the header file for user space CM
Add the header file for user space CM. This file defines the ABI used by the
CM for kernel/user communication.
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cb183a06b381652b7637fedfa7ef85ec0baf2a1f
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:42 2005 -0700
[PATCH] IB: Implementation for RMPP support in user MAD
Implementation for RMPP support in user MAD
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3f75daddb4fc6b695faa4e12e76894389e913dcb
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:41 2005 -0700
[PATCH] IB: User MAD ABI changes to support RMPP
User MAD ABI changes to support RMPP
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a977049dacdef6a9e69fb4872b42a68e93a69956
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:40 2005 -0700
[PATCH] IB: Add the kernel CM implementation
Add the kernel CM implementation
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c3e0164758fc24623020e0ad7bd278607b4693e3
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:39 2005 -0700
[PATCH] IB: Add the header file for kernel CM (Communications Manager)
Add the header file for kernel CM (Communications Manager)
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cbae32c56314fa3032f92db36caab49f08ab0601
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:38 2005 -0700
[PATCH] IB: Add Service Record support to SA client
Add Service Record support to SA client
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fa619a77046bef30478697aba0553991033afb8e
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:37 2005 -0700
[PATCH] IB: Add RMPP implementation
Add RMPP implementation.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d2082ee516200095956bd66279be4f62f4a5843d
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:36 2005 -0700
[PATCH] IB: Introduce RMPP APIs
Introduce RMPP APIs
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 497677ab940e637a41351dca6610bc4320abc8f1
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:35 2005 -0700
[PATCH] IB: A couple of IB core bug fixes
Replace be32_to_cpup with be32_to_cpu and fix bug referencing pointer rather
than value in ib_create_ah_from_wc().
Signed-off-by: Tom Duffy <tduffy@sun.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 513789ed995fb2ba72ba2a5bee53ea11d1170580
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:34 2005 -0700
[PATCH] IB: Add ib_create_ah_from_wc to IB verbs
Added new call: ib_create_ah_from_wc. Call will allocate an address handle
given work completion information, including any received GRH.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cabe3cbcbb3b09637b9e706c49eadb180fca057e
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:33 2005 -0700
[PATCH] IB: Fix a couple of MAD code paths
Fixed locking to handle error posting MAD send work requests. Fixed handling
canceling a MAD with an active work request.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 29bb33dd87dbe8db07c2b19df3fb453d999c96de
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:32 2005 -0700
[PATCH] IB: Optimize canceling a MAD
Optimize canceling a MAD.
- Eliminate searching timeout list in cancel case.
- Remove duplicate calls to queue work item.
- Eliminate resending a MAD before MAD is completed.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 03b61ad2f29295f019e095d0f490f30a4d678d3f
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:32 2005 -0700
[PATCH] IB: Add ib_modify_mad API to MAD
Add new MAD layer call to modify (ib_modify_mad) the timeout of a sent MAD,
and simplify cancel code.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2c153b934dca08d58e0aafde18a182e0891aa201
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:31 2005 -0700
[PATCH] IB: Eliminate MAD cache leak associated with local completions
Eliminate MAD cache leak associated with local completions. Also, when
canceling MAD, empty local completion list as well.
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dbf9227bd3dff71c3c2f540cc3e96098d2ab41e7
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:30 2005 -0700
[PATCH] IB: Simplify calling of list_del in MAD
Simplify calling of list_del.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f75b7a5294949cd1b7bc301e3087c7bb78e22520
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:29 2005 -0700
[PATCH] IB: Add automatic retries to MAD layer
Add automatic retries to MAD layer.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit df9f9ead746e9607099d7024f312133944173609
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:28 2005 -0700
[PATCH] IB: Add ib_coalesce_recv_mad to MAD
Add implementation for ib_coalesce_recv_mad. Also, clear allocated MAD data
buffer in ib_create_send_mad.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f68bcc2df8115b4ea45bfa4f8de22ec7232562b5
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:27 2005 -0700
[PATCH] IB: Minor cleanup during MAD startup and shutdown
Minor cleanup during startup and shutdown
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6a0c435ef9e2473934442282054d0f58235d1de2
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:26 2005 -0700
[PATCH] IB: Fix timeout/cancelled MAD handling
Fixes an issue processing a sent MAD after it has timed out or been canceled.
The race occurs when a response MAD matches with the send request. The
request could time out or be canceled after the response MAD matches with the
request, but before the request completion can be processed.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d760ce8f71ec5336c4a750a1293f26c0eb938c8a
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:25 2005 -0700
[PATCH] IB: Change ib_mad_send_wr_private struct
Have ib_mad_send_wr_private reference the private agent structure directly,
rather than the exposed agent definition. Remove unneeded parameters to
functions and simplify code were possible from this change.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f8197a4ed1bba8c80ed6ddf4535ded80cb4152cf
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:24 2005 -0700
[PATCH] IB: Change saving of user's send wr_id in MAD
Move saving of user's send wr_id to better match layering of received response
handling.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4a0754fae8fb5162d1cf4f738d48bb1e8190c09f
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:24 2005 -0700
[PATCH] IB: Combine some MAD routines
Combine response_mad() and solicited_mad() routines into a single function and
simplify/encapsulate its usage.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 824c8ae7d05bb4d21af707832c5bfa45d5494ec8
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:23 2005 -0700
[PATCH] IB: Add MAD helper functions
Add new helper routines for allocating MADs for sending and formatting a send
WR.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b82cab6b331b51d82f90d2207f3bbfdf09361ac9
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:22 2005 -0700
[PATCH] IB: Update MAD client API
Automatically allocate a MR when registering a MAD agent.
MAD clients are modified to use this updated API.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c183a4c33528d17cde0dcb093ae4248d8cb8f649
Author: Hal Rosenstock <halr@voltaire.com>
Date: Wed Jul 27 11:45:20 2005 -0700
[PATCH] IB: Update FMR functions
Change some functions to return void rather than an int since they are always
returning 0, thus making checking return values rather pointless.
Signed-off-by: Tom Duffy <tduffy@sun.com>
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 896e5518da74f9d20db8163526014fba16b1f2b4
Author: Kurt Wall <kwall@kurtwerks.com>
Date: Wed Jul 27 11:45:20 2005 -0700
[PATCH] Add text for dealing with "dot releases" to README
The emergence of so-called "dot releases" that are non-incremental patches
against a base kernel requires different handling of patches (revert
previous patches before applying the newest one). This patch adds a
paragrach to $TOPDIR/README explaining how to do deal with dot release
patches.
Signed-off-by: Kurt Wall <kwall@kurtwerks.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e5c2d749172657ed51e20e4b5ab540447666cc50
Author: Ralf Baechle <ralf@linux-mips.org>
Date: Wed Jul 27 11:45:19 2005 -0700
[PATCH] serial_core whitespace fix
Use tabs for formatting like anywhere else in this file.
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 71ae18ec690953e9ba7107c7cc44589c2cc0d9f1
Author: Blaisorblade <blaisorblade@yahoo.it>
Date: Wed Jul 27 11:45:18 2005 -0700
[PATCH] sys_get_thread_area does not clear the returned argument
sys_get_thread_area does not memset to 0 its struct user_desc info before
copying it to user space... since sizeof(struct user_desc) is 16 while the
actual datas which are filled are only 12 bytes + 9 bits (across the
bitfields), there is a (small) information leak.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 44456d37b59d8e541936ed26d8b6e08d27e88ac1
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:45:17 2005 -0700
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 02b775696fee75a04041d8d94db26a9462216d24
Author: Andreas Gruenbacher <agruen@suse.de>
Date: Wed Jul 27 11:45:16 2005 -0700
[PATCH] reiserfs doesn't use mbcache
reiserfs doesn't use the mbcache, so this can go.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ec0344a2c93c770fe1ef7cdccd8115a69ca100d1
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:45:15 2005 -0700
[PATCH] Documentation/Changes: document the required udev version
Document that udev 058 is required.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8c52ab42c11b5a7fb44bb84c954d09968e90e9e7
Author: Andreas Gruenbacher <agruen@suse.de>
Date: Wed Jul 27 11:45:15 2005 -0700
[PATCH] mbcache: Remove unused mb_cache_shrink parameter
The cache parameter to mb_cache_shrink isn't used. We may as well remove
it.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3dcce8e22bf9956ac2c5233539cac07c978e58c7
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 11:45:14 2005 -0700
[PATCH] ppc64: tpm_infineon build fix
ppc64 uses symbol `DAR', as does the TPM driver, causing a build failure.
Change the TPM name.
Cc: Marcel Selhorst <selhorst@crypto.rub.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ebb81fdb3dd0be7514b84197c4f8388a17130f04
Author: Marcel Selhorst <selhorst@crypto.rub.de>
Date: Wed Jul 27 11:45:12 2005 -0700
[PATCH] tpm: Support for Infineon TPM
This patch provides a new device driver for the Infineon SLD 9630 TT Trusted
Platform Module (TPM 1.1b) [1] which is embedded on Intel- mainboards or in
HP/ Fujitsu-Siemens / Toshiba-Notebooks. A nearly complete list where this
module is integrated in can be found in [2].
This kernel module acts as a communication gateway between the linux kernel
and the hardware chip and fits the TPM-specific interfaces created by IBM in
drivers/char/tpm/tpm.h
Further information about this module and a list of succesfully tested and
therefore supported hardware can be found at our project page [3].
[1]
http://www.infineon.com/cgi/ecrm.dll/ecrm/scripts/public_...
[2]
http://www.tonymcfadden.net/tpmvendors.htm
[3]
http://www.prosec.rub.de/tpm
Signed-off-by: Marcel Selhorst <selhorst@crypto.rub.de>
Acked-by: Kylene Jo Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e77e17161ccb8bd877bf83b3611cd318e451c605
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed Jul 27 11:45:11 2005 -0700
[PATCH] kernel/crash_dump.c: add kerneldoc
Add kerneldoc to kernel/crash_dump.c
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d9fd8a6d443b509147280f058d4e59f0b796a323
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed Jul 27 11:45:11 2005 -0700
[PATCH] kernel/cpuset.c: add kerneldoc, fix typos
Add kerneldoc to kernel/cpuset.c
Fix cpuset typos in init/Kconfig
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 207a7ba8dc000e1b13acac97f3736810dd86e8e2
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed Jul 27 11:45:10 2005 -0700
[PATCH] kernel/capability.c: add kerneldoc
Add kerneldoc to kernel/capability.c
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c293621bbf678a3d85e3ed721c3921c8a670610d
Author: Peter Staubach <staubach@redhat.com>
Date: Wed Jul 27 11:45:09 2005 -0700
[PATCH] stale POSIX lock handling
I believe that there is a problem with the handling of POSIX locks, which
the attached patch should address.
The problem appears to be a race between fcntl(2) and close(2). A
multithreaded application could close a file descriptor at the same time as
it is trying to acquire a lock using the same file descriptor. I would
suggest that that multithreaded application is not providing the proper
synchronization for itself, but the OS should still behave correctly.
SUS3 (Single UNIX Specification Version 3, read: POSIX) indicates that when
a file descriptor is closed, that all POSIX locks on the file, owned by the
process which closed the file descriptor, should be released.
The trick here is when those locks are released. The current code releases
all locks which exist when close is processing, but any locks in progress
are handled when the last reference to the open file is released.
There are three cases to consider.
One is the simple case, a multithreaded (mt) process has a file open and
races to close it and acquire a lock on it. In this case, the close will
release one reference to the open file and when the fcntl is done, it will
release the other reference. For this situation, no locks should exist on
the file when both the close and fcntl operations are done. The current
system will handle this case because the last reference to the open file is
being released.
The second case is when the mt process has dup(2)'d the file descriptor.
The close will release one reference to the file and the fcntl, when done,
will release another, but there will still be at least one more reference
to the open file. One could argue that the existence of a lock on the file
after the close has completed is okay, because it was acquired after the
close operation and there is still a way for the application to release the
lock on the file, using an existing file descriptor.
The third case is when the mt process has forked, after opening the file
and either before or after becoming an mt process. In this case, each
process would hold a reference to the open file. For each process, this
degenerates to first case above. However, the lock continues to exist
until both processes have released their references to the open file. This
lock could block other lock requests.
The changes to release the lock when the last reference to the open file
aren't quite right because they would allow the lock to exist as long as
there was a reference to the open file. This is too long.
The new proposed solution is to add support in the fcntl code path to
detect a race with close and then to release the lock which was just
acquired when such as race is detected. This causes locks to be released
in a timely fashion and for the system to conform to the POSIX semantic
specification.
This was tested by instrumenting a kernel to detect the handling locks and
then running a program which generates case #3 above. A dangling lock
could be reliably generated. When the changes to detect the close/fcntl
race were added, a dangling lock could no longer be generated.
Cc: Matthew Wilcox <willy@debian.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3e5ea098446e19175fdee4c2c4ec9366b0217db4
Author: Christian Borntraeger <cborntra@de.ibm.com>
Date: Wed Jul 27 11:45:06 2005 -0700
[PATCH] s390: use __cpcmd in vmcp_write
vmcp_write uses GPF_DMA for the memory allocation of the response buffer, so
it can use the low level function __cpcmd directly, no need to call the
wrapper.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8ffa7405afe0eaf34db6254160b734f084601f68
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Jul 27 11:45:06 2005 -0700
[PATCH] s390: cpu timer reset in machine check handler
Fix wrong move direction of timer values for cpu accounting in case of a
machine check that indicates a broken cpu timer.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f878e4367580f37327e68ce2c6861245077f0904
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Jul 27 11:45:05 2005 -0700
[PATCH] s390: 31 bit memory size limit
Limit reported memory size to 2GB if running in 31 bit mode.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4111796d89b8cfa36054d65d9858460b5ec0e8c7
Author: Stefan Bader <shbader@de.ibm.com>
Date: Wed Jul 27 11:45:04 2005 -0700
[PATCH] s390: channel tape fixes
Tape driver fixes:
- Added deferred condition handling to tape driver core.
- Added ability to handle busy conditions.
- Code cleanup.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6bb0e01081c2ca585b5e145783fea53bb0589786
Author: Horst Hummel <horst.hummel@de.ibm.com>
Date: Wed Jul 27 11:45:03 2005 -0700
[PATCH] s390: free dasd slab cache
Free dasd slab cache on module unload.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d61f6f3d8b63a2aadcf8b058fe65581ccd8dee97
Author: Horst Hummel <horst.hummel@de.ibm.com>
Date: Wed Jul 27 11:45:02 2005 -0700
[PATCH] s390: fba dasd i/o errors
The FBA discipline does not use retries for failed requests. A request fails
after the first unsuccessful start attempt. There are some rare conditions
(e.g. CIO path recovery) in which the start of an i/o on a fba device can
fail. A tiny amount of retries is therefore reasonable.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c63307f164a79e0ff6dd2da33436c59b3d3396cd
Author: Cornelia Huck <cohuck@de.ibm.com>
Date: Wed Jul 27 11:45:01 2005 -0700
[PATCH] s390: resource accessibility event handling
When processing resource accessibility events, continue searching for further
affected subchannels if a link address is provided in the event information.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1d3ac7aadbccd8456fdca09394ddb570b95fe7dc
Author: Cornelia Huck <cohuck@de.ibm.com>
Date: Wed Jul 27 11:45:00 2005 -0700
[PATCH] s390: debug data for ifcc/ccc
Fix debug data in case of an interface-control or channel-control check: don't
log the not yet accumulated interrupt-response-block, but the one we just
received.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 99b2d8df1d06f1072a949fc1e01a08b94b084d5f
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Jul 27 11:45:00 2005 -0700
[PATCH] s390: external call performance
The kernel uses the SIGP external call order code to signal other CPUs. When
running with dedicated CPUs external calls don't get delivered immediately but
within a fixed polling invervall. This can lead to delays where the system
appears to do nothing. Replace the SIGP external call order with the SIGP
emergency call order since this one gets delivered immediately.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 46ee058cdb3abab9313cc9cb9e9927d7672a718c
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Jul 27 11:44:59 2005 -0700
[PATCH] s390: atomic64 inline functions
The atomic64 primitives are supposed to have 64-bit parameters instead of int.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit afff7e2b3b13dbd26a2b9991d3d571df111d92e8
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Jul 27 11:44:58 2005 -0700
[PATCH] s390: find_next_{zero}_bit fixes
The find_next_{zero}_bit primitives on s390* should never return a bit number
bigger then the bit field size. In the case of a bitfield that doesn't end on
a word boundary, an offset that makes the search start at the last word of the
bit field and the last word doesn't contain any zero/one bits the search is
continued with a call to find_first_bit with a negative size. The search
normally ends pretty quickly because the words following the bit field contain
a mix of zeros and ones. But the bit number that is returned in this case is
too big.
To fix this and additional if to check for this case is needed. To make the
code easier to read I removed the assembler parts from the
find_next_{zero}_bit functions, the C-ified code is as good.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 951f22d5b1f0eaae35dafc669e3774a0c2084d10
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Jul 27 11:44:57 2005 -0700
[PATCH] s390: spin lock retry
Split spin lock and r/w lock implementation into a single try which is done
inline and an out of line function that repeatedly tries to get the lock
before doing the cpu_relax(). Add a system control to set the number of
retries before a cpu is yielded.
The reason for the spin lock retry is that the diagnose 0x44 that is used to
give up the virtual cpu is quite expensive. For spin locks that are held only
for a short period of time the costs of the diagnoses outweights the savings
for spin locks that are held for a longer timer. The default retry count is
1000.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8449d003f323ca7a00eec38905d984ba5ec83a29
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:56 2005 -0700
[PATCH] v850: Define L1_CACHE_SHIFT and L1_CACHE_SHIFT_MAX
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8b2bf06994b9cd6067e5c7620e270eec73fef70b
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:55 2005 -0700
[PATCH] v850: Update PCI support
These changes are untested (I no longer have the hardware).
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 947ac8b9265e2a22552552d011db1e161f802a4a
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:55 2005 -0700
[PATCH] v850: Add pte_file
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 21ea9f63297497df3040c70a67a207d229368a4c
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:54 2005 -0700
[PATCH] v850: Update ioremap return type and add ioread/iowrite functions
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f307d365ea4db4848a0b43bbbdf3c96f4d2e0933
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:53 2005 -0700
[PATCH] v850: Add defconfigs
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4f9a6e101a962dd845eda69fa066184457968228
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:53 2005 -0700
[PATCH] v850: const-qualify first parameter of find_next_zero_bit
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e9c3d6b925e0fdb5e62fad6d81e4004897cfe79d
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 27 11:44:52 2005 -0700
[PATCH] v850: Define pfn_valid
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e63b68de5c9bf68cfb4a272469147b19176d76d6
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:51 2005 -0700
[PATCH] CRIS IDE driver
* Added abstraction layer for subarchs.
* Added v32 support.
* Renamed driver.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 51533b615e605d86154ec1b4e585c8ca1b0b15b7
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:44 2005 -0700
[PATCH] CRIS update: new subarchitecture v32
New CRIS sub architecture named v32.
From: Dave Jones <davej@redhat.com>
Fix swapped kmalloc args
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5d01e6ce785884a5db5792cd2e5bb36fa82fe23c
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:43 2005 -0700
[PATCH] CRIS update: updates for 2.6.12
Patches to make CRIS work with 2.6.12.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dcf1310b72149d016970c666539d4d73bb77c086
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:42 2005 -0700
[PATCH] CRIS update: synchronous serial port driver
Include file for synchronous serial port driver.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8d20a541b089ecb67a88a673548161b686ed7b85
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:42 2005 -0700
[PATCH] CRIS update: SMP
Patches to support SMP.
* Each CPU has its own current_pgd.
* flush_tlb_range is implemented as flush_tlb_mm.
* Atomic operations implemented with spinlocks.
* Semaphores implemented with spinlocks.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 21783c9746619a782c21be606f6498bbd4d4615e
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:40 2005 -0700
[PATCH] CRIS update: profiler
System-level profiler.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 59c61138a556cf89692e0d5bd2c9de5df54b824f
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:40 2005 -0700
[PATCH] CRIS update: pci
Patches to make it possible to add PCI support.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4f18cfbf0990bfc2e8e7706eeb9e5bef898ae923
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:39 2005 -0700
[PATCH] CRIS update: mm
Memory management patches.
* SMP support.
* Non-executable stack (on v32).
* 4-level page tables.
* Added simple Thread Local Storage support.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7cf32cad153d63ac4f6f2d5dd16ddd32ad72d578
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:38 2005 -0700
[PATCH] CRIS update: misc patches
* Start threads with IRQs enabled.
* Move symbol exports to arch specific file.
* Prepare for real command line in the future.
* Handle csum for partition that crosses flash boundary.
* Set utsname.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2e0cea1decf7f21df0496571c218df3b3b8cce99
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:36 2005 -0700
[PATCH] CRIS update: IRQ
Use the generic IRQ framework
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 63245d2cde2be64f172388c2c50862f233c05700
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:35 2005 -0700
[PATCH] CRIS update: I/O and DMA allocator
Added I/O and DMA allocators to be used by drivers.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7e9204265b4ec6680fad9abc7a78b94087983916
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:34 2005 -0700
[PATCH] CRIS update: drivers
Updates to device drivers.
* Use I/O and DMA allocators.
* Use wait_event_interruptible instead of interrutiple_sleep_on.
* Added spinlocks SMP.
* Changed restore_flags to local_irq_restore etc.
* Updated IDE driver include to fit 2.6.12.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 059163cabc01a15b9e2cf10e5de5b6dc06e0da1f
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:32 2005 -0700
[PATCH] CRIS update: debug
Improvements to crash debug code.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 05b4c28cba8dc48505322988340307073c353b1e
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:31 2005 -0700
[PATCH] CRIS update: console
Changes to console.
* Added LF->CRLF translation
* Make use of real console framework.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3e41d6522a6922a95f9d953f4171b45b82b3d6f4
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:30 2005 -0700
[PATCH] CRIS update: configuration and build
Changes to configuration and build system.
* Added v32 sub architecture.
* Use generic hard IRQ.
* Added SMP options.
* Added options to OOPS at NMI and reboot at OOM.
* Made it possible to set objtree.
* Added option to select Kernel GDB serial port.
* Corrected Kconfig usage.
* Added system profiler.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cb09f540a1c5e6c5beb6e82f554d51a1f2c87e67
Author: Mikael Starvik <mikael.starvik@axis.com>
Date: Wed Jul 27 11:44:27 2005 -0700
[PATCH] CRIS update: arch split
Changes necessary to make the sub-arch split complete.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e1637f437f1a2e552e0572e02d46e2c395a4ecaf
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:44:24 2005 -0700
[PATCH] m32r: add missing Kconfig help text
There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dab175f393cdf30fbaec5978682a49dc3c890b2f
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:44:23 2005 -0700
[PATCH] i386: add missing Kconfig help text
There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f2d5c74d778fc59a46f8e173cf986e7320e15e50
Author: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Date: Wed Jul 27 11:44:22 2005 -0700
[PATCH] mips: remove obsolete GIU driver for vr41xx
This patch has removed obsolete GIU driver for vr41xx. This patch already
has been applied to mips tree.
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 488f84994c55927eef587a0827dc957c908a0bad
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Wed Jul 27 11:44:21 2005 -0700
[PATCH] ppc64: remove another fixed address constraint
Presently the LparMap, one of the structures the kernel shares with the
legacy iSeries hypervisor has a fixed offset address in head.S. This patch
changes this so the LparMap is a normally initialized structure, without
fixed address. This allows us to use macros to compute some of the values
in the structure, which wasn't previously possible because the assembler
always uses signed-% which gets the wrong answers for the computations in
question.
Unfortunately, a gcc bug means that doing this requires another structure
(hvReleaseData) to be initialized in asm instead of C, but on the whole the
result is cleaner than before.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 533f08172e21521a74e15cdef8a13c929596d506
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Wed Jul 27 11:44:19 2005 -0700
[PATCH] ppc64: dynamically allocate segment tables
PPC64 machines before Power4 need a segment table page allocated for each
CPU. Currently these are allocated statically in a big array in head.S for
all CPUs. The segment tables need to be in the first segment (so
do_stab_bolted doesn't take a recursive fault on the stab itself), but
other than that there are no constraints which require the stabs for the
secondary CPUs to be statically allocated.
This patch allocates segment tables dynamically during boot, using
lmb_alloc() to ensure they are within the first 256M segment. This reduces
the kernel image size by 192k...
Tested on RS64 iSeries, POWER3 pSeries, and POWER5.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6fdfb382813d66757aef4d83e369f8153a40b371
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:44:18 2005 -0700
[PATCH] make a few functions static in pmac_setup.c
Making a few functions static saves a few bytes, but only on ppc32.
text data bss dec hex filename
3752421 1605208 345608 5703237 570645 ../O-ppc64_iSeries_defconfig/vmlinux
3709411 2042552 339992 6091955 5cf4b3 ../O-ppc64_maple_defconfig/vmlinux
5397329 3054824 679856 9132009 8b57e9 ../O-ppc64_pSeries_defconfig/vmlinux
-3882695 417552 197760 4498007 44a257 ../O-ppc_common_defconfig/vmlinux
-3414510 574500 241440 4230450 408d32 ../O-ppc_pmac_defconfig/vmlinux
+3882627 417168 197760 4497555 44a093 ../O-ppc_common_defconfig/vmlinux
+3414442 575428 241440 4231310 40908e ../O-ppc_pmac_defconfig/vmlinux
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 62b662a30963c2e7bdfc129f78c3da0559202379
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 11:44:17 2005 -0700
[PATCH] ppc64: genrtc build fix
genrtc.c won't compile on ppc64. Seems that ppc32 does support it though?
We do this wrong btw - we should be selecting GEN_RTC in each
arch/xxx/Kconfig.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 64c74de7a3a744bc546ef76872be6285307ce101
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:44:16 2005 -0700
[PATCH] ppc64: hide CONFIG_ADB
This bites me all day when I use our default config for ppc64. We use a
patch to fix the compile errors and provide the CONFIG_MAC_EMUMOUSEBTN
functionality (which is behind CONFIG_INPUT_ADBHID). But Benh doesnt like
it.
http://ozlabs.org/pipermail/linuxppc64-dev/2005-March/003...
Just hide all the ADB parts from via-pmu on ppc64 instead.
drivers/macintosh/adbhid.c: In function `adbhid_init':
drivers/macintosh/adbhid.c:1199: error: `_MACH_chrp' undeclared (first use in this function)
drivers/macintosh/adbhid.c:1199: error: (Each undeclared identifier is reported only once
drivers/macintosh/adbhid.c:1199: error: for each function it appears in.)
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1bc3a1ec6030f7a6a9e78172e1221be9baed68e8
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:44:15 2005 -0700
[PATCH] ppc64: update defconfigs
update defconfig, use new CONFIG_HZ and set it to 100 just for the kicks.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c64d7b4cea71b6841d9d96d390aed323c9fe1c9d
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:14 2005 -0700
[PATCH] ppc32: Fix building of TQM8260 board
Added missing include of cpm2.h in correct order to allow TQM8260 to build
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 757569295d4204b4e00dd9294790e09ed5a2ffd2
Author: Eugene Surovegin <ebs@ebshome.net>
Date: Wed Jul 27 11:44:13 2005 -0700
[PATCH] ppc32: fix 440SP MAL channels count
Fix the MAL channels count in PPC 440SP OCP definition. PPC 440SP has only
1 EMAC attached to MAL.
Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9f6a3d083729c76ced92106c259f0e6536a2eaea
Author: Matt Porter <mporter@kernel.crashing.org>
Date: Wed Jul 27 11:44:12 2005 -0700
[PATCH] ppc32: fix dma_map_page() to use page_to_bus()
The following trivial patch changes dma_map_page() to use page_to_bus()
instead of open-coding it (incorrectly in some cases).
Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 15ce2982c6bc41ccd7f2cbca63e024aa9044c000
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:11 2005 -0700
[PATCH] ppc32: Fix building of radstone_ppc7d
Updated radstone_ppc7d_defconfig to include the ds1337 driver which is used
by the platform code. This fixes the link error when building.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 571e63fc839e57965749acf19d58b3cbbef5d06a
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:10 2005 -0700
[PATCH] ppc32: Fix building of prpmc750
Updated prpmc750 platform code to include serial_reg.h to fix building.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 127384524b31d99bc3f9e2d2e7af4a5fad572235
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:10 2005 -0700
[PATCH] ppc32: Fix typo in setup of 2nd PCI bus on 85xx
Typo bug that was using PCI1 defines instead of PCI2 when setting up the
second PCI bus controller on 85xx based systems. This hasn't been a real
issue since currently the PCI2 sizes are the same as the PCI1 sizes for
currently supported boards.
Thanks to Andrew Klossner @ Xerox for point this out.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c41b72d5bd590e6ff781d6bdfc71595f3996bacf
Author: Downing, Thomas <Thomas.Downing@ipc.com>
Date: Wed Jul 27 11:44:09 2005 -0700
[PATCH] ppc32: fix compilation error with CONFIG_PQ2FADS
The 2.6.12.3 kernel compilation fails for ARCH=ppc when CONFIG_PQ2FADS=y.
This patch has been tested on Freescale PQ2FADS-ZU and -VR boards.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3a1ce8aa2d9611a779c308fbf332ae86217b0df6
Author: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Wed Jul 27 11:44:08 2005 -0700
[PATCH] ppc32: 8xx: update DataTLBMiss exception comment
On PPC 8xx, the DataTLBMiss handler does not jump directly to the page
fault handler, as was the case in v2.4.
It instead loads an invalid TLB which causes a subsequent DataTLBError
exception.
The comment on top of it haven't been update to reflect the change, though.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 13e886c3b435d14668aefaed449d8d7ca6dce3a8
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:07 2005 -0700
[PATCH] ppc32: Make the UARTs on MPC824x individual platform devices
The UARTs on the MPC824x are unique devices and really shouldn't be thought
of as a DUART. In addition, if both UARTs are in use we need to configure
the part to enable the 2nd UART since the pins for the UARTs are
multiplexed. Adds support to run the 824x Sandpoint with both UARTs if
desired.
Signed-off-by: Matt McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d054b5acfe1f68460fe70aff5028ad95a7a38140
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:44:06 2005 -0700
[PATCH] ppc32: Add proper prototype for cpm2_reset()
Added a proper prototype for cpm2_reset() which gets rid of a build
warning.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 694e50db5d75f4c29011d7d15e069a95aded8af1
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:44:04 2005 -0700
[PATCH] ppc32: update defconfigs
update pmac_defconfig
enable all relevant options in common_defconfig,
so it can serve as a compiletest for PPC_MULTIPLATFORM configuration
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7b625c001a897394b969becac3358d733728d02b
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:44:03 2005 -0700
[PATCH] ppc/ppc64: use Kconfig.hz
use new Kconfig.hz on ppc/ppc64, use also Kconfig.preempt for ppc
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a
Author: Andy Whitcroft <apw@shadowen.org>
Date: Wed Jul 27 11:44:02 2005 -0700
[PATCH] Remove bogus warning in page_alloc.c
Originally __free_pages_bulk used the relative page number within a zone to
define its buddies. This meant that to maintain the "maximally aligned"
requirements (that an allocation of size N will be aligned at least to N
physically) zones had to also be aligned to 1<<MAX_ORDER pages. When
__free_pages_bulk was updated to use the relative page frame numbers of the
free'd pages to pair buddies this released the alignment constraint on the
'left' edge of the zone. This allows _either_ edge of the zone to contain
partial MAX_ORDER sized buddies. These simply never will have matching
buddies and thus will never make it to the 'top' of the pyramid.
The patch below removes a now redundant check ensuring that the mem_map was
aligned to MAX_ORDER.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Cc: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 165cd40235732644b1856a5ed5e158c9b93f6010
Author: suzuki <suzuki@in.ibm.com>
Date: Wed Jul 27 11:43:59 2005 -0700
[PATCH] madvise() does not always return -EBADF on non-file mapped area
The madvise() system call returns -EBADF for areas which does not map to
files, only for *behaviour* request MADV_WILLNEED.
According to man pages, madvise returns :
EBADF - the map exists, but the area maps something that isn't a file.
Fixes bug 2995.
Signed-off-by: Suzuki K P <suzuki@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4bfdf37830111321e2cd1fe0102dd776ce93194d
Author: Andrey Panin <pazke@donpac.ru>
Date: Wed Jul 27 11:43:58 2005 -0700
[PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling
Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess duplicated in
almost every watchdog driver and replaces it with common define in
linux/watchdog.h.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7657e20e46e26b198b24e2aefc696410bbe889c9
Author: Brian Gerst <bgerst@didntduck.org>
Date: Wed Jul 27 11:43:57 2005 -0700
[PATCH] Fix warning in powernow-k8.c
powernow-k8.c: In function `query_current_values_with_pending_wait':
powernow-k8.c:110: warning: `hi' may be used uninitialized in this function
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bbaf364103cee15c895e2086723d0ad9ef47ae99
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed Jul 27 11:43:56 2005 -0700
[PATCH] drm: via: fix sparse warnings
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit db1de1595d03d3ddea3e0548b20decb0a32e4258
Author: David Ranson <spam.david.trap@unsolicited.net>
Date: Wed Jul 27 11:43:55 2005 -0700
[PATCH] serial: MRi MRI-PCIDS1 dual port serial card
Add support for the MRi PCIDS1 dual port serial card. This card is a
little controversial since it is the subject of a PCI vendor/device ID
clash. (See
http://www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516...). I have
for now just used the hex ID 0x950a. The divisor was part calculated part
iterated, so may not be exactly correct (but works for me at all settings
between 300 - 115300 bps).
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7e8c9e14e8fdce0af9f5eed7ce6dd26b91fc8f4e
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 11:43:55 2005 -0700
[PATCH] statically link halfmd4
For some reason halfmd4 isn't being linked into the kernel any more and
modular ext3 wants it.
So statically link the halfmd4 code into the kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1aaf18ff9de1f37bf674236fc0779c3aaa65b998
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 11:43:54 2005 -0700
[PATCH] check_user_page_readable() deadlock fix
Fix bug identifued by Richard Purdie <rpurdie@rpsys.net>.
oprofile calls check_user_page_readable() from interrupt context, so we
deadlock over various VFS locks.
But check_user_page_readable() doesn't imply either a read or a write of the
page's contents. Change __follow_page() so that check_user_page_readable()
can tell __follow_page() that we're not accessing the page's contents, and use
that info to avoid the troublesome lock-takings.
Also, make follow_page() inline for the single callsite in memory.c to save a
bit of stack space.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0cfc11ed45e4c00750039e5a18c0fc0d681e19db
Author: Carsten Otte <cotte@freenet.de>
Date: Wed Jul 27 11:43:52 2005 -0700
[PATCH] fix xip sparse file handling in ext2
Oliver Paukstadt from our test department is testing the xip patches in
Linus' git-tree. He found a problem that shows when reading a file that
contains sparse blocks (holes) on a -o xip mounted ext2 filesystem: the
BUG_ON() in fs/ext2/xip.c:40 triggers where it should not. The problem was
introduced by a cleanup in my previous patch, this patch fixes it.
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1872bcebbcd6ad7ddd99e92fb1e4f3d19e73919c
Author: Pete Zaitcev <zaitcev@redhat.com>
Date: Wed Jul 27 11:43:51 2005 -0700
[PATCH] ub: fix for blank CDs
This patch fixes a microcode lockup in my CD-ROM adapters when a blank CD
is inserted. However, do not try to burn CDs yet! I'm pretty sure that
trying it will end in coasters.
- Fix a few cases where we were unable to resynchronize with replies
for previous commands. The main thing is to keep reading replies
in case of a stall. This is done with the new state CLRRS.
- Since I am forgetting the basic state machine already, document it.
- Move counter increments in the looping path in its own function.
- Fix a harmless buglet in case CSW read fails to submit: do not
override state.
- Implement the Alan Stern's idea for adaptive signature checking.
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 90c5029e471636f21221bf66b9a46ada2ab79a22
Author: Andi Kleen <ak@muc.de>
Date: Wed Jul 27 11:43:50 2005 -0700
[PATCH] Undo mempolicy shared policy rbtree microoptimization
All mempolicy changes must be inside the spinlock and readding the rb_erase
prevents a crash while doing:
> echo "1" > /tmp/numatest
> numactl --length=0x4000 --shm /tmp/numatest --localalloc
> numactl --length=0x2000 --offset=0 --shm /tmp/numatest --membind=0
> numactl --length=0x2000 --offset=0x2000 --shm /tmp/numatest --membind=1
> ipcs
> ipcrm -M "the_key_value_of_this_shm_area"
Based on a patch by John Blackwood
Cc: <john.blackwood@ccur.com>
Cc: <andrea@suse.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c223695634fb360ed65e5a811161853a05e46962
Author: V. ANANDA KRISHNAN <mansarov@us.ibm.com>
Date: Wed Jul 27 11:43:49 2005 -0700
[PATCH] jsm: warning fixes
- updates the version
- fix mixing of declarations and code. The mixing of declarations and
code displays warnings when used against RedHat RHEL4.0 distro (compiler
version is 3.4.3-22.1) and hence I separated them out.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9539c1d495c8d92837e7b6382a1219ac275b94b2
Author: V. ANANDA KRISHNAN <mansarov@us.ibm.com>
Date: Wed Jul 27 11:43:48 2005 -0700
[PATCH] jsm: use dynamic major number allocation
The jsm driver uses a static number of 253. The major number 253 is a
reserved for "LOCAL/EXPERIMENTAL USE" by both char and block devices. So
take advantage of the dynamic allocation of major number by the kernel.
Signed-off-by: V. Ananda Krishnan <mansarov@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 49f29915856435ad8e34a4a3a907b09682a5826e
Author: Olivier Blin <oblin@mandriva.com>
Date: Wed Jul 27 11:43:47 2005 -0700
[PATCH] i4l: add Olitec ISDN PCI card in hisax gazel driver
This patch adds support for the Olitec ISDN PCI card in the hisax gazel
driver. The gazel driver supports this card, but wasn't aware of its PCI
ids. Users used to modify the PCI ids of a supported card in
include/linux/pci_ids.h and recompile their kernel to get this card
running, as said in most Howtos. This patch makes the hisax gazel driver
recognize the PCI ids of the Olitec ISDN PCI card.
Signed-off-by: Olivier Blin <oblin@mandriva.com>
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b24b1033451fcc87087a692fc47ca45daebd51ac
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Wed Jul 27 11:43:46 2005 -0700
[PATCH] scsi_scan: check return code from scsi_sysfs_add_sdev
Adds a missing check for an error return code from scsi_sysfs_add_sdev.
This resolves entry #4863 in the OSDL bugzilla. Although in that bug
report the failure occurred because of a confusion over scanning vs.
rescanning, in general add_sdev can fail for a number of reasons (the
simplest being insufficient memory) and the caller should cope properly.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 104e49fc1e1656142869fab0e75d7df52b72eed9
Author: Ian Kent <raven@themaw.net>
Date: Wed Jul 27 11:43:45 2005 -0700
[PATCH] autofs4: fix infamous "Busy inodes after umount ..." message
If the automount daemon receives a signal which causes it to sumarily
terminate the autofs4 module leaks dentries. The same problem exists with
detached mount requests without the warning.
This patch cleans these dentries at umount.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0f94c8e1256fcb786e1918e30bdaeccf669bf63c
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed Jul 27 11:43:44 2005 -0700
[PATCH] Add pcibios_bus_to_resource for parisc
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d912d1ff218195c248c770eb677726695e07aa40
Author: George Anzinger <george@mvista.com>
Date: Wed Jul 27 11:43:44 2005 -0700
[PATCH] itimer fixes
Fix the recent off-by-one fix in the itimer code:
1. The repeating timer is figured using the requested time
(not +1 as we know where we are in the jiffie).
2. The tests for interval too large are left to the time_val to jiffie code.
Signed-off-by: George Anzinger <george@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b7343f01e326374e69666ca6001bdb6a7c67e9f7
Author: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Wed Jul 27 11:43:42 2005 -0700
[PATCH] watchdog: add missing 0x in alim1535_wdt.c
Usually the device IDs are given in hex. This one is a bit strange: it is
without 0x in the first place and used with it some lines later. I suspect
the first one to be the wrong.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bba0e4670a4e1841a96b561dcc60ebe335049891
Author: Nigel Cunningham <ncunningham@cyclades.com>
Date: Wed Jul 27 11:43:41 2005 -0700
[PATCH] Address BUG: using smp_processor_id() in preemptible [00000001] code
This patch fixes a warning in the disable_nonboot_cpus call in
kernel/power/smp.c.
Signed-off by: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9a14d4c898285623d1f5c338b659fa82cf4480fb
Author: Adrian Bunk <bunk@stusta.de>
Date: Wed Jul 27 11:43:41 2005 -0700
[PATCH] drivers/pnp/pnpbios/rsparser.c: fix compile error with PCI=n
drivers/pnp/pnpbios/rsparser.c: In function 'pnpbios_parse_allocated_irqresource':
drivers/pnp/pnpbios/rsparser.c:67: error: too many arguments to function
'pcibios_penalize_isa_irq'
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ab6862e6dab813ecde9ae7da506188dc1e9f11bb
Author: Jan Kara <jack@suse.cz>
Date: Wed Jul 27 11:43:40 2005 -0700
[PATCH] ext3: drop quota references before releasing inode
We must drop references to quota structures before releasing the inode.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c7e9a52ef0089492bba457dfb8eba1a54e19f24a
Author: Jan Kara <jack@suse.cz>
Date: Wed Jul 27 11:43:39 2005 -0700
[PATCH] ext2: drop quota reference before releasing inode
We must drop references to quota structures before releasing the inode.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b3bb8afd965159f155d4f629cbea158cbcc69275
Author: Jeff Mahoney <jeffm@suse.com>
Date: Wed Jul 27 11:43:38 2005 -0700
[PATCH] reiserfs: fix deadlock in inode creation failure path w/ default ACL
reiserfs_new_inode() can call iput() with the xattr lock held. This will
cause a deadlock to occur when reiserfs_delete_xattrs() is called to clean
up.
The following patch releases the lock and reacquires it after the iput.
This is safe because interaction with xattrs is complete, and the relock is
just to balance out the release in the caller.
The locking needs some reworking to be more sane, but that's more intrusive
and I was just looking to fix this bug.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c9b3ad673460fc997a652cd58aa3a345d40e5218
Author: Jens Axboe <axboe@suse.de>
Date: Wed Jul 27 11:43:37 2005 -0700
[PATCH] as-iosched tunable encoding fix
AS is doing internal msec<->jiffies conversions twice, so the sysfs tunables
which represent time are coming out wrong. The switch from HZ=1000 exposed
this.
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ef2a701d444a4ea9790146e92756b0dde5070a15
Author: Nigel Cunningham <ncunningham@cyclades.com>
Date: Wed Jul 27 11:43:36 2005 -0700
[PATCH] Fix missing refrigerator invocation in jffs2
Here's a patch to fix a missing refrigerator call in jffs2.
Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5e50e7a99d04774506f4e1dee51afba37125cd3c
Author: Nigel Cunningham <ncunningham@cyclades.com>
Date: Wed Jul 27 11:43:35 2005 -0700
[PATCH] Add missing tvaudio try_to_freeze()
Tvaudio lacks a refrigerator call. This patch fixes that.
Signed-off-by: Nigel Cunningham <ncunningham@suspend2.net>
Cc: <video4linux-list@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0e6c1f5facffd94000832d402be1ea75f73c90e3
Author: Nigel Cunningham <ncunningham@cyclades.com>
Date: Wed Jul 27 11:43:34 2005 -0700
[PATCH] try_to_freeze() call fixes
Here are fixes for four try_to_freeze calls that are still (incorrectly)
using a parameter after the recent try_to_freeze() changes.
Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 54264911ce8c3f4a9e7fc193bc78a85e04df7fa0
Author: Andi Kleen <ak@muc.de>
Date: Wed Jul 27 11:43:34 2005 -0700
[PATCH] x86_64: fix SMP boot lockup on some machines
Fixes boot up lockups on some machines where CPU apic ids don't start with
0
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0d4579ed553e8bb29d580c08bfcabcb0826a89c3
Author: Jeff Dike <jdike@addtoit.com>
Date: Wed Jul 27 11:43:33 2005 -0700
[PATCH] uml: fix misdeclared function
This fixes an interface which differed from its declaration, and includes
the relevant header so that this doesn't happen again.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 20a64f1d70a1a9cc001f2fec5ba1b0a4ff3f6bd5
Author: Dominik Hackl <dominik@hackl.dhs.org>
Date: Wed Jul 27 11:43:32 2005 -0700
[PATCH] uml: update module interface
This patch replaces the deprecated MODULE_PARM function by the new
module_param function.
Signed-off-by: Dominik Hackl <dominik@hackl.dhs.org>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cb66504d65e54210d7dc55a0027d309ca5f51f83
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Wed Jul 27 11:43:31 2005 -0700
[PATCH] uml: add skas0 command-line option
This adds the "skas0" parameter to force skas0 operation on SKAS3 host and
shows which operating mode has been selected.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b6b038a24a826fe22d9823722cfbbbd3ad7a3021
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:43:30 2005 -0700
[PATCH] uml: add dependency to arch/um/Makefile for parallel builds
the header file must be build before mk_user_constants. Adding it as a
direct dep doesnt work for some reason.
arch/um/os-Linux/util/mk_user_constants.c:2:26: error: user-offsets.h: No such file or
directory
arch/um/os-Linux/util/mk_user_constants.c: In function 'main':
arch/um/os-Linux/util/mk_user_constants.c:17: error: '__UM_FRAME_SIZE' undeclared (first use in
this function)
arch/um/os-Linux/util/mk_user_constants.c:17: error: (Each undeclared identifier is reported
only once
arch/um/os-Linux/util/mk_user_constants.c:17: error: for each function it appears in.)
make[1]: *** [arch/um/os-Linux/util/mk_user_constants] Error 1
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8648373af214d3c74b81e78049a64dad986c1024
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 27 11:43:29 2005 -0700
[PATCH] uml: readd missing define to arch/um/Makefile-i386
scripts/Makefile.build:13: /Makefile: No such file or directory
scripts/Makefile.build:64: kbuild: Makefile.build is included improperly
the define was removed, but its still required to build some targets.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4b5c7ae83704320e2afb0912f4c42eadabc7535b
Author: NeilBrown <neilb@cse.unsw.edu.au>
Date: Wed Jul 27 11:43:28 2005 -0700
[PATCH] md: when resizing an array, we need to update resync_max_sectors as well as size
Without this, and attempt to 'grow' an array will claim to have synced the
extra part without actually having done anything.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b38817dda45bc2990a8d593f3a1b4d444b2dcf4f
Author: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Date: Wed Jul 27 11:43:28 2005 -0700
[PATCH] mips: fbdev Kcofnig fix
arch/mips/Kconfig is defining CONFIG_FB as bool and drivers/video/Kconfig
was changed a while ago to define it as tristate. Remove the MIPS
definition.
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c10b873695c6a1de0d8ebab40b525575ca576683
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed Jul 27 11:43:27 2005 -0700
[PATCH] Really __nocast-annotate kmalloc_node()
One chunk was lost somewhere between my and Andrew's machine.
Noticed by Victor Fusco.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8c86cb127b2b7614903cb2a38db3207488a0405a
Author: Kumar Gala <galak@freescale.com>
Date: Wed Jul 27 11:43:26 2005 -0700
[PATCH] I2C-MPC: Restore code removed
A previous patch to remove support for the OCP device model was way to
generious and moved some of the platform device model code, oops.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 388b0925f59461cb482447ea87e6942b5653ee1d
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Jul 27 11:43:25 2005 -0700
[PATCH] user_mode_vm() build fix
include/asm/ptrace.h: In function `user_mode_vm':
include/asm/ptrace.h:67: `VM_MASK' undeclared (first use in this function)
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 48b0e5487fcdcb3421bda67666277348b2bd2661
Author: David S. Miller <davem@davemloft.net>
Date: Wed Jul 27 16:08:44 2005 -0700
[SPARC64]: Fix ugly dependency on NR_CPUS being a power-of-2.
The page->flags D-cache dirty state tracking depended upon
NR_CPUS being a power-of-2 via it's "NR_CPUS - 1" masking.
Fix that to use a fixed (256 - 1) mask as that is the limit
imposed by thread_info->cpu which is a "u8".
Finally, add a compile time check that NR_CPUS is not greater
than 256.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5e43db7730e7cef7d37968ea789c41392519a864
Author: Matt Mackall <mpm@selenic.com>
Date: Wed Jul 27 15:24:42 2005 -0700
[NET]: Move in_aton from net/ipv4/utils.c to net/core/utils.c
Move in_aton to allow netpoll and pktgen to work without the rest of
the IPv4 stack. Fix whitespace and add comment for the odd placement.
Delete now-empty net/ipv4/utils.c
Re-enable netpoll/netconsole without CONFIG_INET
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 614d73edae68836f7659ee8efec90878e6215fb1
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed Jul 27 23:00:05 2005 +0100
[ARM SMP] Fix data corruption in test_* bitops
If we found that the bit was already in the desired state, we
would skip performing the operation, and write random data back.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7cee432a22bb328ea7a4012dacc5a3471fabeb07
Author: Nick Sillik <n.sillik@temple.edu>
Date: Wed Jul 27 14:46:03 2005 -0700
[NETFILTER]: Fix -Wunder error in ip_conntrack_core.c
Signed-off-by: Nick Sillik <n.sillik@temple.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6d376756f2cf3478d5a4fdb8d18e958948366b9d
Author: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Wed Jul 27 14:42:45 2005 -0700
[IB/mthca]: Use io_remap_pfn_range for PCI space
Use io_remap_pfn_range to remap IO pages (remap_pfn_range is for memory).
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
commit 2181858bb814b51de8ec25b3ddd37cd06c53b0c9
Author: Roland Dreier <roland@eddore.topspincom.com>
Date: Wed Jul 27 14:41:32 2005 -0700
[IB/ipoib]: Fix unsigned comparisons to handle wraparound
Fix handling of tx_head/tx_tail comparisons to handle wraparound.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
commit abdf119b4dad015803819c3d046d20cfbd393e87
Author: Gleb Natapov <glebn@voltaire.com>
Date: Wed Jul 27 14:40:00 2005 -0700
[IB/uverbs]: Add O_ASYNC support
Add support for O_ASYNC notifications on userspace verbs
completion and asynchronous event file descriptors.
Signed-off-by: Gleb Natapov <glebn@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
commit 42b1806d5cfc93bf8c3d7fa6e9e79e4ec860c678
Author: Roland Dreier <roland@eddore.topspincom.com>
Date: Wed Jul 27 14:38:49 2005 -0700
[IB/mthca]: Fix error CQ entry handling on mem-free HCAs
Fix handling of error CQ entries on mem-free HCAs: the doorbell count
is never valid so we shouldn't look at it. This fixes problems exposed
by new HCA firmware.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
commit a77be819f94fc55627ee257f496198ad703aaad4
Author: Kyle Moffett <mrmacman_g4@mac.com>
Date: Wed Jul 27 14:22:30 2005 -0700
[NET]: Fix setsockopt locking bug
On Sparc, SO_DONTLINGER support resulted in sock_reset_flag being
called without lock_sock().
Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b833961bd30eec201b9a94eec36aa7ac96f9c9c0
Author: Keith Owens <kaos@sgi.com>
Date: Thu Jul 21 23:41:00 2005 -0700
[IA64] unwind.c uses wrong unat from switch_stack
unwind.c can read the wrong unat bits from switch_stack.
sw->caller_unat is the value of ar.unat when the task was blocked.
sw->ar_unat is the value of ar.unat after doing st8.spill for r4-7.
IOW, ar_unat is caller_unat with 4 bits changed.
unw_access_gr() uses sw->ar_unat for r4-7 (correct), but it also uses
sw->ar_unat for other scratch registers (incorrect). sw->ar_unat
should only be used for r4-7, everything else should use
sw->caller_unat, unless modified by unwind info. Using sw->ar_unat
risks picking up the 4 bits that were overwritten when r4-7 were saved.
Also this line is wrong
unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_UNAT);
and should be
unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_PFS);
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 40a085c41dc3d5991fdf90ed2557cc06cce0590a
Author: David S. Miller <davem@davemloft.net>
Date: Wed Jul 27 14:14:39 2005 -0700
[SPARC]: Add inotify syscall entries.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cbcd2a4cca1a6223e4f98661ef524919d322675e
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed Jul 27 13:04:35 2005 -0700
[NET]: Improve presentation of networking driver families.
Suggestion from Sam Ravnborg <sam@ravnborg.org>
It causes all driver families to be displayed aligned immediately under the
main network drivers heading (in menuconfig/xconfig/gconfig) instead of
not being subordinate to (i.e., not indented) the Network device support
heading at all.
The improved network driver families are:
token ring, wireless, PCMCIA, WAN, ATM, and S390.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit eaa1c5d05947819643b2e72cbfc51ae2ddcf1991
Author: Hans-Juergen Tappe (SYSGO AG) <hjt@sysgo.com>
Date: Wed Jul 27 13:00:04 2005 -0700
[IPV4]: Fix Kconfig syntax error
From: "Hans-Juergen Tappe (SYSGO AG)" <hjt@sysgo.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d108919b2b5c064946c9bd30cbd4761d491cddb0
Author: Robert Love <rml@novell.com>
Date: Wed Jul 27 08:58:00 2005 -0700
[IA64] inotify: ia64 syscalls.
Attached patch adds the inotify syscalls to ia64.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit c2834cf4746cf13501efc3489b1895bce58a4ccb
Merge: 05cb784c81a0fd1f97732156ea464bd392ce875a 9e566d8bd61f939b7f5d7d969f5b178571471cf9
Author: Tony Luck <tony.luck@intel.com>
Date: Wed Jul 27 10:36:54 2005 -0700
Auto merge with /home/aegl/GIT/linus
commit 9e566d8bd61f939b7f5d7d969f5b178571471cf9
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 21:41:38 2005 -0700
[PATCH] x86_64 fsnotify build fix
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 479d0f41e50646a618c43f69af7af31a8f748433
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 21:41:38 2005 -0700
[PATCH] softdog build fix
drivers/char/watchdog/softdog.c:94: too many arguments to function `emergency_restart'
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cc1d3a9a78f0f602fa1e7993dba4d16ad9781bc1
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 21:41:37 2005 -0700
[PATCH] eurotechwdt build fix
drivers/char/watchdog/eurotechwdt.c:165: too many arguments to function `emergency_restart'
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ae6578fe9b65208dee8eda40629984efd23740c4
Author: Chuck Ebbert <76306.1226@compuserve.com>
Date: Tue Jul 26 21:57:24 2005 -0400
[PATCH] i386: clean up user_mode macros
- make the new user_mode() return 0 or 1 (same as x86_64)
- remove conditional jump from user_mode_vm() it's called every timer
tick on each CPU on SMP)
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4d7de66e2cc508761f050d1d4eaca88a6e6f711e
Merge: e93adf1e6554511a6194f4785fd29af8e41104db a4f1bac62564049ea4718c4624b0fadc9f597c84
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Jul 26 16:43:39 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit e93adf1e6554511a6194f4785fd29af8e41104db
Author: Tom Rini <trini@kernel.crashing.org>
Date: Tue Jul 26 12:49:53 2005 -0700
[PATCH] Change PowerPC MPC8xx maintainer
As Marcelo has been spending a great deal of time working on MPC8xx
systems of late (thanks!) and has more time than I do now for it, I'm
handing this over to him.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a4f1bac62564049ea4718c4624b0fadc9f597c84
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Jul 26 15:43:17 2005 -0700
[XFRM]: Fix possible overflow of sock->sk_policy
Spotted by, and original patch by, Balazs Scheidler.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d46523ea32a79fbc8cd1237f9441f45cc3f02456
Author: Steven Rostedt <rostedt@goodmis.org>
Date: Mon Jul 25 16:28:39 2005 -0400
[PATCH] fix MAX_USER_RT_PRIO and MAX_RT_PRIO
Here's the patch again to fix the code to handle if the values between
MAX_USER_RT_PRIO and MAX_RT_PRIO are different.
Without this patch, an SMP system will crash if the values are
different.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cadf01c2fc0cd66dfef4956ef1a6482ed01c3150
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Jul 26 15:39:28 2005 -0700
[NETFILTER]: Fix ip_conntrack_put() prototype.
The function is not inline.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 18586e721636527cb5177467fb17e2350615978a
Author: Andreas Steinmetz <ast@domdv.de>
Date: Sat Jul 23 13:42:04 2005 +0200
[PATCH] Fix RLIMIT_RTPRIO breakage
RLIMIT_RTPRIO is supposed to grant non privileged users the right to use
SCHED_FIFO/SCHED_RR scheduling policies with priorites bounded by the
RLIMIT_RTPRIO value via sched_setscheduler(). This is usually used by
audio users.
Unfortunately this is broken in 2.6.13rc3 as you can see in the excerpt
from sched_setscheduler below:
/*
* Allow unprivileged RT tasks to decrease priority:
*/
if (!capable(CAP_SYS_NICE)) {
/* can't change policy */
if (policy != p->policy)
return -EPERM;
After the above unconditional test which causes sched_setscheduler to
fail with no regard to the RLIMIT_RTPRIO value the following check is made:
/* can't increase priority */
if (policy != SCHED_NORMAL &&
param->sched_priority > p->rt_priority &&
param->sched_priority >
p->signal->rlim[RLIMIT_RTPRIO].rlim_cur)
return -EPERM;
Thus I do believe that the RLIMIT_RTPRIO value must be taken into
account for the policy check, especially as the RLIMIT_RTPRIO limit is
of no use without this change.
The attached patch fixes this problem.
Signed-off-by: Andreas Steinmetz <ast@domdv.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fc00a6274b786f6863b32c79ff6f92aa0960b789
Merge: 0983f0509480f95584f8e945e5b9c5310e9038f3 a8d11e3d0282e9607f65c73383c4030fd8f0e972
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Jul 26 15:13:26 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 0983f0509480f95584f8e945e5b9c5310e9038f3
Merge: db776a14f327c20d4984ac4b724a934df34bfe31 186efd5275bbe7ffb73d939c1ce5690682668200
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Jul 26 15:12:54 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
commit db776a14f327c20d4984ac4b724a934df34bfe31
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Jul 26 14:50:02 2005 -0700
Fix compiler warning in qla_iocb.c
Remove bogus initialization that was re-done (correctly) later.
commit a8d11e3d0282e9607f65c73383c4030fd8f0e972
Author: Ben Dooks <ben-linux@fluff.org>
Date: Tue Jul 26 22:39:14 2005 +0100
[PATCH] ARM: 2831/1: S3C2440 - split s3c2440 clocks from central clock code
Patch from Ben Dooks
Split the s3c2440 specific clocks from the arch clock support, to
make the code clearer.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b35c67a46b025e8dc320b59fbe5c283094e1d7f5
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:17:52 2005 -0600
[PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off
Now that all of the code paths that call acpi_power_off
have been modified to call either call kernel_power_off
(which calls apci_sleep_prepare by way of acpi_shutdown)
or to call acpi_sleep_prepare directly it is redundant to call
acpi_sleep_prepare from acpi_power_off.
So simplify the code and simply don't call acpi_sleep_prepare.
In addition there is a little error handling done so if we
can't register the acpi class we don't hook pm_power_off.
I think I have done the right thing with the CONFIG_PM define
but I'm not certain. Can this code even be compiled if
CONFIG_PM is false?
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6660316cb7a1a2c59a73a52870490c0f782f45c1
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:16:00 2005 -0600
[PATCH] acpi_power_off: Don't switch to the boot cpu
machine_power_off on i386 and x86_64 now switch to the
boot cpu out of paranoia and because the MP Specification indicates it
is a good idea on reboot, so for those architectures it is a noop.
I can't see anything in the acpi spec that requires you to be on
the boot cpu to power off the system, so this should not be an issue
for ia64. In addition ia64 has the altix a massive multi-node
system where switching to the boot cpu sounds insane as we may
hot removed the boot cpu.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0963aba54aa26c89114dca7257acf8c938bfec8a
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:14:16 2005 -0600
[PATCH] x86_64 sync machine_power_off with i386
i386 machine_power_off was disabling the local apic
and all of it's users wanted to be on the boot cpu.
So call machine_shutdown which places us on the boot
cpu and disables the apics. This keeps us in sync
and reduces the number of cases we need to worry about in
the power management code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 910de55c6653d76f90380c80f0b7a395f12019e3
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:10:02 2005 -0600
[PATCH] APM: Remove redundant call to set_cpus_allowed
machine_power_off now always switches to the boot cpu so there
is no reason for APM to also do that.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4fa2564a6fde9815df969ef3547744a22f66ba9d
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:08:53 2005 -0600
[PATCH] i386 machine_power_off cleanup
Call machine_shutdown() to move to the boot cpu
and disable apics. Both acpi_power_off and
apm_power_off want to move to the boot cpu.
and we are already disabling the local apics
so calling machine_shutdown simply reuses
code.
ia64 doesn't have a special path in power_off
for efi so there is no reason i386 should. If
we really need to call the efi power off path
the efi driver can set pm_power_off like everyone
else.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d8e392e7c8f019657ff3ebe70a45d234990831db
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:07:01 2005 -0600
[PATCH] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on
This appears to be a typo I introduced when cleaning
this code up earlier. Ooops.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 68acc05d0120e19c850e1f347ee96055f5aa032f
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:03:08 2005 -0600
[PATCH] pcwd.c: Call kernel_power_off not machine_power_off
The call appears to come from process context so kernel_power_off
should be safe. And acpi_power_off won't necessarily work if you just
call machine_power_off.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fdde86ac50357b6a811e3574e47d189e81a21444
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 12:01:17 2005 -0600
[PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot
The suspend to disk code was a poor copy of the code in
sys_reboot now that we have kernel_power_off, kernel_restart
and kernel_halt use them instead of poorly duplicating them inline.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 804ebf46d51653e736108074473d9493398f2df9
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:59:54 2005 -0600
[PATCH] 68328serial: sysrq should use emergency_reboot
The 68328serial.c driver has a weird local reimplementation of
magic sysrq. The code is architecture specific enough that calling
machine_restart() is probably ok. But there is no reason not to call
emergency_restart() so do so.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 970d32443e3d0be57a5cdc3de3752f528424b73d
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:55:59 2005 -0600
[PATCH] In hangcheck-timer.c call emergency_restart()
If we've hung a clean reboot does not sound like a real
option.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f82567e55fcd25bb7addf2cfd8b79f36f409dc2e
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:53:19 2005 -0600
[PATCH] Fix watchdog drivers to call emergency_reboot()
If a watchdog driver has decided it is time to reboot the system
we know something is wrong and we are in interrupt context
so emergency_reboot() is what we want.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4de8b9b76017365572f778332d74fe050d9c8c2a
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:51:06 2005 -0600
[PATCH] Update sysrq-B to use emergency_restart()
sysrq calls into the reboot path from an interrupt handler
we can either push the code do into process context and
call kernel_restart and get a clean reboot or we can simply
reboot the machine, and increase our chances of actually
rebooting. emergency_reboot() seems like the closest match
to what we have previously done, and what we want.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f048ea81df94f72dee0d42b3d9b941c03b8c9c5
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:49:23 2005 -0600
[PATCH] Call emergency_reboot from panic
We know the system is in trouble so there is no question if this
is an emergecy :)
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ff31977782a05504f2586ec9e3e5ab4b09a4c893
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:47:32 2005 -0600
[PATCH] Use kernel_power_off in sysrq-o
We already do all of the gymnastics to run from process context
to call the power off code so call into the power off code cleanly.
This especially helps acpi as part of it's shutdown logic should
run acpi_shutdown called from device_shutdown which was not
being called from here.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 62b3a04d75d2dc9480d5ad3b60f4258e548a6a83
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:45:31 2005 -0600
[PATCH] x86_64: Implemenent machine_emergency_restart
It is not safe to call set_cpus_allowed() in interrupt
context and disabling the apics is complicated code.
So unconditionally skip machine_shutdown in machine_emergency_reboot
on x86_64.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7c9a90073c75bffbb89763a0c7d44a2e44e9e628
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:44:21 2005 -0600
[PATCH] x86_64: Fix reboot_force
We only want to shutdown the apics if reboot_force
is not specified. Be we are doing this both
in machine_shutdown which is called unconditionally
and if (!reboot_force). So simply call machine_shutdown
if (!reboot_force). It looks like something
went weird with merging some of the kexec patches for
x86_64, and caused this.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4a1421f81b64e49ce932125e7222a2d7b7f87f13
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:41:26 2005 -0600
[PATCH] i386: Implement machine_emergency_reboot
set_cpus_allowed is not safe in interrupt context
and disabling apics is complicated code so don't
call machine_shutdown on i386 from emergency_restart().
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 59586e5a262a29361c45c929ea3253d4aec830b0
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:36:01 2005 -0600
[PATCH] Don't export machine_restart, machine_halt, or machine_power_off.
machine_restart, machine_halt and machine_power_off are machine
specific hooks deep into the reboot logic, that modules
have no business messing with. Usually code should be calling
kernel_restart, kernel_halt, kernel_power_off, or
emergency_restart. So don't export machine_restart,
machine_halt, and machine_power_off so we can catch buggy users.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 16dcb4bbda579c4e3d80048b755ac124d8fab21a
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:32:34 2005 -0600
[PATCH] Fix the arguments to machine_restart on cris
It appears machine_restart has been working cris just
by luck.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7c9034735eccbf82608a4602c59aaf6053ea9416
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:29:55 2005 -0600
[PATCH] Add emergency_restart()
When the kernel is working well and we want to restart cleanly
kernel_restart is the function to use. But in many instances
the kernel wants to reboot when thing are expected to be working
very badly such as from panic or a software watchdog handler.
This patch adds the function emergency_restart() so that
callers can be clear what semantics they expect when calling
restart. emergency_restart() is expected to be callable
from interrupt context and possibly reliable in even more
trying circumstances.
This is an initial generic implementation for all architectures.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit abcd9e51f5b832439b119d530db1353c12fd4073
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:27:34 2005 -0600
[PATCH] Make ctrl_alt_del call kernel_restart to get a proper reboot.
It is obvious we wanted to call kernel_restart here
but since we don't have it the code was expanded inline and hasn't
been correct since sometime in 2.4.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4a00ea1e18228e5ef99d4780671fda97226bda30
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:24:14 2005 -0600
[PATCH] Refactor sys_reboot into reusable parts
Because the factors of sys_reboot don't exist people calling
into the reboot path duplicate the code badly, leading to
inconsistent expectations of code in the reboot path.
This patch should is just code motion.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 47f61f397cc08b5a9a815bd03cb10c48dab66034
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue Jul 26 11:21:38 2005 -0600
[PATCH] Add missing device_suspsend(PMSG_FREEZE) calls.
In the recent addition of device_suspend calls into
sys_reboot two code paths were missed.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a6fa657b9d5c892c6a92912632c4b5715955b4f8
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 14:11:30 2005 -0700
[PATCH] qla2xxx: Kconfig dependency fix
*** Warning: "fc_remote_port_block" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "scsi_is_fc_rport" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_remote_port_unblock" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_remote_port_rolechg" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_release_transport" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_remove_host" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_remote_port_add" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
*** Warning: "fc_attach_transport" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9a168bddc2f13686336a86f8235b84347edac13a
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 14:11:28 2005 -0700
[PATCH] qla: remove anonymous union
Older gcc's dont support anonymous unions, so this driver gets hundreds of
error.
Fortunately the fix is easy...
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 89373de7dd010832d8b68cb37dabb33ff5a688bb
Author: Andrew Morton <akpm@osdl.org>
Date: Tue Jul 26 14:08:38 2005 -0700
[PATCH] inotify: fix oops fix
Cc: Robert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 725b38ab5401c73cedc1b1d913782fadcd0f624a
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:19:29 2005 -0400
[PATCH] inotify: add x86-64 syscall entries
Add inotify syscall entries to x86-64.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d25cb934b00436e2243bf3970793b8e04ad9b873
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:19:20 2005 -0400
[PATCH] inotify: add missing hook to sys32_open
Add missing fsnotify_open() hook to sys32_open().
Add fsnotify_open() hook to sys32_open() on x86-64.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e5ca844a9d795e97c08bc7901c62a48c28469eb0
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:17:34 2005 -0400
[PATCH] inotify: check retval in init
Check for (unlikely) errors in the filesystem initialization stuff in
our module_init() function.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1b2ccf0cc15af717263c7cfe5d0aaf5ac057489e
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:13:43 2005 -0400
[PATCH] inotify: change default limits
Change default inotify limits: Maximum instances per user to 128 and
maximum events per queue to 16k. The max instances used to be 128; the
change to 8 was a mistake. Memory consumption is fine.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5eb22cbcdb849886c2584389faff5afb56c23876
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:12:19 2005 -0400
[PATCH] inotify: exit path cleanups
Handle error out paths better.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 783bc29bbc5d6625a4669d3eb1d989a8fb275d43
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:10:08 2005 -0400
[PATCH] inotify: oops fix
Bug fix: Ensure that the fd passed to inotify_add_watch() and
inotify_rm_watch() belongs to inotify.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 33ea2f52b8758ef62ae4a9d2f91821c47d999ee9
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:08:37 2005 -0400
[PATCH] inotify: use fget_light
As an optimization, use fget_light() and fput_light() where possible.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b680716ed28baf549f777fb125fc23ba975985c5
Author: Robert Love <rml@novell.com>
Date: Mon Jul 25 15:07:13 2005 -0400
[PATCH] inotify: misc. cleanup
Miscellaneous invariant clean up, comment fixes, and so on. Trivial
stuff.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2d986010ad13a00b83851238d52601d6092df40e
Merge: 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 e10fb91c4dc81a4ae47caf0828df152f600f2546
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Jul 26 13:28:47 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
commit 186efd5275bbe7ffb73d939c1ce5690682668200
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue Jul 26 19:51:26 2005 +0100
[PATCH] ARM SMP: Mark device mappings as "device" in ARMv6 parlance
ARMv6 introduces memory types into the page tables. Mark devices
mappings with the "shared device" memory type.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6d9b37a3a80195d317887ff81aad6a58a66954b5
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue Jul 26 19:44:26 2005 +0100
[PATCH] ARM SMP: Add ARMv6 memory barriers
Convert explicit gcc asm-based memory barriers into smp_mb() calls.
These change between barrier() and the ARMv6 data memory barrier
instruction depending on whether ARMv6 SMP is enabled.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 9560782f9a68a5de3e72bc3ba71317f373844549
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue Jul 26 19:39:31 2005 +0100
[PATCH] ARM SMP: Use exclusive load/store for __xchg
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 821ca478867433502fc614b4be83e0362cd7e67e
Author: Michael Gernoth <michael@gernoth.net>
Date: Tue Jul 26 19:21:47 2005 +0100
[PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support
Patch from Michael Gernoth
This patch lets the Jornada 720 PCMCIA-driver compile again. The
resulting driver has been tested on a Jornada with a CF-card, which
was mounted and accessed successfully.
Signed-off-by: Michael Gernoth <michael@gernoth.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7fcc113c3021a42db90e1ad27a7bec267b6e13e3
Author: Ben Dooks <ben-linux@fluff.org>
Date: Tue Jul 26 19:20:27 2005 +0100
[PATCH] ARM: 2829/1: S3C2410 - split s3c2440 irq specifics from core irq.c
Patch from Ben Dooks
Remove the need for the #ifdefs and place the IRQ handling code for
the s3c2440 into a new file, which is only compiled when the
s3c2440 cpu support is enabled.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 5730b7d6529e6e894ee3c2e1c68125c0532ad394
Author: Ben Dooks <ben-linux@fluff.org>
Date: Tue Jul 26 19:20:26 2005 +0100
[PATCH] ARM: 2828/1: BAST - remove static map of ASIX area
Patch from Ben Dooks
There is no point in mapping this staticaly, the driver is going
to ioremap() the area as it sees fit. Also correct the dates on
the changelog comments
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 02cdad3f932d533e5cbde1b15092418ce7af1a70
Author: Dimitry Andric <dimitry.andric@tomtom.com>
Date: Tue Jul 26 19:20:25 2005 +0100
[PATCH] ARM: 2819/1: Fix several S3C24x0 IIS defines
Patch from Dimitry Andric
- Change S3C2440_IISCON_MPLL to S3C2440_IISMOD_MPLL:
The S3C2440 IISCON register doesn\'t control the master clock selection, this is done with
the IISMOD register.
- Correct S3C2410_IISMOD_256FS and S3C2410_IISMOD_384FS:
This is set via bit 2 of IISMOD, not bit 1.
- Add S3C2410_IISCON_PSCEN (prescaler enable), for completeness\' sake.
Signed-off-by: Dimitry Andric <dimitry.andric@tomtom.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Tue Jul 26 09:29:13 2005 -0500
JFS: Fix i_blocks accounting when allocation fails
A failure in dbAlloc caused a directory's i_blocks to be incorrectly
incremented, causing jfs_fsck to find the inode to be corrupt.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 52fbae2a392b6e084195bedc7a280991a94c14d0
Author: David S. Miller <davem@davemloft.net>
Date: Mon Jul 25 19:54:35 2005 -0700
[ATM]: speedtch: Revert 86cf42e4e029b83110cf98692420239103363dbf
It was already fixed more sufficiently by Andrew Morton's
change 843c944fb86e5e31ee7b319172e657ea22301322.
Noted by Duncan Sands.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 05cb784c81a0fd1f97732156ea464bd392ce875a
Merge: 3190186362466658f01b2e354e639378ce07e1a9 6b6a93c6876ea1c530d5d3f68e3678093a27fab0
Author: Tony Luck <tony.luck@intel.com>
Date: Mon Jul 25 15:46:44 2005 -0700
Auto merge with /home/aegl/GIT/linus
commit fc87670b6cd63abc6fc4e3a115741984750d1fbc
Author: David S. Miller <davem@davemloft.net>
Date: Mon Jul 25 12:45:32 2005 -0700
[TG3]: Update driver version and reldate.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 747e8f8bff56955374521fa4d488e702d4b0c04f
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:33:22 2005 -0700
[TG3]: add 5780 fiber support
Add 5780S support by adding a new tg3_setup_fiber_mii_phy() function and
a timer function for parallel link detection. 5780S uses standard MII
registers for 1000BaseX and runs in GMII mode as opposed to TBI mode on
older serdes chips.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ef7f5ec0deb2bcdc005f30f6f75f79c65c577cf5
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:32:25 2005 -0700
[TG3]: disallow jumbo TSO on 5780
Disallow jumbo TSO on 5780 due to hardware restrictions.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fdfec1726b14b4b2121adcfcbba98d4cc1a61751
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:31:48 2005 -0700
[TG3]: consolidate all DMA water mark settings
Consolidate all DMA watermark settings for standard and jumbo frames on
all chips in tg3_init_bufmgr_config() and add new settings for 5780.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 7e72aad48c3790636bfa006f3b0027852ccad47e
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:31:17 2005 -0700
[TG3]: add variable buffer size for standard ring
Add a new rx_pkt_buf_sz to the tg3 structure to support variable buffer
sizes on the standard ring.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0f893dc6ec890058d926224c8aa254d8621e0ea3
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:30:38 2005 -0700
[TG3]: add 5780 basic jumbo frame support
Add basic jumbo frames support for 5780. This chip supports jumbo frames
on the standard receive ring without the jumbo ring. The
TG3_FLAG_JUMBO_ENABLE is changed to TG3_FLAG_JUMBO_RING_ENABLE to
indicate using the jumbo ring on 5704 and older chips. A new
TG3_FLG2_JUMBO_CAPABLE flag is added to indicate jumbo frames support
with or without the jumbo ring.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4cf78e4fb678807e3f8265c9e9031a84f5c601f0
Author: Michael Chan <mchan@broadcom.com>
Date: Mon Jul 25 12:29:19 2005 -0700
[TG3]: add 5780 basic support
Add 5780 PCI IDs, chip IDs, and other basic support.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c2783f3a625b2aba943ef94623e277557a91a448
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Mon Jul 25 08:58:54 2005 -0500
JFS: Don't set log_SYNCBARRIER when log->active == 0
If a metadata page is kept active, it is possible that the sync barrier logic
continues to trigger, even if all active transactions have been phyically
written to the journal. This can cause a hang, since the completion of the
journal I/O is what unsets the sync barrier flag to allow new transactions
to be created.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 6b6a93c6876ea1c530d5d3f68e3678093a27fab0
Merge: e89227889cec6b66758b44c83f78dba337e5d699 7686ee1ad976efeddf10583f013462c66408ae51
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Jul 24 20:39:30 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit e89227889cec6b66758b44c83f78dba337e5d699
Merge: 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf db7d9a4eb700be766cc9f29241483dbb1e748832
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Jul 24 20:38:44 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit 7686ee1ad976efeddf10583f013462c66408ae51
Author: Patrick McHardy <kaber@trash.net>
Date: Sun Jul 24 19:44:23 2005 -0700
[EMATCH]: Remove feature ifdefs in meta ematch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit db7d9a4eb700be766cc9f29241483dbb1e748832
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:36:26 2005 -0700
[SPARC64]: Move syscall success and newchild state out of thread flags.
These two bits were accesses non-atomically from assembler
code. So, in order to eliminate any potential races resulting
from that, move these pieces of state into two bytes elsewhere
in struct thread_info.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cdd5186f753b23ab51f86679bdc4cc698ab0b893
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:36:13 2005 -0700
[SPARC64]: Privatize sun5_timer.
It is only used by some localized code in irq.c, and also
delete enable_prom_timer() as that is totally unused.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c5019a578f18cf3a76829626e91e5469dbd4a738
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:35:56 2005 -0700
[SPARC64]: Kill totally unused inline functions from asm/spitfire.h
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 620de54675e76f1369326bbe1fc75aff88917063
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:35:42 2005 -0700
[SPARC64]: Simplify asm/rwsem.h slightly.
rwsem_atomic_update and rwsem_atomic_add can be implemented
straightly using atomic_*() routines.
Also, rwsem_cmpxchgw() is totally unused, kill it.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6593eaed814d50214d6056c683d52ac63153730e
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:35:28 2005 -0700
[SPARC64]: Non-atomic bitops do not need volatile operations
Noticed this while comparing sparc64's bitops.h to ppc64's.
We can cast the volatile memory argument to be non-volatile.
While we're here, __inline__ --> inline.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4b502421aac89c8d4e61ecc89a70065a33305a0b
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:35:08 2005 -0700
[SPARC]: Fix __KERNEL_SYSCALLS__ defining in envctrl.c and bbc_envctrl.c
It needs to happen before any header includes because nowadays
some things implicitly include asm/unistd.h which ends up being
before the __KERNEL_SYSCALLS__ define gets done.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2d1aea8dd02ad35658864de52a3e0f9f033e63f4
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sun Jul 24 19:34:47 2005 -0700
[SPARC]: sbus/vfc_i2c: remove sleep_on() usage
Use wait-queue directly instead of the deprecated sleep_on()
function. This required adding a local wait-queue. Also use new (added in
separate patch to K-J) usecs to jiffies function to convert value.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cb39d263e751f9cca8055bcacfe5ec863dfe2705
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sun Jul 24 19:34:33 2005 -0700
[SPARC]: sbus/envctrl: replace schedule_timeout() with msleep_interruptible()
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected. Change the units of poll_interval to
msecs as it is only used in this delay.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 70c83375bb47cadd60fdb923ad913d4f4be75aba
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sun Jul 24 19:34:19 2005 -0700
[SPARC]: sbus/aurora: replace schedule_timeout() with msleep_interruptible()
Use msleep_interruptible() instead of
schedule_timeout() to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
commit 4564203d76599973da9c5cbcd93057252414ac9e
Author: Adrian Bunk <bunk@stusta.de>
Date: Sun Jul 24 19:33:55 2005 -0700
[SPARC]: Remvoe APM_RTC_IS_GMT from config.
I can't see any effect of this option outside the i386-specific APM code.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 48647feed9f7a2d839c6ada12147b341833646e8
Author: David S. Miller <davem@davemloft.net>
Date: Sun Jul 24 19:30:28 2005 -0700
[W1]: Do not use NFLOG netlink number.
Use the reserved by never used NETLINK_SKIP value instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 227510c7f175c44b12cdff6eab316e53dbf71f92
Author: Cal Peake <cp@absolutedigital.net>
Date: Sun Jul 24 19:30:06 2005 -0700
[IPV6]: fix implicit declaration of function `xfrm6_tunnel_unregister'
Signed-off-by: Cal Peake <cp@absolutedigital.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun Jul 24 12:13:40 2005 +0100
[PATCH] ARM SMP: Fix ARMv6 spinlock and semaphore implementations
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4
Merge: c94c0d201f1c1a62184f4f220c1615347aafbee7 056a8763fc036639441a6dc49b61e57bc632af6e
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 23 17:01:26 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
commit c94c0d201f1c1a62184f4f220c1615347aafbee7
Merge: 8ed693d29b25bbd88471ec043cc01581419d0481 53776eb4acdd3ec576d75b61b656ef8d51e430ea
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 23 16:59:55 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 53776eb4acdd3ec576d75b61b656ef8d51e430ea
Author: Lucas Correia Villa Real <lucasvr@gobolinux.org>
Date: Sun Jul 24 00:15:46 2005 +0100
[PATCH] ARM: 2825/1: S3C2410: turns %d into %ld on DMA printk
Patch from Lucas Correia Villa Real
This patch replaces the sizeof()'s %d specifier by %ld on a S3C2410 DMA
printk.
Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 8ed693d29b25bbd88471ec043cc01581419d0481
Merge: 72538d8565b0205240d88591b72db3c7f3f1881a 668d74c04c16bb69de564e25e85dd94eeb0175d9
Author: Luming Yu <luming.yu@intel.com>
Date: Sat Jul 23 00:34:41 2005 -0400
/home/lenb/linux-2.6 branch 'acpi-2.6.12'
commit 668d74c04c16bb69de564e25e85dd94eeb0175d9
Author: Luming Yu <luming.yu@intel.com>
Date: Sat Jul 23 00:26:33 2005 -0400
ACPI: delete unnecessary EC console messages
http://bugzilla.kernel.org/show_bug.cgi?id=4534
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 72538d8565b0205240d88591b72db3c7f3f1881a
Author: Linus Torvalds <torvalds@evo.osdl.org>
Date: Fri Jul 22 18:29:40 2005 -0400
Remove "noreplacement" kernel command line option.
It is no longer valid to not replace instructions, since we depend on
different behaviour depending on CPU capabilities.
If you need to limit the capabilities of the replacements (because the
boot CPU has features that non-boot CPU's do not have, for example), you
need to explicitly disable those capabilities that are not shared across
all CPU's.
For example, if your boot CPU has FXSR, but other CPU's in your system
do not, you need to use the "nofxsr" kernel command line, not disable
instruction replacement per se.
commit 2847e3478c3d8119eedc3e0cb85a308b21f681dd
Author: Linus Torvalds <torvalds@evo.osdl.org>
Date: Fri Jul 22 18:19:20 2005 -0400
x86: use alternative instructions for fnsave/fxsave too
This one ends up using an inline asm format that claims to read memory
and then clobber it (rather than just write it directly), which made it
easier to use the existing "alternative_input()" infrastructure support.
Now the fxsave code matches the fxrstor.
commit 38afd6adf6bccd7176e88c07cac104d3639aa30d
Merge: 8ed1383fb7b6685968588141d5934e0e6715e954 261688d01ec07d3a265b8ace6ec68310fbd96a96
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri Jul 22 16:33:00 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 261688d01ec07d3a265b8ace6ec68310fbd96a96
Author: David S. Miller <davem@davemloft.net>
Date: Fri Jul 22 14:43:52 2005 -0700
[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}
More unusable TCF_META_* match types that need to get eliminated
before 2.6.13 goes out the door.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
commit 8ed1383fb7b6685968588141d5934e0e6715e954
Author: Linus Torvalds <torvalds@evo.osdl.org>
Date: Fri Jul 22 16:06:16 2005 -0400
x86: make restore_fpu() use alternative assembler instructions
It's really just a single instruction, conditional on whether the CPU
supports FXSR or not, so implement it as such instead of making it a
function that queries FXSR dynamically.
This means that the instruction just gets automatically rewritten to the
correct one at boot-time.
commit d3984a6b6abac6203868f0e9095c0ed9e33ece03
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Jul 22 12:52:47 2005 -0700
[NETFILTER]: Fix ip6t_LOG MAC format
I broke this in the patch that consolidated MAC logging.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 74bb421da7f39e70ab636ad46ef85ea1178786c5
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Jul 22 12:51:38 2005 -0700
[NETFILTER]: Use correct byteorder in ICMP NAT
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 21f930e4abdcb9649f26e5b959c14dddee4e600b
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Jul 22 12:51:03 2005 -0700
[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload
Fixes a crash when unloading ip_conntrack.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d04b4f8c1c9766e49fad6a141fc61cb30db69a5c
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Jul 22 12:50:29 2005 -0700
[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)
The portptr pointing to the port in the conntrack tuple is declared static,
which could result in memory corruption when two packets of the same
protocol are NATed at the same time and one conntrack goes away.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4c1217deeb148ff8ab838ba4f1875d0f52dea343
Author: Patrick McHardy <kaber@trash.net>
Date: Fri Jul 22 12:49:30 2005 -0700
[NETFILTER]: Fix deadlock in ip6_queue
Already fixed in ip_queue, ip6_queue was missed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b339a18b81a1f6ca1455559594f5df872b9e59f4
Author: Linus Torvalds <torvalds@evo.osdl.org>
Date: Fri Jul 22 15:23:47 2005 -0400
Fix up incorrect "unlikely()" on %gs reload in x86 __switch_to
These days %gs is normally the TLS segment, so it's no longer zero. As
a result, we shouldn't just assume that %fs/%gs tend to be zero
together, but test them independently instead.
Also, fix setting of debug registers to use the "next" pointer instead
of "current". It so happens that the scheduler will have set the new
current pointer before calling __switch_to(), but that's just an
implementation detail.
commit 28e212fb360ce2568edd60b93d60683d5ad24146
Author: David S. Miller <davem@davemloft.net>
Date: Fri Jul 22 11:47:25 2005 -0700
[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.
It won't exist any longer when we shrink the SKB in 2.6.14,
and we should kill this off before anyone in userspace starts
using it.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
commit c40c202493d18de42fcd0b8b5d68c22aefb70f03
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Fri Jul 22 11:08:44 2005 -0500
JFS: Fix typo in last patch
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 056a8763fc036639441a6dc49b61e57bc632af6e
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri Jul 22 10:15:04 2005 +0100
[PATCH] Serial: No need to check for priv != NULL in remove_one
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 14a59e1829cd5782ad1a8979e594578f49f3e2c1
Author: Loic Le Loarer <loic.le-loarer+lk@polytechnique.org>
Date: Thu Jul 21 14:16:54 2005 -0700
[EQL]: Proper num_slaves decrement
Signed-off-by: Loic Le Loarer <loic.le-loarer+lk@polytechnique.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4acdbdbe5089c06d5e0c7e96783fcc4414ded00a
Author: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu Jul 21 13:14:46 2005 -0700
[NETFILTER]: ip_conntrack_expect_related must not free expectation
If a connection tracking helper tells us to expect a connection, and
we're already expecting that connection, we simply free the one they
gave us and return success.
The problem is that NAT helpers (eg. FTP) have to allocate the
expectation first (to see what port is available) then rewrite the
packet. If that rewrite fails, they try to remove the expectation,
but it was freed in ip_conntrack_expect_related.
This is one example of a larger problem: having registered the
expectation, the pointer is no longer ours to use. Reference counting
is needed for ctnetlink anyway, so introduce it now.
To have a single "put" path, we need to grab the reference to the
connection on creation, rather than open-coding it in the caller.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ab9b6339381d340779e8b5957561aed41155a270
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed Jul 20 21:32:26 2005 +0100
[PATCH] ARM SMP: Mark mroe CPU init data with __cpuinitdata
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 4aa49d130df9209707a97786a55a3f584b7345e9
Author: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed Jul 20 12:01:46 2005 -0700
[ATM]: zatm: mailbox converted to pci_alloc_consistent()
mailbox converted to pci_alloc_consistent()
- request_region() is not needed: zatm_init_one() issues
pci_request_regions();
- the warning related to kfree(zatm_dev->mbx_start) disappears;
Compiled with i386 and sparc64 as target.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b72f6eccb0fc516070f2de469f73870cb6cb1149
Author: David S. Miller <davem@davemloft.net>
Date: Tue Jul 19 14:13:54 2005 -0700
[NET]: Fix tc_verd thinko in skb_clone()
It was overwriting the computer n->tc_verd value over
and over with skb->tc_verd, by mistake.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0303770deb834c15ca664a9d741d40f893c92f4e
Author: Patrick McHardy <kaber@trash.net>
Date: Tue Jul 19 14:03:34 2005 -0700
[NET]: Make ipip/ip6_tunnel independant of XFRM
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c877efb207bf4629cfa97ac13412f7392a873485
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Tue Jul 19 14:01:51 2005 -0700
[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 23a534e7b1ad2650002bbc236493791ac23440ee
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Jul 19 14:00:53 2005 -0700
[NET]: NETCONSOLE must depend on INET
NETCONSOLE=y and INET=n results in the following compile error:
net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'
net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit eb3f8f5e22cdee8138e654963e371ad337830efb
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Jul 19 14:00:13 2005 -0700
[NET]: BRIDGE_EBT_ARPREPLY must depend on INET
BRIDGE_EBT_ARPREPLY=y and INET=n results in the following compile error:
net/built-in.o: In function `ebt_target_reply':
ebt_arpreply.c:(.text+0x68fb9): undefined reference to `arp_send'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit abaacad9bcb3f118cc802f527ab5d7c41b63f83a
Author: Patrick McHardy <kaber@trash.net>
Date: Tue Jul 19 13:59:17 2005 -0700
[IPV4]: Don't select XFRM for ip_gre
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6aef4fdfeaec5f2c66415f2cafa98a3ff927501f
Author: Patrick McHardy <kaber@trash.net>
Date: Tue Jul 19 13:58:40 2005 -0700
[NET]: Only build flow.o if CONFIG_XFRM=y
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 86cf42e4e029b83110cf98692420239103363dbf
Author: Duncan Sands <baldrick@free.fr>
Date: Tue Jul 19 13:57:17 2005 -0700
[ATM]: [speedtch] cure atm_printk() macro gcc-2.95 compile error
Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 88e9fa8a54cf4d66ee8fc1d855e82de827233d74
Author: Jesper Juhl <juhl-lkml@dif.dk>
Date: Tue Jul 19 13:56:53 2005 -0700
[ATM]: Trivial spelling fix patch for net/Kconfig
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5938a7b580bb7a738ee349048565ac76e6f3f5d7
Author: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Tue Jul 19 13:56:29 2005 -0700
[ATM]: [ambassador] Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c9e42614585dddd544a56907ff5fd5ca55411967
Author: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Tue Jul 19 13:56:01 2005 -0700
[ATM]: [firestream] fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5e8676d113a097e19d18492e85215f0f3cc86e43
Author: Olaf Hering <olh@suse.de>
Date: Tue Jul 19 13:55:38 2005 -0700
[ATM]: [he] remove linux/version.h include
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1bd232b641a0d0ef184a5154409ef38aebb3155
Author: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Date: Tue Jul 19 13:55:14 2005 -0700
[ATM]: [idt77252] use time_after() macro
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 322361b3712af97c19ab730b410f9ae5d9aad4c3
Author: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue Jul 19 13:54:44 2005 -0700
[ATM]: allow bind() on point-to-multpoint svcs (from Martin Whitaker
<martin_whitaker@ntlworld.com>)
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 43f51fce0a637e6cdf1285b0fa09b8398ff14834
Author: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue Jul 19 13:54:19 2005 -0700
[ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>)
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310
Merge: 3d9b1cdd2455017c6aa25bc2442092b81438981f f60f700876cd51de9de69f3a3c865d95e287a24d
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Tue Jul 19 13:46:53 2005 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 3f1c81ff10187396e6d0fd01df82ab0cec256c96
Author: David S. Miller <davem@davemloft.net>
Date: Mon Jul 18 17:10:55 2005 -0700
[EMATCH]: Kill TCF_META_ID_TCCLASSID reference from meta ematch as well.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6876f95f201ce2d62367d85dd793c1fee351d7a6
Author: Adrian Bunk <bunk@stusta.de>
Date: Mon Jul 18 13:55:19 2005 -0700
[IPV4]: fix IP_FIB_HASH kconfig warning
This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 54208991e15fa00e37a9d172ac0d87191a832165
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon Jul 18 13:45:12 2005 -0700
[NET]: Kconfig: NETCONSOLE and NETPOLL together
Put NETCONSOLE and NETPOLL options together since they are related.
This cuts down on the hassle of flipping back and forth between
the Networking menu and the Network drivers menu to change their
config settings.
Tested with menuconfig, gconfig, and xconfig.
gconfig has a small problem with this. I think that it's
a bug in gconfig and I will take it up with Romain Lievin.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d1ad1ff299dd908d07c5e5f27f88bbdb235eb7a5
Author: Sridhar Samudrala <sri@us.ibm.com>
Date: Mon Jul 18 13:44:10 2005 -0700
[SCTP]: Fix potential null pointer dereference while handling an icmp error
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ee71a29eb5e341fe977c5ad7a43782c29bd9cb9e
Author: Christophe Lucas <clucas@rotomalug.org>
Date: Mon Jul 18 13:38:07 2005 -0700
[SCTP]: Audit return code of create_proc_*
From: Christophe Lucas <clucas@rotomalug.org>
Audit return of create_proc_* functions.
Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e2bf521d9728bfae9b6c3d484614e5962d0b5afd
Author: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Mon Jul 18 13:36:38 2005 -0700
[NET]: Fix "nocast type" warnings in skbuff.h
From: Victor Fusco <victor@cetuc.puc-rio.br>
Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 37da647d994cdac7e0bc8d2a365fbda403939a2b
Author: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Mon Jul 18 13:35:43 2005 -0700
[NETLINK]: Fix "nocast type" warnings
From: Victor Fusco <victor@cetuc.puc-rio.br>
Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 23af27eb8fa9ea8614138c4cded7a16cb4197a55
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Jul 18 13:34:35 2005 -0700
[PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.
Thomas Graf states:
> I used to mark such ids as obsolete in the header but since
> skb is on diet anyway and there has been no official
> iproute2 release with the ematch bits included it might be
> a better idea to remove the ids from the header completely.
> Those that have picked up my patch on netdev shouldn't care
> about a ABI breakage, actually I doubt that someone is using
> it already.
So here's the patch to remove it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 452f299da3253f65020143f743c2e207b752547b
Author: Thomas Graf <tgraf@suug.ch>
Date: Mon Jul 18 13:30:53 2005 -0700
[PKT_SCHED]: Reduce branch mispredictions in pfifo_fast_dequeue
The current call to __qdisc_dequeue_head leads to a branch
misprediction for every loop iteration, the fact that the
most common priority is 2 makes this even worse. This issue
has been brought up by Eric Dumazet <dada1@cosmosbay.com>
but unlike his solution which was to manually unroll the loop,
this approach preserves the possibility to increase the number
of bands at compile time.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d7c7ed4dbc66c5f4dfa5615cdfc5009af3b3b137
Author: Thomas Graf <tgraf@suug.ch>
Date: Mon Jul 18 13:29:49 2005 -0700
[PKT_SCHED]: Remove debugging leftover from textsearch ematch
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fbc0dc0df54be06586d712ebf6958816e3b1b2b7
Author: Andrey Panin <pazke@donpac.ru>
Date: Mon Jul 18 11:38:09 2005 +0100
[PATCH] Serial: Add support for SIIG Quartet serial card
Add support for SIIG Quartet Serial card. This card has Oxford
Semiconducor 16954 quad UART which is clocked by 10x faster
(18.432 MHz) quartz.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 65cc3370ef3fb56b9b423f282a8204f8cce66e32
Author: Ben Dooks <ben-linux@fluff.org>
Date: Mon Jul 18 10:24:32 2005 +0100
[PATCH] ARM: 2818/1: BAST - Use platform device for SuperIO 16550s
Patch from Ben Dooks
Use platform device for the 16500 UARTs in the onboard
SuperIO controller.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit bd6f68af298cab4e059f8489b56e46ae36243fcc
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun Jul 17 21:35:41 2005 +0100
[PATCH] ARM SMP: Mark CPU init functions/data with __cpuinit/...data
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 3190186362466658f01b2e354e639378ce07e1a9
Merge: 08848e446bcd2130c26945be966446389d25bcc2 f60f700876cd51de9de69f3a3c865d95e287a24d
Author: Tony Luck <tony.luck@intel.com>
Date: Sun Jul 17 12:30:06 2005 -0700
Auto merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit 772a9e631ccad0423ed6d08acb3a4b1084ae2613
Author: Sascha Hauer <sascha@saschahauer.de>
Date: Sun Jul 17 20:15:36 2005 +0100
[PATCH] ARM: 2687/1: i.MX framebuffer: make dmacr register platform configurable
Patch from Sascha Hauer
The dmacr needs different settings on some boards. This patch makes the
register configurable by the platform part.
Also we have imxfb_disable_controller(), so lets use it.
Signed-off-by: Steven Scholz
Signed-off-by: Sascha Hauer
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 246b49768bc96d942ab0e2a17aab6fc3d2e011da
Author: Alexander Schulz <alex@shark-linux.de>
Date: Sun Jul 17 20:12:08 2005 +0100
[PATCH] ARM: 2816/1: Shark: boot kernel images bigger than 1 MB
Patch from Alexander Schulz
Up to now, shark kernels were limited to one megabyte compressed
size. As the kernels get bigger, this becomes more and more
uncomfortable. So I added a loop to copy 3 MB instead of one
and added some comments.
Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b66da4a4859b0be3f12575863bf1d873116d1947
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun Jul 17 10:54:50 2005 +0100
[PATCH] ARM: Remove global nwfpe register variable
Recent changes to nwfpe broke the build with some gcc versions:
In file included from arch/arm/nwfpe/softfloat.c:33:
arch/arm/nwfpe/fpa11.h:32: global register variable follows a function definition
make[1]: *** [arch/arm/nwfpe/softfloat.o] Error 1
Since we now ensure that the kernel stack is empty when returning
to user space, we can now access the userspace registers with
reference to the kernel stack using current_thread_info(), rather
than remembering the stack pointer at the time nwfpe was called.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit f60f700876cd51de9de69f3a3c865d95e287a24d
Merge: c6c621b3a977b20d7ceffd3debcacbe3de7c0e87 6d283d271674b1127881ebf082266a2c3fe6e0e4
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 16 20:06:51 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
commit c6c621b3a977b20d7ceffd3debcacbe3de7c0e87
Merge: af6ea9ca23504fe620412826a420dca9c43a8bf6 b7523418f6af9093c462341c08c2233f44f7a28d
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 16 20:05:41 2005 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit af6ea9ca23504fe620412826a420dca9c43a8bf6
Merge: 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79 c514720716c7b109ff980f8b3cb93f9af872c91c
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 16 11:47:51 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
commit 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79
Merge: 9fb1759a3102c26cd8f64254a7c3e532782c2bb8 19870da7ea2fc483bf73a189046a430fd9b01391
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat Jul 16 10:24:32 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
commit b7523418f6af9093c462341c08c2233f44f7a28d
Author: Alexander Schulz <alex@shark-linux.de>
Date: Sat Jul 16 17:17:18 2005 +0100
[PATCH] ARM: 2815/1: Shark: new defconfig, fixes with __io and serial ports
Patch from Alexander Schulz
This patch brings a new default config file for the shark and
fixes a compilation issue with io addressing and a runtime
problem with the serial ports, where I corrected a wrong
regshift value.
These are all shark specific files so I hope it is ok to
put them in one patch.
Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 878cf4e1c7be6bffde3ace888a65ac3d43c127bb
Author: Michael Burian <dynmail1@gassner-waagen.at>
Date: Sat Jul 16 16:43:49 2005 +0100
[PATCH] ARM: 2794/1: Add "Image" and "mach-types.h" to dontdiff list
Patch from Michael Burian
comment in "mach-types.h" tells that it should not be patched
"Image" is a binary, just as zImage, uImage and friends are
Signed-off-by: Michael Burian <dynmail1@gassner-waagen.at>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 109d89ca0ee76138e04b41726b7f719c7df65e88
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat Jul 16 16:43:33 2005 +0100
[PATCH] ARM: Allow register_undef_hook to be called with IRQs off
Preserve the interrupt status across a call to register_undef_hook.
This allows it to be called while interrupts are disabled.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 54ea06f6afe85aaf419e51343d4e4b5599197113
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat Jul 16 15:21:51 2005 +0100
[PATCH] ARM: Convert bitops to use ARMv6 ldrex/strex instructions
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6d283d271674b1127881ebf082266a2c3fe6e0e4
Author: Olaf Hering <olh@suse.de>
Date: Sat Jul 16 09:59:00 2005 +0100
[PATCH] Serial: Remove linux/version.h
changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 661f83a67c2e360d5a4d2406cc28379c909f94bf
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat Jul 16 09:30:53 2005 +0100
[PATCH] Serial: Move deprecation of register_serial forward to September
I think it's about time to make the build a little more vocal about the
expiry of these functions. Due to recent discussions with problems in
the console initialisation vs power manglement, I'd like to move the
date forward to September.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 19870da7ea2fc483bf73a189046a430fd9b01391
Author: Thomas Gleixner <tglx@linutronix.de>
Date: Fri Jul 15 14:53:51 2005 +0100
[MTD] NAND: Fix broken bad block scan for 16 bit devices
The previous change to read a single byte from oob breaks the
bad block scan on 16 bit devices, when the byte is on an odd
address. Read the complete oob for now.
Remove the unused arguments from check_short_pattern()
Move the wait for ready function so it is only executed when
consecutive reads happen.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 2c4eec9802ae753a4973f0a0d71f8d154e86fd31
Merge: 5d157885f383ccc0660c011fa488ae4edb77ab16 d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
Author: Thomas Gleixner <tglx@tglx.tec.linutronix.de>
Date: Sat Jul 16 09:20:01 2005 +0200
Merge with rsync://fileserver/linux
commit 9fb1759a3102c26cd8f64254a7c3e532782c2bb8
Author: Siddha, Suresh B <suresh.b.siddha@intel.com>
Date: Fri Jul 15 19:17:44 2005 -0700
[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes
A malicious 32bit app can have an elf section at 0xffffe000. During
exec of this app, we will have a memory leak as insert_vm_struct() is
not checking for return value in syscall32_setup_pages() and thus not
freeing the vma allocated for the vsyscall page.
Check the return value and free the vma incase of failure.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
Merge: 38d84c3bd6dd22bdb1f797c87006931133d71aea 46906c4415f88cebfad530917bada0835d651824
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri Jul 15 17:52:13 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commit 08848e446bcd2130c26945be966446389d25bcc2
Merge: 46906c4415f88cebfad530917bada0835d651824 38d84c3bd6dd22bdb1f797c87006931133d71aea
Author: Tony Luck <tony.luck@intel.com>
Date: Fri Jul 15 16:59:00 2005 -0700
Auto merge with /home/aegl/GIT/linus
commit 38d84c3bd6dd22bdb1f797c87006931133d71aea
Author: Patrick Boettcher <patrick.boettcher@desy.de>
Date: Fri Jul 15 12:20:26 2005 -0700
[PATCH] dvb: cx88 output mode fix
The output_mode needs to be set for the Hauppauge Nova-T DVB-T
(cx88-dvb.c).
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4851d3aaa550b7b62553dd19fcadc7b586da4f17
Author: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Date: Fri Jul 15 10:00:41 2005 -0700
[NET PCMCIA]: drivers/net/pcmcia/smc91c92_cs.c : Use of time_after macro
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a8178345c4f12f4413e5620fc86a6b0381c41bc9
Author: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Date: Fri Jul 15 09:59:26 2005 -0700
[WAN]: drivers/net/wan/: use of time_after macro
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c9f04f5847c17d9933c5bd795c6c3740e96058e9
Author: Robert Love <rml@novell.com>
Date: Fri Jul 15 12:21:07 2005 -0400
[PATCH] inotify: MAINTAINERS
Add a MAINTAINERS entry for Inotify.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6a806c510de490318846b53bbfec463d02ca274b
Author: NeilBrown <neilb@cse.unsw.edu.au>
Date: Fri Jul 15 03:56:35 2005 -0700
[PATCH] md/raid1: clear bitmap when fullsync completes
We need to be careful differentiating between a resync of a complete array,
in which we can clear the bitmap, and a resync of a degraded array, in
which we cannot.
This patch cleans all that up.
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a1287ba1ba810aae1f8b81e32560d5d3bf3ff9f0
Author: Michal Ostrowski <mostrows@watson.ibm.com>
Date: Fri Jul 15 03:56:33 2005 -0700
[PATCH] rocket.c: Fix ldisc ref count handling
If bailing out because there is nothing to receive in rp_do_receive(),
tty_ldisc_deref is not called. Failure to do so increases the ref count
and causes release_dev() to hang since it can't get the ref count to 0.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6f97933d0fd13920d7d53b6e0107bb674b3a1f0b
Author: Robert Love <rml@novell.com>
Date: Fri Jul 15 03:56:33 2005 -0700
[PATCH] inotify: documentation update
Clean up and expand some of the inotify documentation.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 35e422c967d3208f188e3096c9f603ac7333fb1b
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri Jul 15 03:56:32 2005 -0700
[PATCH] visws: reexport pm_power_off
More fallout from the i386_ksyms.c cleanups.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit afa597ba20e9ef55fc6283c1a564854b1c9f13c0
Author: Carsten Otte <cotte@de.ibm.com>
Date: Fri Jul 15 03:56:30 2005 -0700
[PATCH] execute-in-place fixes
This patch includes feedback from Andrew and Christoph. Thanks for
taking time to review.
Use of empty_zero_page was eliminated to fix compilation for architectures
that don't have it.
This patch removes setting pages up-to-date in ext2_get_xip_page and all
bug checks to verify that the page is indeed up to date. Setting the page
state on mapping to userland is bogus. None of the code patchs involved
with these pages in mm cares about the page state.
still on my ToDo list: identify a place outside second extended where
__inode_direct_access should reside
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c5287ba132ff742e595d42c28b66cbba19522c4e
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Fri Jul 15 03:56:28 2005 -0700
[PATCH] v4l: bug fixes for tuner, cx88 and tea5767
- In CX88 code, some cards needs to have audio reprogramed after changing
video channel;
- Tuner autodetection code seems not to work on some cards. Now,
no_autodetect insmod option allows disabling autodetection code;
- Minor fixes in tea5767 to reduce integer trunc;
- There are some new Pixelview Ultra Pro cards that doesn't use TEA5767
for radio. As autodetection is capable of checking for tea, radio tuners
and addresses removed.
- CX88 version number incremented.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1eb29128c644581fa51f822545921394ad4f719f
Author: Neil Brown <neilb@cse.unsw.edu.au>
Date: Fri Jul 15 03:56:27 2005 -0700
[PATCH] Fix raid0's attempt to divide by 64bit numbers
Apparently sector_div is only guaranteed to work with a 32bit divisor, even
on 64bit architectures. So allow for this in raid0.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 030babac6ae54df64ae3bba4685ecb1d8d8dd8c3
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Fri Jul 15 03:56:25 2005 -0700
[PATCH] vt.c build fix
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3d9b1cdd2455017c6aa25bc2442092b81438981f
Author: Qu Fuping <qufuping@ercist.iscas.ac.cn>
Date: Fri Jul 15 10:36:08 2005 -0500
JFS: fsync wrong behavior when I/O failure occurs
This is half of a patch that Qu Fuping submitted in April. The first part
was applied to fs/mpage.c in 2.6.12-rc4.
jfs_fsync should return error, but it doesn't wait for the metadata page to
be uptodate, e.g.:
jfs_fsync->jfs_commit_inode->txCommit->diWrite->read_metapage->
__get_metapage->read_cache_page reads a page from disk. Because read is
async, when read_cache_page: err = filler(data, page), filler will not
return error, it just submits I/O request and returns. So, page is not
uptodate. Checking only if(IS_ERROR(mp->page)) is not enough, we should
add "|| !PageUptodate(mp->page)"
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 56d1254917d9f301a8e24155cd3f2236e642cb7d
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Fri Jul 15 09:43:36 2005 -0500
JFS: Remove assert statement in dbJoin & return -EIO instead
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 9d853c3757ef74ded5ae564d68370f22208fb88b
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri Jul 15 07:41:31 2005 -0700
[CRYPTO]: Fix zero-extension bug on 64-bit architectures.
Noticed by Ken-ichirou MATSUZAWA.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5d157885f383ccc0660c011fa488ae4edb77ab16
Author: Thomas Gleixner <tglx@tglx.tec.linutronix.de>
Date: Fri Jul 15 08:14:44 2005 +0200
[JFFS2] Fix node allocation leak
In the rare case of failing to write the cleanmarker
the allocated node was not freed.
Pointed out by Forrest Zhao
Initial cleanup by Joern Engel
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 00be3e7e5cc3ca80e035b387e883d5ec10d7b897
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Thu Jul 14 15:15:39 2005 -0500
JFS: Remove bogus WARN_ON statement and some dead code
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit e10fb91c4dc81a4ae47caf0828df152f600f2546
Author: James Bottomley <jejb@titanic.(none)>
Date: Thu Jul 14 11:54:17 2005 -0500
[SCSI] fix function prototype warning
int_to_scsilun() takes a pointer to a struct scsi_lun in it's
prototype, so add this structure to scsi_device.h to avoid declaration
inside function prototype warnings.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 46906c4415f88cebfad530917bada0835d651824
Author: Ian Wienand <ianw@gelato.unsw.edu.au>
Date: Wed Jul 13 21:09:00 2005 -0700
[IA64] Fix undefined reference to can_cpei_retarget for simulator
The simulator build doesn't turn on ACPI, so doesn't have a definition
of can_cpei_retarget.
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit ba460e48064edeb57e3398eb8972c58de33f11ea
Author: Matthias Urlichs <smurf@smurf.noris.de>
Date: Thu Jul 14 00:33:47 2005 -0700
[PATCH] Option Card driver update, Maintainer entry
This patch updates the Option Card driver:
- remove a deadlock
- add sponsor notice
- add new card
- renamed the device to what's usually printed on it
- removed some dead code
- clean up a bunch of irregular whitespace (end-of-line, tabs)
Also add a MAINTAINERS entry for the Option Card driver.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 98848fa83bb6a4572ad55daeb312182dec9bed58
Author: Olaf Hering <olh@suse.de>
Date: Thu Jul 14 00:33:45 2005 -0700
[PATCH] ratelimit the ieee1394 IR legacy activated messages
running coriander1 with an Apple iSight produces lots of dmesg output.
Jul 13 22:14:17 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 13 22:15:28 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 13 22:15:59 ibook last message repeated 208 times
Jul 13 22:17:00 ibook last message repeated 762 times
Jul 13 22:18:01 ibook last message repeated 914 times
Jul 13 22:18:17 ibook last message repeated 238 times
Jul 13 22:18:17 ibook kernel: ieee1394: unsolicited response packet received - no tlabel match
Jul 13 22:18:17 ibook kernel: ohci1394: fw-host0: IR legacy activated
its less noisy with the patch:
Jul 14 08:03:08 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 14 08:03:26 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:42 ibook last message repeated 10 times
Jul 14 08:03:47 ibook kernel: printk: 63 messages suppressed.
Jul 14 08:03:47 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:52 ibook kernel: printk: 74 messages suppressed.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a2d2b5cb8e5d8787f009eeb3bbca52687bd42a77
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:44 2005 -0700
[PATCH] remove EXPORT_SYMBOL for root_dev
Remove ROOT_DEV after unexporting it in the previous patch, as requested time
ago by Christoph Hellwig.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a0d43df931870997467042931e8fb7657375d327
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:43 2005 -0700
[PATCH] uml: hostfs: unuse ROOT_DEV
Minimal patch removing uses of ROOT_DEV; next patch unexports it. I've
opposed this, but I've planned to reintroduce the functionality without using
ROOT_DEV.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 20d0021394c1b070bf04b22c5bc8fdb437edd4c5
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:43 2005 -0700
[PATCH] uml: allow building as 32-bit binary on 64bit host
This patch makes the command:
make ARCH=um SUBARCH=i386
work on x86_64 hosts (with support for building 32-bit binaries). This is
especially needed since 64-bit UMLs don't support 32-bit emulation for guest
binaries, currently. This has been tested in all possible cases and works.
Only exception is that I've built but not tested a 64-bit binary, because I
hadn't a 64-bit filesystem available.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ecc354a90af90a80dcaccc750f5f3e5e7c83112d
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:41 2005 -0700
[PATCH] uml: reintroduce pcap support
The pcap support was not working because of some linking problems (expressing
the construct in Kbuild was a bit difficult) and because there was no user
request. Now that this has come back, here's the support.
This has been tested and works on both 32 and 64-bit hosts, even when
"cross-"building 32-bit binaries.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8e0a21812427313f8ee8521688e81bfcc6f207a2
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:41 2005 -0700
[PATCH] uml: fix hppfs error path
Fix the error message to refer to the error code, i.e. err, not count, plus
add some cosmetical fixes.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1c30385ae479ec4774bdc1048726aeb15cde0d21
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:38 2005 -0700
[PATCH] uml: gcc 2.95 fix and Makefile cleanup
1) Cleanup an ugly hyper-nested code in Makefile (now only the arith.
expression is passed through the host bash).
2) Fix a problem with GCC 2.95: according to a report from Raphael Bossek,
.remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) } is expanded
into: .remap_data : { arch/um/sys-i386 /unmap_fin.o (.data .bss) }
(because I didn't use ## to join the two tokens), thus stopping linking. Pass
the whole path from the Makefile as a simple and nice fix.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Raphael Bossek <raphael.bossek@gmx.de>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2e5e55923e315e8198f46f24f7ca37e1fd9aa102
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:37 2005 -0700
[PATCH] uml: consolidate modify_ldt
*) Reorganize the two cases of sys_modify_ldt to share all the reasonably
common code.
*) Avoid memory allocation when unneeded (i.e. when we are writing and the
passed buffer size is known), thus not returning ENOMEM (which isn't
allowed for this syscall, even if there is no strict "specification").
*) Add copy_{from,to}_user to modify_ldt for TT mode.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1feb8d2d7396748fb3bd6795d09bbfbdd4c03dff
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:36 2005 -0700
[PATCH] uml: workaround host bug in "TT mode vs. NPTL link fix"
A big bug has been diagnosed on hosts running the SKAS patch and built with
CONFIG_REGPARM, due to some missing prevent_tail_call().
On these hosts, this workaround is needed to avoid triggering that bug,
because "to" is kept by GCC only in EBX, which is corrupted at the return of
mmap2().
Since to trigger this bug int 0x80 must be used when doing the call, it rarely
manifests itself, so I'd prefer to get this merged to workaround that host
bug, since it should cause no functional change. Still, you might prefer to
drop it, I'll leave this to you.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bcb01b8a67476e6f748086e626df8424cc27036d
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu Jul 14 00:33:34 2005 -0700
[PATCH] uml: fix lvalue for gcc4
Russell King <rmk+lkml@arm.linux.org.uk>
This construct is refused by GCC 4, so here's the (corrected) fix. Thanks to
Russell for noticing a stupid mistake I did when first sending this.
As he noted, the code is largely suboptimal however it currently works, and
will be fixed shortly. Just read the access_ok check on fp which is NULL, or
the pointer arithmetic below which should be done with a cast to void*:
frame = (struct rt_sigframe __user *)
round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;
The code shows clearly that has been taken from
arch/x86_64/kernel/signal.c:setup_rt_frame(), maybe in a bit of a hurry.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3952db66efee4f22f3c6a0fd02a1e7071556a8d6
Author: Michael Krufky <mkrufky@m1k.net>
Date: Thu Jul 14 00:33:33 2005 -0700
[PATCH] dvb: LGDT3302 QAM lock bug fix
Fix QAM lock bug. Previously, it was necessary to first scan in VSB before
attempting to get a QAM lock.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7fce2cf62e4bd9c24717009865ac00940cb664b8
Author: Chen, Kenneth W <kenneth.w.chen@intel.com>
Date: Tue Jul 12 15:57:13 2005 -0700
[SCSI] Redundant this_count check in sd_init_command()
I was going over the scsi I/O submit path, when sd_init_command
construct the scsi command, this_count is already checked in the
previous else if clause. Why does it need to check it again in
the last else block?
Patch to delete the spurious check.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 0f34e3f53378a11c9ecba0f8165da50e8b01d53f
Author: Chen, Kenneth W <kenneth.w.chen@intel.com>
Date: Tue Jul 12 17:06:14 2005 -0700
[SCSI] Redundant memset in scsi_alloc_sgtable
scsi_init_io calls scsi_alloc_sgtable and then calls blk_rq_map_sg
to initialize the scatterlist structure. blk_rq_map_sg() already
memset the structure for every new segment. That makes the memset
in scsi_alloc_sgtable unnecessary.
Patch to delete the extra memset in scsi_alloc_sgtable. Tested on
a x86_64 machine. Looks stable to me.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 2f4701d8274c8663f5c50323dc72fefa24b55091
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Wed Jul 13 22:05:03 2005 -0400
[SCSI] add int_to_scsilun() function
One of the issues we had was reverting the midlayers lun value
into the 8byte lun value that we wanted to send to the device.
Historically, there's been some combination of byte swapping,
setting high/low, etc. There's also been no common thread between
how our driver did it and others. I also got very confused as
to why byteswap routines were being used.
Anyway, this patch is a LLDD-callable function that reverts the
midlayer's lun value, stored in an int, to the 8-byte quantity
(note: this is not the real 8byte quantity, just the same amount
that scsilun_to_int() was able to convert and store originally).
This also solves the dilemma of the thread:
http://marc.theaimsgroup.com/?l=linux-kernel&m=112116...
A patch for the lpfc driver to use this function will be along
in a few days (batched with other patches).
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 77d74143612c1dab6c055dac21f965929ba0a7e6
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri Jul 8 18:00:36 2005 -0700
[SCSI] qla2xxx: Cleanup FC remote port registration.
Cleanup FC remote port registration.
Due to the inherent behaviour (an immediate scan) of adding
a 'target'-role-capable rport via fc_remote_port_add(),
split the registration into two steps -- addition as
unknown-type role, then use fc_remote_port_rolchg() with
appropriate role (based on PLOGI/PRLI bits). This allows
for a more cleaner rport->dd_data management as can be seen
with the simplified qla2xxx_slave_alloc() function.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 88c2666351f41a7d4459e79594f687a356f5e57c
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri Jul 8 17:59:26 2005 -0700
[SCSI] qla2xxx: Consolidate ISP24xx chip reset logic.
Consolidate ISP24xx chip reset logic.
Consolidate near-duplicate RISC reset logic from
qla24xx_reset_chip() and qla24xx_chip_diag(). Also, after
initiating a soft-reset, insure the firmware has completed
all NVRAM accesses before continuing.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit f0883ac6a74b403f0f2e91166ba06227cc4690e6
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri Jul 8 17:58:43 2005 -0700
[SCSI] qla2xxx: Add firmware version number to qla24xx_fw_version_str().
Add firmware version number to qla24xx_fw_version_str().
Original code was accidently trimmed during port.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 84e29308ede3edb4f03911246c33d697ff18722e
Author: Mark Haverkamp <markh@osdl.org>
Date: Thu Jul 7 13:40:00 2005 -0700
[SCSI] aacraid: Fix sgmap error
The wrong sgmap structure is being assigned in aac_send_raw_srb.
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 97cbe08ff8e78b075ed0ff64c99be8fb2d40d03f
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:32:47 2005 -0700
[SCSI] qla2xxx: Update version number to 8.01.00b5-k.
Update version number to 8.01.00b5-k.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit cc4731f5b4539faea237bacd170a27a230a7e724
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:32:37 2005 -0700
[SCSI] qla2xxx: Correct maximum supported lun and target-id definitions.
Correct maximum supported lun and target-id definitions.
The driver uses command-IOCBs which support a maximum lun
value of 0xffff -- correct #define to reflect the change.
Also, remove superfluous MAX_TARGET definition.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit ae91193cd5bc80b4d62b1d4f0e7f3fea48f41ccd
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:32:27 2005 -0700
[SCSI] qla2xxx: Update copyright banner.
Update copyright banner.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit f04a311fdc85d580526ef25eb547628042b1e510
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:32:17 2005 -0700
[SCSI] qla2xxx: Firmware updates.
Firmware updates.
Resync with latest 21xx firmware -- 1.19.25.
Resync with latest 22xx firmware -- 2.02.08.
Resync with latest 23xx/63xx firmware -- 3.03.15.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit fa2a1ce53d4b869b74da9a770770c79f9af64914
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:32:07 2005 -0700
[SCSI] qla2xxx: Code scrubbing.
Code scrubbing.
- Remove trailing whitespace from driver files.
- Remove unused #defines and inlines.
- Standardize on C comments (// -> /* */)
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit ba5140b48e35aa4e4b57eb6db5cface63d7bd712
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:57 2005 -0700
[SCSI] qla2xxx: NVRAM id-list updates.
NVRAM id-list updates.
Resync with latest NVRAM subsystem ID list.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit fca297037127e524e8f61b3fc1c7a1886e5d757b
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:47 2005 -0700
[SCSI] qla2xxx: Add OS initialization codes for ISP24xx recognition.
Add OS initialization codes for ISP24xx recognition.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 0107109ed69c9e04b6fa35ac41d870c74dcce3fc
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:37 2005 -0700
[SCSI] qla2xxx: Add ISP24xx initialization routines.
Add ISP24xx initialization routines.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 9a853f71804d80e862362f6d0743d06955305752
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:27 2005 -0700
[SCSI] qla2xxx: Add ISP24xx ISR routines.
Add ISP24xx ISR routines.
Add appropriate glue-code for ISP24xx support -- this
included generalizing some of the core handling
routines (qla2x00_async_event() [pull-up retrieval of
mailbox values] and qla2x00_status_entry()]. Fixup
2100/2300 ISRs to handle the new conventions.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 2b6c0cee90cecbce35fb6d65fed94f22e5063be0
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:17 2005 -0700
[SCSI] qla2xxx: Add ISP24xx IOCB manipulation routines.
Add ISP24xx IOCB manipulation routines.
Add appropriate glue-code for ISP24xx support while
manipulting IOCB packets. Add an ISP24xx specific
'start_scsi' routine due to command-type-7 layout
changes.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 459c537807bd72cce7b007fb218bb5a658a6c3c1
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:31:07 2005 -0700
[SCSI] qla2xxx: Add ISP24xx flash-manipulation routines.
Add ISP24xx flash-manipulation routines.
Add read/write flash manipulation routines for the ISP24xx.
Update sysfs NVRAM objects to use generalized accessor
functions.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 1c7c63574ff3e568ca374e9f05e30b8d7d64273e
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:57 2005 -0700
[SCSI] qla2xxx: Add MBX command routines for ISP24xx support.
Add MBX command routines for ISP24xx support.
Generalize several routines [qla2x00_load_ram_ext(),
qla2x00_execute_fw(), qla2x00_verify_checksum()] to handle
larger addressing space.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 8c958a99d6a903ce4ffaa6780f3425a8567db9e6
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:47 2005 -0700
[SCSI] qla2xxx: Generalize SNS generic-services routines.
Generalize SNS generic-services routines.
Consolidate completion-status checking while adding support
for the ISP24xx.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 6d9b61ed94fd9097f81adfa78d31c4613d9b3ae4
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:36 2005 -0700
[SCSI] qla2xxx: Add ISP24xx diagnostic routines.
Add ISP24xx diagnostic routines.
Add function and structure definitions for the ISP24xx
diagnostic firmware dump routines.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 3d71644cf952fd1157a13173237258422ba3c569
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:26 2005 -0700
[SCSI] qla2xxx: Add ISP24xx definitions.
Add ISP24xx definitions.
Add requisite structure definitions and #define's for ISP24xx
support. Also drop volatile modifiers from device_reg_* register
layouts as the members are never really accessed, only their
offsets within the layout are used during reads and writes.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit ac96202ba096f8fc1ccaf45a2f159a52639ece29
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:16 2005 -0700
[SCSI] qla2xxx: Add pci ids for new ISP types.
Add pci ids for new ISP types.
Move old definitions in local qla_def.h file to pci_ids.h as
well.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit abbd8870b9cb7754a4935826bc9f3c7b029f8b7c
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Wed Jul 6 10:30:05 2005 -0700
[SCSI] qla2xxx: Factor-out ISP specific functions to method-based call tables.
Factor-out ISP specific functions to method-based call tables.
In anticipation of ISP24xx/ISP25xx support, factor-out ISP
specific functions into a method-based call table.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 514fd7fd01d378a7b5584c657d9807fc28f22079
Merge: 1e279dd855d15b72364b4103f872d67d8592647e 99ad25a313bda566a346b46a6015afa65bc0a02b
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 13 15:48:33 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commit c514720716c7b109ff980f8b3cb93f9af872c91c
Merge: 07929dcb963786512c760dd3ecd148d89295e7e5 1e279dd855d15b72364b4103f872d67d8592647e
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Jul 13 23:09:23 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 1e279dd855d15b72364b4103f872d67d8592647e
Author: Miles Bader <miles@gnu.org>
Date: Wed Jul 13 14:40:03 2005 +0900
[PATCH] v850: Align ___start___param to match parameter alignment
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961
Merge: a61caa8523a76e497f6b2a05350c892bc5ee402c 6a8b4d319c52f8a3fdca46b185d001fbf0939911
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 13 12:19:30 2005 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
commit 99ad25a313bda566a346b46a6015afa65bc0a02b
Merge: f62c4a96f74d6c6dd56d1742697e94a5c2085e87 9a556e89081b0c1c2f83cee915363b15a68a6f2d
Author: Tony Luck <tony.luck@intel.com>
Date: Wed Jul 13 12:15:43 2005 -0700
Auto merge with /home/aegl/GIT/linus
commit f62c4a96f74d6c6dd56d1742697e94a5c2085e87
Author: David Mosberger-Tang <David.Mosberger@acm.org>
Date: Tue Jul 12 21:51:00 2005 -0700
[IA64] Make PCDP work again.
Mark's patch added "attribute((packed))" for pcdp_uart, without
accounting for the fact that the structure definition _relied_ on
implicit padding by 6 bytes. Fix is to make the padding explicit.
Signed-off-by: David Mosberger-Tang <David.Mosberger@acm.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 59a0a8aa6ab6e46926e8d12694593267c0869440
Author: Dean Nelson <dcn@sgi.com>
Date: Wed Jul 13 05:45:00 2005 -0700
[IA64] fix call of smp_processor_id() by XPC while
XPC calls smp_processor_id() twice from xpc_setup_infrastructure() with
preemption enabled, which gets flagged if 'DEBUG_PREEMPT=y'. This patch
replaces the two calls to smp_processor_id() by a single call to
raw_smp_processor_id() since any CPU within the partition will do.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit a61caa8523a76e497f6b2a05350c892bc5ee402c
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed Jul 13 12:56:42 2005 +0200
[PATCH] Amiga joystick: Fix typo introduced by the open/close race fixes
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f264cc28245d4d635d586be8c2148140726756dd
Author: Olof Johansson <olof@lixom.net>
Date: Wed Jul 13 01:11:44 2005 -0700
[PATCH] ppc64: add 970MP PVR
Add PVR value and tests for 970MP. Also switch to a simpler (but slightly
longer) check at init time for simplicity.
Signed-off-by: Olof Johansson <olof@austin.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 96e2844999f99878fc5b03b81ccaa60580005b81
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Wed Jul 13 01:11:42 2005 -0700
[PATCH] ppc64: kill bitfields in ppc64 hash code
This patch removes the use of bitfield types from the ppc64 hash table
manipulation code.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f13487c66c75f5db004a0631047309d9e7c5aab7
Author: Olaf Hering <olh@suse.de>
Date: Wed Jul 13 01:11:41 2005 -0700
[PATCH] ppc32: make -j12 all fails in uImage target
make -j zImage may call if_changed twice at the same time, the result is a
corrupted vmlinux.gz
Write to a temporary file for the time being until someone with make skills
fix the serialization properly.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7ee91ec14bd4def036b4084da29869382078e44b
Author: Steve Dickson <SteveD@redhat.com>
Date: Wed Jul 13 01:10:47 2005 -0700
[PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64
Allow the setting of NLM timeouts and grace periods through the proc and
sysclt interfaces on x86_64 architectures
Signed-off-by: Steve Dickson <steved@redhat.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 068e1b94bbd268f375349f68531829c8b7c210bc
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Jul 13 01:10:46 2005 -0700
[PATCH] s390: fadvise hint values.
Add special case for the POSIX_FADV_DONTNEED and POSIX_FADV_NOREUSE hint
values for s390-64. The user space values in the s390-64 glibc headers for
these two defines have always been 6 and 7 instead of 4 and 5. All 64 bit
applications therefore use the "wrong" values. To get these applications
working without recompiling the kernel needs to accept the "wrong" values.
Since the values for s390-31 are 4 and 5 the compat wrapper for fadvise64
and fadvise64_64 need to rewrite the values for 31 bit system calls.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ddca3b80cef36cc668f924ef5154a79acb19ebd7
Author: Guillaume Autran <gautran@mrv.com>
Date: Wed Jul 13 01:10:45 2005 -0700
[PATCH] ppc32: fix destroy_context() race condition
Fix for a race condition when a task gets preempted by another task while
executing the destroy_context(...) in a FEW_CONTEXTS environment.
mm->context == NO_CONTEXT but the context_map may indicate all contexts are
in use.
The solution to this problem is to disable kernel preemption while
destroying a MMU context.
Signed-off-by: Guillaume Autran <gautran@mrv.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 88bd5121d635136e01369141367f315665534b3c
Author: Anton Altaparmakov <aia21@cam.ac.uk>
Date: Wed Jul 13 01:10:44 2005 -0700
[PATCH] Fix soft lockup due to NTFS: VFS part and explanation
Something has changed in the core kernel such that we now get concurrent
inode write outs, one e.g via pdflush and one via sys_sync or whatever.
This causes a nasty deadlock in ntfs. The only clean solution
unfortunately requires a minor vfs api extension.
First the deadlock analysis:
Prerequisive knowledge: NTFS has a file $MFT (inode 0) loaded at mount
time. The NTFS driver uses the page cache for storing the file contents as
usual. More interestingly this file contains the table of on-disk inodes
as a sequence of MFT_RECORDs. Thus NTFS driver accesses the on-disk inodes
by accessing the MFT_RECORDs in the page cache pages of the loaded inode
$MFT.
The situation: VFS inode X on a mounted ntfs volume is dirty. For same
inode X, the ntfs_inode is dirty and thus corresponding on-disk inode,
which is as explained above in a dirty PAGE_CACHE_PAGE belonging to the
table of inodes ($MFT, inode 0).
What happens:
Process 1: sys_sync()/umount()/whatever... calls __sync_single_inode() for
$MFT -> do_writepages() -> write_page for the dirty page containing the
on-disk inode X, the page is now locked -> ntfs_write_mst_block() which
clears PageUptodate() on the page to prevent anyone else getting hold of it
whilst it does the write out (this is necessary as the on-disk inode needs
"fixups" applied before the write to disk which are removed again after the
write and PageUptodate is then set again). It then analyses the page
looking for dirty on-disk inodes and when it finds one it calls
ntfs_may_write_mft_record() to see if it is safe to write this on-disk
inode. This then calls ilookup5() to check if the corresponding VFS inode
is in icache(). This in turn calls ifind() which waits on the inode lock
via wait_on_inode whilst holding the global inode_lock.
Process 2: pdflush results in a call to __sync_single_inode for the same
VFS inode X on the ntfs volume. This locks the inode (I_LOCK) then calls
write-inode -> ntfs_write_inode -> map_mft_record() -> read_cache_page() of
the page (in page cache of table of inodes $MFT, inode 0) containing the
on-disk inode. This page has PageUptodate() clear because of Process 1
(see above) so read_cache_page() blocks when tries to take the page lock
for the page so it can call ntfs_read_page().
Thus Process 1 is holding the page lock on the page containing the on-disk
inode X and it is waiting on the inode X to be unlocked in ifind() so it
can write the page out and then unlock the page.
And Process 2 is holding the inode lock on inode X and is waiting for the
page to be unlocked so it can call ntfs_readpage() or discover that
Process 1 set PageUptodate() again and use the page.
Thus we have a deadlock due to ifind() waiting on the inode lock.
The only sensible solution: NTFS does not care whether the VFS inode is
locked or not when it calls ilookup5() (it doesn't use the VFS inode at
all, it just uses it to find the corresponding ntfs_inode which is of
course attached to the VFS inode (both are one single struct); and it uses
the ntfs_inode which is subject to its own locking so I_LOCK is irrelevant)
hence we want a modified ilookup5_nowait() which is the same as ilookup5()
but it does not wait on the inode lock.
Without such functionality I would have to keep my own ntfs_inode cache in
the NTFS driver just so I can find ntfs_inodes independent of their VFS
inodes which would be slow, memory and cpu cycle wasting, and incredibly
stupid given the icache already exists in the VFS.
Below is a patch that does the ilookup5_nowait() implementation in
fs/inode.c and exports it.
ilookup5_nowait.diff:
Introduce ilookup5_nowait() which is basically the same as ilookup5() but
it does not wait on the inode's lock (i.e. it omits the wait_on_inode()
done in ifind()).
This is needed to avoid a nasty deadlock in NTFS.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9a556e89081b0c1c2f83cee915363b15a68a6f2d
Author: Robert Love <rml@novell.com>
Date: Wed Jul 13 13:49:23 2005 -0400
[PATCH] inotify: misc cleanup
Really simple, basic cleanup.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5995f16b4a464c8a57de7c9d5ddf4758dbacad41
Author: Robert Love <rml@novell.com>
Date: Wed Jul 13 12:38:39 2005 -0400
[PATCH] inotify: event ordering
This rearranges the event ordering for "open" to be consistent with the
ordering of the other events.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0399cb08c54708db231d616f106f64d920e0b723
Author: Robert Love <rml@novell.com>
Date: Wed Jul 13 12:38:18 2005 -0400
[PATCH] inotify: move sysctl
This moves the inotify sysctl knobs to "/proc/sys/fs/inotify" from
"/proc/sys/fs". Also some related cleanup.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 153f805781d35c91ab2f54aa2b8930cc4cfc7e89
Author: James Bottomley <James.Bottomley@SteelEye.com>
Date: Wed Jul 13 09:38:05 2005 -0400
[PATCH] fix voyager subarchitecture EXPORT_SYMBOL breakage caused by i386_ksym reduction
This patch:
[PATCH] Remove i386_ksyms.c, almost
made files like smp.c do their own EXPORT_SYMBOLS. This means that all
subarchitectures that override these symbols now have to do the exports
themselves. This patch adds the exports for voyager (which is the most
affected since it has a separate smp harness). However, someone should
audit all the other subarchitectures to see if any others got broken.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c327ff6250fb558659ad689fe33f50524eda74e3
Merge: c0ac515e2951dd2a999cfd21dea3fdc1055f1573 59192ed9e7aa81b06a1803661419f7261afca1ad
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 13 10:37:36 2005 -0700
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
commit c0ac515e2951dd2a999cfd21dea3fdc1055f1573
Author: Jeff Mahoney <jeffm@suse.com>
Date: Wed Jul 13 11:55:42 2005 -0400
[PATCH] Lindent: ignore .indent.pro
When I recently submitted a Lindent patch, it turned out that my .indent.pro
options were also applied to the tree. This patch directs indent(1) to ignore
the .indent.pro directives and only use options specified on the command
line.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6cd59f7a4119fef124677827a9b30684c2c8e674
Merge: c32511e2718618f0b53479eb36e07439aa363a74 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Jul 13 10:12:50 2005 -0700
Merge /home/torvalds/linux-2.6-arm
commit 6a8b4d319c52f8a3fdca46b185d001fbf0939911
Author: Joern Engel <joern@wohnheim.fh-wedel.de>
Date: Wed Jul 13 16:45:43 2005 +0100
[MTD] cfi_cmdset_0002: Plugged a mem leak.
Signed-off-by: Joern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 59192ed9e7aa81b06a1803661419f7261afca1ad
Author: Ian Dall <ian@beware.dropbear.id.au>
Date: Wed Jul 13 09:15:18 2005 -0500
JFS: Need to be root to create files with security context
It turns out this is due to some inverted logic in xattr.c
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 6211502d7ee9e515e4458d0c0ebfbb70553dc7de
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Wed Jul 13 09:07:53 2005 -0500
JFS: Allow security.* xattrs to be set on symlinks
All of the different xattr namespaces have different rules.
user.* and ACL's are not allowed on symlinks, and since these were the
first xattrs implemented, I assumed there was no need to support xattrs
on symlinks. This one-line patch should fix it.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit f7f24758ac98a506770bc5910d33567610fa3403
Merge: b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0 c32511e2718618f0b53479eb36e07439aa363a74
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Wed Jul 13 08:57:38 2005 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8
Merge: a98a5d04f400ad112e59cadd739dbabf89417e60 c32511e2718618f0b53479eb36e07439aa363a74
Author: Thomas Gleixner <tglx@tglx.tec.linutronix.de>
Date: Wed Jul 13 10:45:00 2005 +0200
Merge with rsync://fileserver/linux
commit 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc
Author: Christoph Lameter <clameter@sgi.com>
Date: Tue Jul 12 16:03:00 2005 -0700
[IA64] Altix pcibus_to_node implementation
The Altix subarch does not provide node information via ACPI. Instead hooks
are used to fixup pci structures. This patch determines the nodes for Altix
PCI busses.
Remote Bridges:
---------------
Altix supports remote I/O nodes without memory or processors but with bridges.
The TIOCA type of bridge is an AGP bridge and the PROM provides information
about the closest node. That information will be returned by pcibus_to_node.
The TIOCP remote bridge type is a PCI bridge but the PROM does not provide a
closest node id. pcibus_to_node will return -1 for devices on those bridges
meaning that device control structures may be allocated on any node.
Safeguard:
----------
Should the fixups result in invalid node information for a pci controller then
a warning will be printed and pcibus_to_node will return -1.
This patch also fixes the "FIXME" in sn_dma_alloc_coherent. This means that
dma_alloc_coherent will now use alloc_pages_node to allocate memory local to
the node that the PCI device is connected to.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit a98a5d04f400ad112e59cadd739dbabf89417e60
Merge: 751382dd5cb2702368d281a50b55c2d6c4e8fbfc 7ac3db59fd4410405ce55e2a25c397aec440d8da
Author: Todd Poynor <tpoynor@mvista.com>
Date: Tue Jul 12 03:34:39 2005 +0100
Merge with rsync://fileserver/linux
commit 08357f82d4decc48bbfd39ae30d5fe0754f7f576
Author: Zoltan Menyhart <Zoltan.Menyhart@bull.net>
Date: Fri Jun 3 05:36:00 2005 -0700
[IA64] improve flush_icache_range()
Check with PAL to see what the i-cache line size is for
each level of the cache, and so use the correct stride
when flushing the cache.
Acked-by: David Mosberger
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 751382dd5cb2702368d281a50b55c2d6c4e8fbfc
Author: Todd Poynor <tpoynor@mvista.com>
Date: Tue Jul 12 03:34:39 2005 +0100
[JFFS2] Avoid compiler warnings when JFFS2_FS_WRITEBUFFER=n
Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit b62205986a73a40e4fc174d2ef668e3895e925bc
Author: Artem B. Bityuckiy <dedekind@infradead.org>
Date: Tue Jul 12 17:37:12 2005 +0100
[JFFS2] Init locks early during mount
In case of a mount error locks might be uninitialized but
accessed by the resulting call to jffs2_kill_sb().
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit e4fef6618992bea48b7856ebbd236796b744964f
Author: Artem B. Bityuckiy <dedekind@infradead.org>
Date: Sun Jul 10 16:15:36 2005 +0100
[JFFS2] Rename function and update comments
We recently changed the method of collecting and sorting of
tmp_dnode objects to use a temporary RB-tree instead of a
temporary list. Rename function and update comments.
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf
Author: Artem B. Bityuckiy <dedekind@infradead.org>
Date: Sun Jul 10 14:13:58 2005 +0100
[JFFS2] Remove needless variable initialization
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 336d2ff7115bd4391108a16f476c739cb4a505b0
Author: Artem B. Bityuckiy <dedekind@infradead.org>
Date: Thu Jul 7 16:45:32 2005 +0100
[JFFS2] Avoid alloc/dealloc for zero sized nodes
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 60a762b6a6dec17cc4339b60154902fd04c2f9f2
Author: Greg Edwards <edwardsg@sgi.com>
Date: Tue Jun 28 11:13:00 2005 -0700
[IA64] remove CONFIG_IA64_SGI_SN_SIM
This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing
any kernel bootable on sn2 to also be booted in the simulator.
Boot tested on Altix and HP rx2600.
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd
Author: Christoph Lameter <clameter@sgi.com>
Date: Thu Jul 7 16:59:00 2005 -0700
[IA64] pcibus_to_node implementation for IA64
pcibus_to_node provides a way for the Linux kernel to identify to which
node a certain pcibus connects to. Allocations of control structures
for devices can then be made on the node where the pci bus is located
to allow local access during interrupt and other device manipulation.
This patch provides a new "node" field in the the pci_controller
structure. The node field will be set based on ACPI information (thanks
to Alex Williamson <alex.williamson@hp.com for that piece).
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893
Author: Thomas Gleixner <tglx@tglx.tec.linutronix.de>
Date: Tue Jul 12 17:51:06 2005 +0200
[MTD] Make XIP support depend on CONFIG_ARM
ARM is the only known user of this at the moment.
Prevent allyes builds for other archs from failing
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit eb1dd68bc897d4e5a5133bfffbd4777a0fe16c4c
Author: James Bottomley <James.Bottomley@steeleye.com>
Date: Sat Jul 2 12:22:01 2005 -0400
[SCSI] SPI transport class, don't negotiate options not supported
At the moment, the transport class blindly tries to set things like
QAS and IU, even if the drive won't support them. It's best not to
annoy the devices like this and instead only set what the drive says
is actually supported.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon Jul 11 19:42:58 2005 +0100
[PATCH] ARM SMP: Initialise cpu_present_map
Rather than relying on the fixup code in init/main.c, explicitly
initialise cpu_present_map.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e11b2236eace94ad9a2e421904742e83976405ed
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon Jul 11 19:26:31 2005 +0100
[PATCH] ARM SMP: We list IRQs for present CPUs, not online CPUs
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 2a40342e0e72a2ba89aaa9e6c9a9eceb04741b24
Author: Christoph Hellwig <hch@lst.de>
Date: Tue Jun 28 16:50:40 2005 +0200
[SCSI] aic7xxx: remove ahc_tailq
now that we do normal PCI probing there's no need to keep a list of
all HBAs.
Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit dfd287f6ee9be1e3ae8fe1160c185aac6ca83c6a
Author: Christoph Hellwig <hch@lst.de>
Date: Tue Jun 28 16:49:44 2005 +0200
[SCSI] aic7xxx: sane pci probing
always probe in bus order, avoid any reordering
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 7f602c53939fdb1bca12151a28f9b90cde046fb1
Author: James Bottomley <James.Bottomley@steeleye.com>
Date: Sat May 21 10:24:37 2005 -0500
[SCSI] add TYPE_RBC to our type table
Here's a tiny update that means we print the correct ASCII type
information
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit d12734d14e5602816f0b16b17a8cef5ea70afb5a
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon Jul 11 17:38:36 2005 +0100
[PATCH] ARM SMP: Rename cpu_present_mask to cpu_possible_map
The kernel's terminology for this is cpu_possible_map not
cpu_present_mask.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a5990120252539bccdaf70a66ac021966e80e3f7
Author: Andrew Morton <akpm@osdl.org>
Date: Sat Jul 9 01:30:02 2005 -0700
[SCSI] dpt_i2o warning fix
drivers/scsi/dpt_i2o.c: In function `adpt_queue':
drivers/scsi/dpt_i2o.c:385: warning: unused variable `timeout'
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit cc33895abbba85668de11df2cd04d6faf0be43e1
Author: Andrew Morton <akpm@osdl.org>
Date: Sat Jul 9 01:30:03 2005 -0700
[SCSI] aic79xx: ahd_linux_dev_reset() cleanup
Use the macros consistently in ahd_linux_dev_reset().
If ahd_linux_dev_reset() really can be called with local interrupts disabled
then yuk.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 7343c9ba8ed9d504cd2daf960da58971c6631601
Author: Olaf Hering <olh@suse.de>
Date: Mon Jul 11 10:17:06 2005 +0100
[PATCH] ARM: remove linux/version.h include from arch/arm
Changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 07929dcb963786512c760dd3ecd148d89295e7e5
Merge: c2d9b8387bce8b4a0fd402fab7dc1319d11a418d 19f7241a3b087bbf4dd107c979608fdb56c83a09
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon Jul 4 14:14:42 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit ace4e7185d565cab057139e8927659bd072bf25a
Author: James Bottomley <James.Bottomley@steeleye.com>
Date: Sat Jul 2 14:46:14 2005 -0500
[SCSI] aic7xxx: fix boot hang with Fujitsu drives
Apparently these are the only drives that try to negotiate IU and QAS
at u160 speeds. The aic7xxx driver can't cope with this. The fix is
to eliminate the IU and QAS setting routines. I've #if 0'd them out,
just in case we ever get the sequencer documentation out of Adaptec,
since we'd then be able to fix the driver.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit b4687ca42cb82a7821f682dde0310b16ce284770
Author: Linda Xie <lxiep@us.ibm.com>
Date: Mon Jun 27 17:01:48 2005 -0500
[SCSI] IBM VSCSI Client: sending client info to server
Fix the problem in IBM VSCSI Client where the client doesn't send the
information which is expected by the server.
Signed-off-by: Linda Xie <lxie@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit fc2b035d38c06a884cb521bb4a1e1183f5eaccf1
Author: Christoph Hellwig <hch@lst.de>
Date: Mon Jun 27 22:43:06 2005 +0200
[SCSI] ifdef out broken fc4 EH code
This code pokes deep into EH internals and duplicates scsi_error.c code
wrongly. It doesn't compile anymore in scsi-misc, so let's #if 0 out
the code - the driver hasn't worked for more than five years anyway.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit eda912e34a0cc40ddd502b3f984e37ebb2b13a71
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:42 2005 -0400
[SCSI] lpfc: Change version to 8.0.29.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit c44ce1737438d20ac58e808897e3f8eb015c66d3
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:39 2005 -0400
[SCSI] lpfc: Update copyright notices
Update copyright notice text and include year 2005.
Add Copyright notice for Christoph Hellwig to several files: lpfc.h
lpfc_attr.c lpfc_els.c lpfc_hbadisc.c lpfc_init.c lpfc_mbox.c
lpfc_mem.c lpfc_nportdisc.c lpfc_scsi.c lpfc_sli.c
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 5542134f61157d0bbd4e392919cae811a88a3e81
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:36 2005 -0400
[SCSI] lpfc: Remove $Id$ keyword strings.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 2501322eee84763a07fd4a3eed81b63c1837e204
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:33 2005 -0400
[SCSI] lpfc: Fix ADISC completion incorrectly putting initiators on mapped list
Symptom - An unmapped node (initiator) that goes away in a situation
such as cable pull, comes back as a mapped node. Fix - On ADISC
completion, put a list on the mapped list only if it is a FCP_TARGET.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 5eb95af086f5d2e554bb119f3cb71f7ca38bfe85
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:30 2005 -0400
[SCSI] lpfc: Add completion handler to the abort iocbs
Add completion handler to the abort iocbs to close a hole where we
could reuse an iotag.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 1f679cafd2d02b7076e9045d9c4fb77ef8d059f2
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:27 2005 -0400
[SCSI] lpfc: Fix LS_RJT never sent by lpfc_els_unsol_event()
lpfc_els_unsol_event() checks rjt_err to determine is LS_RJT should be
sent. However, rjt_err was set to LSEXP_NOTHING_ELSE (which is 0) in
cases where an LS_RJT should be sent, so rjt_err was never true.
Change lpfc_els_unsol_event() to set rjt_err to 1 when LS_RJT should
be sent.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 06325e7459b54fc924d00fe363068f6cbf284571
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:22 2005 -0400
[SCSI] lpfc: Add LP6000 PCI ID
Fix driver not seeing LP6000. Fix: add PCI id to the pci_device_id
table and a short description for the HBA in get_hba_model_desc().
Also add a default clause to the switch statement that parses the
various PCI ID's.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 564b2960833f8802ae2b7b7ad840f154647549c7
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:17 2005 -0400
[SCSI] lpfc: Set max_sectors in host template
Add max_sectors to the driver host template and initialize it with
0xFFFF since the driver has no limitations on the size a transfer
contained by a scsi command and that fits within the sg_tablesize
provisioned by the driver. This fixes a performance issue seen in
some configurations.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 87f6eaffd732bc20b5a02e9f36b86f67310d8129
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:13 2005 -0400
[SCSI] lpfc: Fix error loading on sparc
Bug reported via SourceForge - lpfc does not load on sparc. The lpfc
driver must byteswap all FCP IOCBs to recover the data into cpu native
format.
Also correct issue of "iotag not found" messages
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit db468d108abc0bb348bcfc54b8e06145922fb6b1
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:08 2005 -0400
[SCSI] lpfc: Fixes in mbox_timeout_handler
Analysis:
Timeout of READ_SPARM64 causes call to lpfc_mbox_timeout_handler which
reads psli->mbox_active to determine the timeout mbox. Timeout
handler then NULL's psli->mbox_active and calls
lpfc_mbx_cmpl_read_sparam(), which on timeout condition, calls
link_down(). link_down() now calls disc_done() which calls
mbox_timeout_hander() again since WORKER_MBOX_TMO is still set, which
goes back to read psli->mbox_active which is already NULL'ed.
Remove redundant if statement in lpfc_mbox_timeout_handler. pmbox is
assigned psli->mbox_active so there is no need to check if it actually
equals psli->mbox_active.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 6e8215e48865bda2e07c1c0633952e35fa3b170c
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:04 2005 -0400
[SCSI] Fix issue where all hosts log nodev message for other initiators
Fix issue where all hosts connected to SAN get spammed with nodev
message when other initiators go away. Display nodev message only
when FC targets go away. However this behavior will be overridden if
LOG_DISCOVERY is set.
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 4cc2da1d84eeddb9e9259e61efd58691399434b2
Author: James.Smart@Emulex.Com <James.Smart@Emulex.Com>
Date: Sat Jun 25 10:34:00 2005 -0400
[SCSI] lpfc: hgp/pgp cleanups
From: Christoph Hellwig <hch@lst.de>:
- rename PGP/HPH to lpfc_pgp/lpfc_hgp
- use __le32 types for the members to start fixing sparse -Wbitwise
issues
- remove lpfc_sli.MBhostaddr, we can always use the pointer from
SLI2_DESC directly
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 6e3815ba3a6d392fa9cfbf08208f64c06d9558c4
Author: Moore, Eric Dean <Eric.Moore@lsil.com>
Date: Fri Jun 24 12:18:57 2005 -0600
[SCSI] - mptfusion - convert to new change_queue_depth API
Convert driver to use new change_queue_depth API.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Fixed up rejections and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit c2d9b8387bce8b4a0fd402fab7dc1319d11a418d
Merge: 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Jun 30 09:52:20 2005 +0100
Automerge with /usr/src/ntfs-2.6.git.
commit b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0
Author: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Mon Jun 27 15:35:37 2005 -0500
JFS: Code cleanup - getting rid of never-used debug code
I'm finally getting around to cleaning out debug code that I've never used.
There has always been code ifdef'ed out by _JFS_DEBUG_DMAP, _JFS_DEBUG_IMAP,
_JFS_DEBUG_DTREE, and _JFS_DEBUG_XTREE, which I have personally never used,
and I doubt that anyone has since the design stage back in OS/2. There is
also a function, xtGather, that has never been used, and I don't know why it
was ever there.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 2a322e4c08be4e7cb0c04b427ddaaa679fd88863
Merge: ba6d2377c85c9b8a793f455d8c9b6cf31985d70f 8678887e7fb43cd6c9be6c9807b05e77848e0920
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sun Jun 26 22:19:40 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit ba6d2377c85c9b8a793f455d8c9b6cf31985d70f
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sun Jun 26 22:12:02 2005 +0100
NTFS: Fix a nasty deadlock that appeared in recent kernels.
The situation: VFS inode X on a mounted ntfs volume is dirty. For
same inode X, the ntfs_inode is dirty and thus corresponding on-disk
inode, i.e. mft record, which is in a dirty PAGE_CACHE_PAGE belonging
to the table of inodes, i.e. $MFT, inode 0.
What happens:
Process 1: sys_sync()/umount()/whatever... calls
__sync_single_inode() for $MFT -> do_writepages() -> write_page for
the dirty page containing the on-disk inode X, the page is now locked
-> ntfs_write_mst_block() which clears PageUptodate() on the page to
prevent anyone else getting hold of it whilst it does the write out.
This is necessary as the on-disk inode needs "fixups" applied before
the write to disk which are removed again after the write and
PageUptodate is then set again. It then analyses the page looking
for dirty on-disk inodes and when it finds one it calls
ntfs_may_write_mft_record() to see if it is safe to write this
on-disk inode. This then calls ilookup5() to check if the
corresponding VFS inode is in icache(). This in turn calls ifind()
which waits on the inode lock via wait_on_inode whilst holding the
global inode_lock.
Process 2: pdflush results in a call to __sync_single_inode for the
same VFS inode X on the ntfs volume. This locks the inode (I_LOCK)
then calls write-inode -> ntfs_write_inode -> map_mft_record() ->
read_cache_page() for the page (in page cache of table of inodes
$MFT, inode 0) containing the on-disk inode. This page has
PageUptodate() clear because of Process 1 (see above) so
read_cache_page() blocks when it tries to take the page lock for the
page so it can call ntfs_read_page().
Thus Process 1 is holding the page lock on the page containing the
on-disk inode X and it is waiting on the inode X to be unlocked in
ifind() so it can write the page out and then unlock the page.
And Process 2 is holding the inode lock on inode X and is waiting for
the page to be unlocked so it can call ntfs_readpage() or discover
that Process 1 set PageUptodate() again and use the page.
Thus we have a deadlock due to ifind() waiting on the inode lock.
The solution: The fix is to use the newly introduced
ilookup5_nowait() which does not wait on the inode's lock and hence
avoids the deadlock. This is safe as we do not care about the VFS
inode and only use the fact that it is in the VFS inode cache and the
fact that the vfs and ntfs inodes are one struct in memory to find
the ntfs inode in memory if present. Also, the ntfs inode has its
own locking so it does not matter if the vfs inode is locked.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit c0df28cfe012652160a530f9aa74b0a49c77eac5
Author: James Bottomley <James.Bottomley@steeleye.com>
Date: Sat Jun 25 16:23:44 2005 -0500
[SCSI] aic7xxx: correct target valid check in aic7xxx_proc.c
From: Andy Whitcroft <apw@shadowen.org>
Updated to remove the bogus translated target check.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 937abeaadf1b00252690f9de35b9df13feb0afd7
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:43:56 2005 +0200
[SCSI] use list_for_each_entry_safe in scsi_error.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 3111b0d1646b3e1891dc08112d087aed2146fafe
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:43:26 2005 +0200
[SCSI] remove scsi_eh_eflags_ macros
Just opencoded access to eh_eflags, it's much more readable anyway.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 8d115f845a0bd59cd263e791f739964f42b7b0e8
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:42:05 2005 +0200
[SCSI] remove scsi_cmnd->state
We never look at it except for the old megaraid driver that abuses it
for sending internal commands. That usage can be fixed easily because
those internal commands are single-threaded by a mutex and we can easily
use a completion there.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit b4edcbcafdecc80ef5356ff6452768b1b926ea76
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:40:52 2005 +0200
[SCSI] remove scsi_cmnd->owner
never checked anywhere
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit f5ad56145d43cdb68760bba3e14655ff6ae726aa
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:40:08 2005 +0200
[SCSI] remove scsi_cmnd->abort_reason
Never used for anything but printing it out in debug routines.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit a4c8f6285165a7089edb2010dbd894148ca95d57
Author: Christoph Hellwig <hch@lst.de>
Date: Sun Jun 19 13:39:23 2005 +0200
[SCSI] remove scsi_cmnd.eh_state
it's never set to anything, and just three broken drivers are looking
at it and doing odd things.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit fa4c49669f0408557bc52cd7054c920a8790dec6
Author: James Bottomley <jejb@titanic.(none)>
Date: Sun Jun 26 08:45:39 2005 -0500
[SCSI] megaraid: fix compilation after eh locking changes
From: Christoph Hellwig <hch@lst.de>
Patch fixed up and
commit 849717383abc795b8f5efe7b9e0792b2e1f8916a
Author: Mark Haverkamp <markh@osdl.org>
Date: Mon Jun 20 11:55:24 2005 -0700
[SCSI] aacraid: New products patch
This patch add the following products to the driver:
IBM ServeRAID 8i
ICP 9014R0
ICP 9024R0
ICP 9047MA
ICP 9087MA
ICP 9085LI
ICP 5085AU
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 12413197eef2a29e0b9fb0fa541f5cbaeb1d3f3f
Author: Christoph Hellwig <hch@lst.de>
Date: Sat Jun 11 01:05:01 2005 +0200
[SCSI] remove scsi_set_device
scsi_add_host is the proper place to set the device, but people copy
the scsi_set_device usage from older drivers again and again.
note that this leaves some legacy drivers like qlogicisp/qlogicfc
without pci association in sysfs, but they're scheduled to go away soon
anyway.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 117e4b27ebb1133072b1453145e60e576569e8af
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Jun 20 23:55:07 2005 +0200
[SCSI] scsi/qla1280: replace schedule_timeout() with ssleep()
Use ssleep() instead of schedule_timeout to guarantee the task
delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit af859a42d798f047fbfe198ed315a942662c39d2
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 21:07:27 2005 +0100
NTFS: Prepare for 2.1.23 release: Update documentation and bump version.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 4757d7dff65b56f2115038ad1615725f31806787
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 17:24:08 2005 +0100
NTFS: Change ntfs_map_runlist_nolock() to only decompress the mapping pairs
if the requested vcn is inside it. Otherwise we get into problems
when we try to map an out of bounds vcn because we then try to map
the already mapped runlist fragment which causes
ntfs_mapping_pairs_decompress() to fail and return error. Update
ntfs_attr_find_vcn_nolock() accordingly.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit fa3be92317c4ae34edcf5274e8bbeff181e20b7a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 17:15:36 2005 +0100
NTFS: Add an extra parameter @last_vcn to ntfs_get_size_for_mapping_pairs()
and ntfs_mapping_pairs_build() to allow the runlist encoding to be
partial which is desirable when filling holes in sparse attributes.
Update all callers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1d58b27b8d77ecb816cfa8f846b78c845675eb89
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 17:04:55 2005 +0100
NTFS: Change the runlist terminator of the newly allocated cluster(s) to
LCN_ENOENT in ntfs_attr_make_non_resident(). Otherwise the runlist
code gets confused.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3bd1f4a173a3445f9919c21e775de2d8b9deacf8
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 16:51:58 2005 +0100
NTFS: Fix several occurences of a bug where we would perform 'var & ~const'
with a 64-bit variable and a int, i.e. 32-bit, constant. This causes
the higher order 32-bits of the 64-bit variable to be zeroed. To fix
this cast the 'const' to the same 64-bit type as 'var'.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit ca8fd7a0c6aa835e8014830b290cb965e85ac88e
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 16:31:27 2005 +0100
NTFS: Detect the case when Windows has been suspended to disk on the volume
to be mounted and if this is the case do not allow (re)mounting
read-write. This is done by parsing hiberfil.sys if present.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 9f993fe4634b39ca4404ba278053b03f360ec08a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 16:15:36 2005 +0100
NTFS: Fix a bug in address space operations error recovery code paths where
if the runlist was not mapped at all and a mapping error occured we
would leave the runlist locked on exit to the function so that the
next access to the same file would try to take the lock and deadlock.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3f2faef00c6af17542ea8672ed7d09367222b2d0
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 15:28:56 2005 +0100
NTFS: Stamp the transaction log ($UsnJrnl), aka user space journal, if it
is active on the volume and we are mounting read-write or remounting
from read-only to read-write.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 38b22b6e9f46ab8f73ef5734f0e0a000766a9258
Merge: 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 b3e112bcc19abd8e9657dca34a87316786e096f3
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat Jun 25 14:27:27 2005 +0100
Automerge with /usr/src/ntfs-2.6.git.
commit f5f287738bddf38ec9ca79344f00dab675e1bbf5
Author: Sonny Rao <sonny@burdell.org>
Date: Thu Jun 23 16:57:56 2005 -0500
JFS: performance patch
Basically, we saw a large amount of time spent in the
jfs_strfromUCS_le() function, mispredicting the branch inside the
loop, so I just added some unlikely modifiers to the if statements to
re-ordered the code. Again, these simple changes provided > 2 % on
spec-sfs, so please consider it for inclusion.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4
Merge: 364f6c717deef4a3ac4982e670fa9846b43cd060 ee98689be1b054897ff17655008c3048fe88be94
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Jun 23 11:26:22 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 364f6c717deef4a3ac4982e670fa9846b43cd060
Merge: 4ff4258a3e558814a3d48c50a59cd22f56bbea2f 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Jun 8 15:45:45 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git
commit 4ff4258a3e558814a3d48c50a59cd22f56bbea2f
Merge: 442d207eb0b4e7047c4fedccd900c425e689d502 5e485b7975472ba4a408523deb6541e70c451842
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon May 30 21:34:37 2005 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 442d207eb0b4e7047c4fedccd900c425e689d502
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Fri May 27 16:42:56 2005 +0100
NTFS: Use C99 style structure initialization after memory allocation where
possible (fs/ntfs/{attrib.c,index.c,super.c}). Thanks to Al Viro and
Pekka Enberg.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 2fb21db2548fc8b196eb8d8425f05ee1965d5344
Author: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed May 25 21:15:34 2005 +0300
NTFS: Remove spurious void pointer casts from fs/ntfs/.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 5eac51462f340b7c4a03b9220cf157c40b4990a5
Merge: c1c58ada91cfe86f19d430282132434e620a1067 4ec5240ec367a592834385893200dd4fb369354c
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Fri May 27 15:36:21 2005 +0100
Merge with /usr/src/ntfs-2.6.git.
commit c1c58ada91cfe86f19d430282132434e620a1067
Merge: 67394f8f069c2fdf90f3b6d851824c07815442af 2a24ab628aa7b190be32f63dfb6d96f3fb61580a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed May 25 09:38:26 2005 +0100
Merge with /usr/src/ntfs-2.6.git
commit 67394f8f069c2fdf90f3b6d851824c07815442af
Merge: 450cbfbbbd88876e3ccec1d277f613221ca82bb7 9636273dae265b9354b861b373cd43cd76a6d0fe
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Sat May 21 22:00:02 2005 +0100
Merge with /usr/src/ntfs-2.6.git
commit 450cbfbbbd88876e3ccec1d277f613221ca82bb7
Merge: d53ee3222459f347cb18985a845864bc81a44eaf bfd4bda097f8758d28e632ff2035e25577f6b060
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu May 5 22:39:49 2005 +0100
Merge with /usr/src/ntfs-2.6.git
commit d53ee3222459f347cb18985a845864bc81a44eaf
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Apr 6 16:11:20 2005 +0100
NTFS: Use MAX_BUF_PER_PAGE instead of variable sized array allocation for
better code generation and one less sparse warning in fs/ntfs/aops.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 7fafb8b634121f4fa35ff92f85737f8bc2259f06
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Apr 6 16:09:21 2005 +0100
NTFS: Minor cleanup: Define and use NTFS_MAX_CLUSTER_SIZE constant instead
of hard coded 0x10000 in fs/ntfs/super.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit bb3cf33509009132cf8c7a7729f9d26c0c5fa961
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Apr 6 13:34:31 2005 +0100
NTFS: Update attribute definition handling.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit b0d2374d62faed034dd80e6524efb98a6341597c
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon Apr 4 16:20:14 2005 +0100
NTFS: Some utilities modify the boot sector but do not update the checksum.
Thus, relax the checking in fs/ntfs/super.c::is_boot_sector_ntfs() to
only emit a warning when the checksum is incorrect rather than
refusing the mount. Thanks to Bernd Casimir for pointing this
problem out.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 251c8427c9c418674fc3c04a11de95dc3661b560
Author: Jesper Juhl <juhl-lkml@dif.dk>
Date: Mon Apr 4 14:59:56 2005 +0100
NTFS: Remove checks for NULL before calling kfree() since kfree() does the
checking itself. (Jesper Juhl)
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 53d59aad9326199ef5749c97513db498309a057e
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Mar 17 10:51:33 2005 +0000
NTFS: Fix compilation when configured read-only.
- Add ifdef NTFS_RW around write specific code if fs/ntfs/runlist.[hc] and
fs/ntfs/attrib.[hc].
- Minor bugfix to fs/ntfs/attrib.c::ntfs_attr_make_non_resident() where the
runlist was not freed in all error cases.
- Add fs/ntfs/runlist.[hc]::ntfs_rl_find_vcn_nolock().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1ef334d372d6a7006e20f56f7e85d8f4ec32e3c2
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon Apr 4 14:59:42 2005 +0100
NTFS: Include linux/swap.h in fs/ntfs/attrib.c for mark_page_accessed().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 905685f68fc72844b8c2689c39a5c6c35e840152
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Mar 10 11:06:19 2005 +0000
NTFS: - Modify ->readpage and ->writepage (fs/ntfs/aops.c) so they detect
and handle the case where an attribute is converted from resident
to non-resident by a concurrent file write.
- Reorder some operations when converting an attribute from resident
to non-resident (fs/ntfs/attrib.c) so it is safe wrt concurrent
->readpage and ->writepage.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 43b01fda8b17b2b63e7dcdeed11c2ebba56b1fc9
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Mar 9 15:18:43 2005 +0000
NTFS: Fix sign of various error return values to be negative in
fs/ntfs/lcnalloc.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 2bfb4fff3e9731ecfe745881e53cfb2e646c47bb
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Mar 9 15:15:06 2005 +0000
NTFS: Add fs/ntfs/attrib.[hc]::ntfs_attr_make_non_resident().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit c0c1cc0e46b36347f11b566f99087dc5e6fc1b89
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon Mar 7 21:43:38 2005 +0000
NTFS: - Fix bug in fs/ntfs/attrib.c::ntfs_find_vcn_nolock() where after
dropping the read lock and taking the write lock we were not checking
whether someone else did not already do the work we wanted to do.
- Rename ntfs_find_vcn_nolock() to ntfs_attr_find_vcn_nolock().
- Tidy up some comments in fs/ntfs/runlist.c.
- Add LCN_ENOMEM and LCN_EIO definitions to fs/ntfs/runlist.h.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 271849a98849394ea85fa7caa8a1aaa2b3a849b7
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Mon Mar 7 21:36:18 2005 +0000
NTFS: Add fs/ntfs/attrib.[hc]::ntfs_attr_vcn_to_lcn_nolock() used by the new
write code.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 7e693073a940c7484c0c21e3e1603e29ce46f30c
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Mar 3 16:38:59 2005 +0000
NTFS: Add AT_EA in addition to AT_DATA to whitelist for being allowed to be
non-resident in fs/ntfs/attrib.c::ntfs_attr_can_be_non_resident().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 9451f8519c5e6d5d064c30033fc3d4ce77de321c
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Mar 3 14:43:43 2005 +0000
NTFS: Correct sparse file handling. The compressed values need to be
checked and set in the ntfs inode as done for compressed files
and the compressed size needs to be used for vfs inode->i_blocks
instead of the allocated size, again, as done for compressed files.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 413826868fb49d200b741bcaeaf58ea5c5e45321
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Mar 3 13:44:15 2005 +0000
NTFS: Make fs/ntfs/namei.c::ntfs_get_{parent,dentry} static and move the
definition of ntfs_export_ops from fs/ntfs/super.c to namei.c.
Also, declare ntfs_export_ops in fs/ntfs/ntfs.h.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 8907547d4b099e67762ea4891c127ea1f6dd1cb7
Author: Randy Dunlap <rddunlap@osdl.org>
Date: Thu Mar 3 11:19:53 2005 +0000
NTFS: Fix printk format warnings on ia64. (Randy Dunlap)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 5ae9fcf8f329baba4bada8719cb0337eef083a1a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Mar 2 17:03:24 2005 +0000
NTFS: - Set the ntfs_inode->allocated_size to the real allocated size in the
mft record for resident attributes (fs/ntfs/inode.c).
- Small readability cleanup to use "a" instead of "ctx->attr"
everywhere (fs/ntfs/inode.c).
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 37e4c13b987a7923ec13bda7368901b3e094fecb
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Fri Feb 18 10:03:13 2005 +0000
NTFS: Fix a nasty runlist merge bug when merging two holes.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit d8ec785e0bf2941ed546711c2f240a3e030c39c7
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Fri Feb 18 09:23:39 2005 +0000
NTFS: Change time to u64 in time.h::ntfs2utc() as it otherwise generates a
warning in the do_div() call on sparc32. Thanks to Meelis Roos for the
report and analysis of the warning.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit b6ad6c52fe36ab35d0fe28c064f59de2ba670c2a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Tue Feb 15 10:08:43 2005 +0000
NTFS: - Split ntfs_map_runlist() into ntfs_map_runlist() and a non-locking
helper ntfs_map_runlist_nolock() which is used by ntfs_map_runlist().
This allows us to map runlist fragments with the runlist lock already
held without having to drop and reacquire it around the call. Adapt
all callers.
- Change ntfs_find_vcn() to ntfs_find_vcn_nolock() which takes a locked
runlist. This allows us to find runlist elements with the runlist
lock already held without having to drop and reacquire it around the
call. Adapt all callers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1a0df15acdae065789446aca83021c72b71db9a5
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Feb 3 12:04:36 2005 +0000
NTFS: Fix a bug in fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress() in
the creation of the unmapped runlist element for the base attribute
extent.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit c002f42543e155dd2b5b5039ea2637ab26c82513
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Feb 3 12:02:56 2005 +0000
NTFS: - Add disable_sparse mount option together with a per volume sparse
enable bit which is set appropriately and a per inode sparse disable
bit which is preset on some system file inodes as appropriate.
- Enforce that sparse support is disabled on NTFS volumes pre 3.0.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit f40661be038ce6ed9ef6a8b80307a9153bd95769
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Jan 13 16:03:38 2005 +0000
NTFS: Optimise/reorganise some error handling code in fs/ntfs/aops.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 946929d813a3bde095678526dd037ab9ac6efe35
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Jan 13 15:26:29 2005 +0000
NTFS: Fixup the resident attribute resizing code in
fs/ntfs/aops.c::ntfs_{prepare,commit}_write()() and re-enable it.
It should be safe now. (Famous last words...)
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3834c3f227725e2395840aed82342bda4ee9d379
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Jan 13 11:04:39 2005 +0000
NTFS: Fix stupid bug in fs/ntfs/mft.c introduced in last changeset.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 149f0c5200188a43f1fc11ca2fb14d8183013d10
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Jan 12 13:52:30 2005 +0000
NTFS: Repeat a failed ntfs_truncate() in fs/ntfs/aops.c::ntfs_writepage()
and abort if it fails again.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 07a4e2da7dd3c9345f84b2552872f9d38c257451
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Jan 12 13:08:26 2005 +0000
NTFS: Use i_size_{read,write}() in fs/ntfs/{aops.c,mft.c} and protect
access to the i_size and other size fields using the size_lock.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit f50f3ac51983025405a71b70b033cc6bcb0d1fc1
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Fri Nov 19 22:16:00 2004 +0000
NTFS: Use i_size_read() in fs/ntfs/inode.c once and then use the cached value
afterwards when reading the size of the bitmap inode.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 218357ff1b1b2f1bfdce89d608dbe33dd2f9f14b
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 18 20:34:59 2004 +0000
NTFS: - Use i_size_read() in fs/ntfs/super.c once and then use the cached
value afterwards. Cache the initialized_size in the same way and
protect access to the two sizes using the size_lock.
- Minor optimization to fs/ntfs/super.c::ntfs_statfs() and its helpers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 206f9f35b2348b7b966ff18a5564b8a3ca325ed5
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 18 15:01:06 2004 +0000
NTFS: In fs/ntfs/dir.c, use i_size_read() once and then the cached value
afterwards.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 367636772f094fd840d2d79e75257bcfaa28e70f
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 18 13:46:45 2004 +0000
NTFS: - In fs/ntfs/compress.c, use i_size_read() at the start and then use the
cached value everywhere. Cache the initialized_size in the same way
and protect the critical region where the two sizes are read using the
new size_lock of the ntfs inode.
- Add the new size_lock to the ntfs_inode structure (fs/ntfs/inode.h)
and initialize it (fs/ntfs/inode.c).
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 899101aebb9ab3692aa8efe2805174ee0ee3edb5
Merge: 36050271e6ec19390184e1a83470eb7e725cad65 897f5ab2cd733a77a2279268262919caa8154b9d
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu May 5 10:15:25 2005 +0100
Merge with /usr/src/ntfs-2.6.git
commit 36050271e6ec19390184e1a83470eb7e725cad65
Merge: d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a 1d42a0ecf478962e8aede355a0be41365c117ff0
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu May 5 00:08:35 2005 +0100
Merge with /usr/src/ntfs-2.6.git
commit d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Wed Nov 17 15:45:08 2004 +0000
NTFS: Use i_size_read() in fs/ntfs/file.c::ntfs_file_open().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit db30d160cd8dfe1e53435fd76f4189778f1c728e
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 11 12:42:00 2004 +0000
NTFS: Use i_size_read() once and then use the cached value in
fs/ntfs/lcnalloc.c::ntfs_cluster_alloc().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 66129f88c4cc719591f687e5c8c764fe9d3e437a
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 11 12:34:00 2004 +0000
NTFS: Use i_size_read() in fs/ntfs/logfile.c::ntfs_{check,empty}_logfile().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit da28438cae9a271c5c232177f81dfb243de9b7fa
Author: Anton Altaparmakov <aia21@cantab.net>
Date: Thu Nov 11 11:18:10 2004 +0000
NTFS: Use i_size_read() in fs/ntfs/attrib.c::ntfs_attr_set().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
