commit 27198d855abbfc82df69e81b6c8d2f333580114c
tree 944bb3e49bfc40387c70686a68c4b90c7edf4549
parent a7df849c67f0a5248693e432d03f738e84d6826c
parent f5d9b97ee0d6d00a29bf881263510d74291fb862
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 20:35:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 20:35:10 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit a7df849c67f0a5248693e432d03f738e84d6826c
tree dbb53fca04da00b7b1e9a27499cce29d69032429
parent 90abb7b5f3bd9271a455cd640a70c285b4fd0c89
parent 74e8ebc55d85ca1acb3e73610965bea63cc39054
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 20:23:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 20:23:21 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
commit 90abb7b5f3bd9271a455cd640a70c285b4fd0c89
tree 1149103d1e9255208e81cb426fad07839e15039f
parent 0086b5ec7834b78358dea3f713275a9ae2b229ec
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 09:37:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 10 Jun 2005 09:37:21 -0700
ppc: remove two extraneous descriptors for the 405EP CPU
The patch to add them keeps on getting applied, over and
over again ;)
Hopefully no more.
commit 74e8ebc55d85ca1acb3e73610965bea63cc39054
tree 7408fb2a44074fc8d7b7d1458e4b4c260b3fa41a
parent e98ded32f37a538b906d98059b3db71be36405a7
author Dave Airlie <airlied@starflyer.(none)> Fri, 10 Jun 2005 19:27:51 +1000
committer Dave Airlie <airlied@linux.ie> Fri, 10 Jun 2005 19:27:51 +1000
[PATCH] remove bogus hack from radeon IRQ handler
This removes a bogus hack from the radeon IRQ handler.
There is a better fix from myself and benh in DRM CVS but I'll wait
until 2.6.13-rc so it gets more testing.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit e98ded32f37a538b906d98059b3db71be36405a7
tree 7cfd5a685b0ddc1f83a2087b918a184cfca3d073
parent 8be3de3fd8469154a2b3e18a4712032dac5b4a53
author Dave Airlie <airlied@starflyer.(none)> Fri, 10 Jun 2005 18:47:38 +1000
committer Dave Airlie <airlied@linux.ie> Fri, 10 Jun 2005 18:47:38 +1000
[PATCH] drm add i945G pci id
Add pci identifier for i945G chipset
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 0086b5ec7834b78358dea3f713275a9ae2b229ec
tree 589b4166efe6ab929ee25b20b2e89935efba504e
parent 243cd55e021baf28babdd88112ac03ae5cd4bb9c
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Fri, 10 Jun 2005 14:19:02 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 21:33:35 -0700
[PATCH] ppc32: Fix nasty sleep/wakeup problem
Despite all the care lately in making the powermac sleep/wakeup as
robust as possible, there is still a nasty related to the use of cpufreq
on PMU based machines. Unfortunately, it affects paulus old powerbook
so I have to fix it :)
We didn't manage to understand what is precisely going on, it leads to
memory corruption and might have to do with RAM not beeing properly
refreshed when a cpufreq transition is done right before the sleep.
The best workaround (and less intrusive at this point) we could come up
with is included in this patch. We basically do _not_ force a switch to
high speed on suspend anymore (that is what is causing the problem) on
those machines. We still force a speed switch on wakeup (since we don't
know what speed we are coming back from sleep at, and that seems to work
fine).
Since, during this short interval, the actual CPU speed might be
incorrect, we also hack around by multiplying loops_per_jiffy by 2 (max
speed factor on those machines) during early wakeup stage to make sure
udelay's during that time aren't too short.
For after 2.6.12, we'll change udelay implementation to use the CPU
timebase (which is always constant) instead like we do on ppc64 and thus
get rid of all those problems.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7
tree 991e076dabd33ed04ff1b181319e96cf80336047
parent 04dc9ba882d224612f8db50fd60c8a45b843e77c
author Eugene Surovegin <ebs@ebshome.net> Thu, 09 Jun 2005 12:36:29 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:39:52 -0700
[PATCH] ppc32: add 405EP cpu_spec entry
Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6
transition.
Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage
for unified caches") triggered this bug and 405EP boards don't boot
anymore.
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 243cd55e021baf28babdd88112ac03ae5cd4bb9c
tree f1bf0f1f17ed03f92f0bbce12b3f958dde028906
parent 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7
author Michael Ellerman <michael@ellerman.id.au> Thu, 09 Jun 2005 12:36:33 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:39:52 -0700
[PATCH] iseries_veth: Supress spurious WARN_ON() at module unload
My patch from a few weeks back (now in mainline), called "Cleanup skbs to
prevent unregister_netdevice() hanging", can cause our TX timeout code to
fire on machines with lots of VLANs (because it takes > 2 seconds between
when we stop the queues and when we're finished stopping the connections).
When that happens the TX timeout code freaks out and does a WARN_ON()
because as far as it's concerned there shouldn't be a TX timeout happening,
which is fair enough.
I have a "proper" fix for this, which is to a) do refcounting on
connections and b) implement a proper ack timer so we don't keep unacked
skbs lying around for ever. But for 2.6.12 I propose just supressing the
WARN_ON(). Users will still see the "NETDEV WATCHDOG" warning, but that's
not nearly as bad as a WARN_ON() which users interpret as an Oops.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 04dc9ba882d224612f8db50fd60c8a45b843e77c
tree 5eb80b7d54418fe0ecafa716c57214ca48ed7718
parent d80d6fc08e111c411a349c4fa0c6d9bf41851087
parent 1e06276704c101bd1ae7b62879faaffcd7496a3e
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:37:56 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:37:56 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
commit d80d6fc08e111c411a349c4fa0c6d9bf41851087
tree c6cb9ab6099ffd9e34c6e67372283eeba283a0ea
parent 99fdb2fe523480a8748a5af18139bb1f7785c815
parent 07c6d48fd10a8eeae899e06876aa0b885a8e2a1b
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:36:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:36:31 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 99fdb2fe523480a8748a5af18139bb1f7785c815
tree fbe9d2d5210266544a94ca6b5733c35d8a91d082
parent cf380ee7308db0f067ceb2ae8b852838788bf453
parent a2a64769d0d3cc0380b4b6ecdcb781a2f790a69e
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:25:29 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 15:25:29 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
commit 1e06276704c101bd1ae7b62879faaffcd7496a3e
tree 0b983e8000ed7f57d189f68097a6e78ad5c33488
parent 76854ceac3ef3408ab9a50a2521147fb14779f58
author Narendra Sankar <nsankar@broadcom.com> Fri, 06 May 2005 12:00:05 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Thu, 09 Jun 2005 14:52:30 -0700
[PATCH] PCI: MSI functionality broken on Serverworks GC chipset
MSI functionality is broken on the GC_LE x86 chipset that Serverworks
developed and that is being used in various platforms today. Broadcom is
going to push out to the kernel MSI enabled Gigabit drivers (in the very
near future), and we would like to make sure that MSI does not get
enabled on any platforms using the GC_LE chipset (device id 0x17).
Following the AMD 8131 example, I am including a patch to disable MSI
functionality when a GCNB_LE is detected. Please let me know if there
are any issues with this. This is a permanent fix for this chipset, as
the hardware will not be updated.
Signed-off-by: Narendra Sankar <nsankar@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f5d9b97ee0d6d00a29bf881263510d74291fb862
tree 90b22e6038da0ad40e54c3f52e8da67189730ae8
parent 3079ca621e9e09f4593c20a9a2f24237c355f683
parent cf380ee7308db0f067ceb2ae8b852838788bf453
author Steve French <sfrench@hera.kernel.org> Thu, 09 Jun 2005 14:44:56 -0700
committer Steve French <sfrench@hera.kernel.org> Thu, 09 Jun 2005 14:44:56 -0700
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit 3079ca621e9e09f4593c20a9a2f24237c355f683
tree 0eb2e22cb0fa382cde357f9e6125043d1cdd3758
parent 0b68177ccd12866d9f19cafad212b861c9d02a8c
author Steve French <sfrench@hera.kernel.org> Thu, 09 Jun 2005 14:44:07 -0700
committer Steve French <sfrench@hera.kernel.org> Thu, 09 Jun 2005 14:44:07 -0700
[CIFS] Fix cifs update of page cache. Write at correct offset when out of memory
and add_to_page_cache fails.
Thanks to Shaggy for pointing out the fix.
Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Shaggy (shaggy@us.ibm.com)
commit 07c6d48fd10a8eeae899e06876aa0b885a8e2a1b
tree 4e33771adca1d1fb4db2a92f0d6347a22bbccb5f
parent 7aa0b0d5ab5eed29a49fce55868456bca073d77e
author Vincent Sanders <vince@org.rmk.(none)> Thu, 09 Jun 2005 21:59:22 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 09 Jun 2005 21:59:22 +0100
[PATCH] ARM: 2708/1: Fix hackkit CPU Frequency build faliure
Patch from Vincent Sanders
This fixes the "multiple definitions of cpufreq_get" build faliure on
the hackkit SA1100 platform.
Signed-off-by: Vincent Sanders
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7aa0b0d5ab5eed29a49fce55868456bca073d77e
tree e328b5c73809218f0b28109838162c3ed87f9570
parent 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789
author Vincent Sanders <vince@org.rmk.(none)> Thu, 09 Jun 2005 21:59:21 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 09 Jun 2005 21:59:21 +0100
[PATCH] ARM: 2707/2: Fix badge4 CPU Frequency build faliure
Patch from Vincent Sanders
This fixes the "multiple definitions of cpufreq_get" build faliure on
the Badge4 SA1100 platform.
Signed-off-by: Vincent Sanders
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a2a64769d0d3cc0380b4b6ecdcb781a2f790a69e
tree 387ee93cf8ee39ca64dd53380d1ea25a4f6134e7
parent 1834cd9fd27763f4e55184e4138a19ba36620174
author Christoph Lameter <clameter@sgi.com> Thu, 09 Jun 2005 12:29:00 -0700
committer Tony Luck <tony.luck@intel.com> Thu, 09 Jun 2005 13:04:30 -0700
[IA64] Fix race condition in the rt_sigprocmask fastcall
current->blocked will be set to the value of current->thread_info->flags if the
cmpxchg to update thread_info->flags fails. For performance reasons the store into
current->blocked was placed in the cmpxchg loop. However, the cmpxchg overwrites the
register holding the value to be stored. In the rare case of a retry the value of
thread_info->flags will be written into current->blocked.
The fix is to use another register so that the register containing the current->blocked
value is not overwritten.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit cf380ee7308db0f067ceb2ae8b852838788bf453
tree c4f9e1d25e876e5b8fb302292c21b22edd6cf1dd
parent 1834cd9fd27763f4e55184e4138a19ba36620174
parent 76854ceac3ef3408ab9a50a2521147fb14779f58
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 10:44:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 10:44:48 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
commit 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789
tree beb375feb2aec8b4255ebbfa341d3f0d97730555
parent 4e71e47da3367e8df5994a17fb421ddeaa5025e3
author Dave Neuer <dneuer@org.rmk.(none)> Thu, 09 Jun 2005 17:40:55 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 09 Jun 2005 17:40:55 +0100
[PATCH] ARM: 2706/1: Fix compile on SA-based iPAQs and remove stale CREDITS info
Patch from Dave Neuer
This fixes the "multiple definitions of cpufreq_get" errors on
StrongARM-based iPAQs.
Signed-off-by: Dave Neuer
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 1834cd9fd27763f4e55184e4138a19ba36620174
tree 0d5cf1d3d6512dc8a49df546711f58fd86bfd0f5
parent 6952df035509717bdc46194b2a3d6ffb9349f267
parent 4e71e47da3367e8df5994a17fb421ddeaa5025e3
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 09:04:11 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 09 Jun 2005 09:04:11 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 4e71e47da3367e8df5994a17fb421ddeaa5025e3
tree 25c594c39a3090cef50482b19a45b155a92199ff
parent 5273a00d9c763108397658d440618f7ac3e40f83
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu, 09 Jun 2005 16:53:28 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Thu, 09 Jun 2005 16:53:28 +0100
[PATCH] ARM: Remove zero-byte sized file
Remove the remaining zero byte file left over from the Xscale
fixes.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
commit 76854ceac3ef3408ab9a50a2521147fb14779f58
tree 130700c6871e73269bfad0b9f0439d51e0c353a3
parent 9f793d2c77ec5818679e4747c554d9333cecf476
author Ian Abbott <abbotti@mev.co.uk> Thu, 02 Jun 2005 10:34:11 +0100
committer Greg Kroah-Hartman <gregkh@suse.de> Thu, 09 Jun 2005 01:38:15 -0700
[PATCH] USB: ftdi_sio: avoid losing received data in tty-ldisc
ftdi_sio: Avoid losing bytes at tty-ldisc.
This patch was originally developed by Daniel Smertnig. I
(Ian Abbott) made a few changes. It has been tested by both
Daniel and I, at least for raw, non-canonical receive data
processing.
Here is Daniel's original description of the patch:
===
During a project in which I was using a FTDI 232BM to
transmit data at relative high speeds (625kBit/s), I
noticed a problem where data was lost even if flow
control was enabled: The FTDI-Driver receives 512 Bytes
of data over USB at a time, which consists of 8 64-Byte
packets. Subtracting the 2 bytes of status information
included in each packet this gives 496 "real" data
bytes per read.
This data is passed (indirectly, via the flip buffers)
to the tty line discipline which takes care of
throttling when there the free buffer space reaches
TTY_THRESHOLD_THROTTLE (128). Because the FTDI driver
processes up to 496 bytes at a time, throttling won't
happen in time and the line discipline will discard the
remaining bytes.
To avoid this the patch passes data in 62-byte blocks
to the tty layer and checks the available space in the
ldisc-buffers. If there isn't enough free space,
processing the rest of the data is delayed using a
workqueue.
Note: The original problem should be easily
reproducible with a userspace program which does slow &
small reads.
===
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Daniel Smertnig <daniel.smertnig@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9f793d2c77ec5818679e4747c554d9333cecf476
tree 47904d2099435d4527432479e869311be7c6515b
parent 03e49d40ea3436cae0fe43708f11584130ee4a0c
author Pete Zaitcev <zaitcev@redhat.com> Mon, 06 Jun 2005 13:54:59 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Thu, 09 Jun 2005 01:38:11 -0700
[PATCH] USB: fix ub issues
This smoothes two imperfections:
- Increase number of LUNs per device from 4 to 9. The best solution
would be to remove this limit altogether, but that has to wait until
the time when more than 26 hosts are allowed.
- Replace mdelay with msleep in a probing routine.
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 03e49d40ea3436cae0fe43708f11584130ee4a0c
tree acaa11b11c0ff1d4c9f743c0d8df2bc5a865a440
parent 5273a00d9c763108397658d440618f7ac3e40f83
author Scott Murray <scottm@somanetworks.com> Mon, 06 Jun 2005 15:48:04 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> Thu, 09 Jun 2005 01:37:59 -0700
[PATCH] PCI Hotplug: fix CPCI reference counting bug
Here's a patch that fixes up the pci_dev refcounting in the CPCI code.
I've done some testing against it and it seems fine here.
Signed-off-by: Scott Murray <scottm@somanetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6952df035509717bdc46194b2a3d6ffb9349f267
tree bf8709691e303a533e5798c4c7c5a17c9d752fed
parent e1dd23a0012c3929737798fda9fede0e783f4ff3
author Albert Lee <albertcc@tw.ibm.com> Mon, 06 Jun 2005 15:56:03 +0800
committer Jeff Garzik <jgarzik@pobox.com> Thu, 09 Jun 2005 03:14:59 -0400
[PATCH] sg traverse fix for __atapi_pio_bytes()
Problem:
Incorrect md5sum when using ATAPI PIO mode to verify a distro CD.
Root cause: sg traverse problem.
In __atapi_pio_bytes(), if qc->cursg++ is increased and "goto
next_page" is executed, then sg is not updated to the new qc->cursg
and the old sg is overwritten with the new data.
Changes:
- Replace "goto next_page" with "goto next_sg" to make sg updated.
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
commit e1dd23a0012c3929737798fda9fede0e783f4ff3
tree c7f808b6433ef1015f55418e7f11f432943bdefd
parent 5273a00d9c763108397658d440618f7ac3e40f83
author Jens Axboe <axboe@suse.de> Wed, 08 Jun 2005 13:02:25 +0200
committer Jeff Garzik <jgarzik@pobox.com> Thu, 09 Jun 2005 03:06:22 -0400
[PATCH] sata_sil: Fix FIFO PCI Bus Arbitration kernel oops
Correct this.
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
commit 5273a00d9c763108397658d440618f7ac3e40f83
tree 7bbdacdaa307703528968510d37838b1eb8b2a1f
parent ce10d979053379553757c3b178a138facaddff82
parent 98e56405521b74b4826f855d45ef7859f34548ff
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:36:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:36:31 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commit ce10d979053379553757c3b178a138facaddff82
tree ce88ba988eebab6cafb1ed34feedbcb13aa926e3
parent fee02f80e68abbcc45ed3c5dd5ed09d04a284791
author Paul Mackerras <paulus@samba.org> Wed, 08 Jun 2005 21:59:15 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:24:15 -0700
[PATCH] ppc64: Fix PER_LINUX32 behaviour
This patch fixes some bugs in the ppc64 PER_LINUX32 implementation,
noted by Juergen Kreileder:
* uname(2) doesn't respect PER_LINUX32, it returns 'ppc64' instead of 'ppc'
* Child processes of a PER_LINUX32 process don't inherit PER_LINUX32
Along the way I took the opportunity to move things around so that
sys_ppc32.c only has 32-bit syscall emulation functions and to remove
the obsolete "fakeppc" command line option.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fee02f80e68abbcc45ed3c5dd5ed09d04a284791
tree 6858df38d1fa451d8ce309fc8c238a6bc71f7629
parent 4f58802fae8a51d9e79454746584175c14f84519
parent ed7fce6c13bdd802817e1988d67047d432e7e30b
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:22:16 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:22:16 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
commit 4f58802fae8a51d9e79454746584175c14f84519
tree 022533cfacde17b54e8f9b7ac3f12c82ed1c48be
parent 05062d96a23ec0959ee5ea969f40813170c73c0e
author Lars Marowsky-Bree <lmb@suse.de> Wed, 08 Jun 2005 15:50:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:14 -0700
[PATCH] dm: Handle READA requests in dm-mpath.c
READA errors failing with EWOULDBLOCK/EAGAIN do not constitute a valid
reason for failing the path; this lead to erratic errors on DM multipath
devices. This error can be safely propagated upwards without failing the
path.
Acked-by: Kevin Corry <kevcorry@us.ibm.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Lars Marowsky-Bree <lmb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 05062d96a23ec0959ee5ea969f40813170c73c0e
tree 9aa09b58ff455cc43b81cae10d3c4dac9fe9f462
parent f829fd23c87918374bac0d90404fe12f0e788d52
author Peter Chubb <peterc@gelato.unsw.edu.au> Wed, 08 Jun 2005 15:50:20 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:14 -0700
[PATCH] ia64: fix floating-point preemption problem
There've been reports of problems with CONFIG_PREEMPT=y and the high
floating point partition. This is caused by the possibility of preemption
and rescheduling on a different processor while saving or restioirng the
high partition.
The only places where the FPU state is touched are in ptrace, in
switch_to(), and where handling a floating-point exception. In switch_to()
preemption is off. So it's only in trap.c and ptrace.c that we need to
prevent preemption.
Here is a patch that adds commentary to make the conditions clear, and adds
appropriate preempt_{en,dis}able() calls to make it so. In trap.c I use
preempt_enable_no_resched(), as we're about to return to user space where
the preemption flag will be checked anyway.
Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f8acd944ea511af02485b1709c07ac7aac12aa48
tree 1bd9bf244b4deec6249fda8de70e3d07e85fc546
parent beb9e1c3f32a0f878765c7c1142f91083739c5bd
author William Lee Irwin III <wli@holomorphy.com> Wed, 08 Jun 2005 15:48:52 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:13 -0700
[PATCH] sparc32: silence access_ok() warnings
The fact that access_ok() doesn't use some of its arguments trips some
unused variable warnings. This patch silences them permanently.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f829fd23c87918374bac0d90404fe12f0e788d52
tree 2f1e238d0b16e2784eee46e62a5a09f94ffd406f
parent 63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40
author Ananth N Mavinakayanahalli <ananth@in.ibm.com> Wed, 08 Jun 2005 15:50:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:13 -0700
[PATCH] ppc64 kprobes: remove spurious MSR_SE masking
Remove spurious MSR_SE reset during kprobe processing.
single_step_exception() already does it for us. Reset it to be safe when
executing the fault_handler.
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40
tree ba7d897b1aeecb087d536b121176c10255bd1744
parent 42442ed5744b03f5351a142649b8b4c97e6950ab
author Ananth N Mavinakayanahalli <ananth@in.ibm.com> Wed, 08 Jun 2005 15:49:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:13 -0700
[PATCH] ppc64 kprobes: correct kprobe registration return values
Add stricter checks during kprobe registration. Return correct error value so
insmod doesn't succeed. Also printk reason for registration failure.
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5754c9b649e414f1e3a3ea2ec15e42ed3e42eeb8
tree 7f22b5778559492c994fcaa9ca79ed409a6f3f2a
parent f8acd944ea511af02485b1709c07ac7aac12aa48
author Keith Owens <kaos@ocs.com.au> Wed, 08 Jun 2005 15:49:07 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:13 -0700
[PATCH] Stop arch/i386/kernel/vsyscall-note.o being rebuilt every time
arch/i386/kernel/vsyscall-note.o is not listed as a target so its .cmd file
is neither considered as a target nor is it read on the next build. This
causes vsyscall-note.o to be rebuilt every time that you run make, which
causes vmlinux to be rebuilt every time.
Signed-off-by: Keith Owens <kaos@ocs.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 42442ed5744b03f5351a142649b8b4c97e6950ab
tree 35a9a89161365a317338d72bcb402aa7adda05be
parent 5754c9b649e414f1e3a3ea2ec15e42ed3e42eeb8
author Andrew Morton <akpm@osdl.org> Wed, 08 Jun 2005 15:49:25 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:13 -0700
[PATCH] revert x86_64-use-the-e820-hole-to-map-the-iommu-agp-aperture
Martin Bligh determined that this patch is causing his test box to not boot.
Revert.
Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit da00d9a5466558ccd9e7b7d04b13d7cb9160c876
tree 4edc27caa63126e902da3752f58adb8ee792762c
parent 3df59529ad1045da61698bb5dd8ebaa547aeb46f
author Jeff Dike <jdike@addtoit.com> Wed, 08 Jun 2005 15:48:01 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:12 -0700
[PATCH] uml: compile fixes for gcc 4
This is a bunch of compile fixes provoked by building UML with gcc 4. There
are a bunch of signedness mismatches, a couple of uninitialized references,
and a botched C99 structure initialization which had somehow gone unnoticed.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit beb9e1c3f32a0f878765c7c1142f91083739c5bd
tree a9eb68688061e70cdbd8974e90f697f8860d217d
parent 1f96ddb4fb40961a8ebebf7a00bbfaad55aacbd2
author Eugene Surovegin <ebs@ebshome.net> Wed, 08 Jun 2005 15:48:42 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:12 -0700
[PATCH] ppc32: add 405EP cpu_spec entry
Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6
transition.
Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage
for unified caches") triggered this bug and 405EP boards don't boot
anymore.
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 501cb02b431fb88c7f157c46c8b54de59d1dd463
tree e41592306301f7bbd727466ca1a4b4b0f93751cf
parent da00d9a5466558ccd9e7b7d04b13d7cb9160c876
author Jeff Dike <jdike@addtoit.com> Wed, 08 Jun 2005 15:48:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:12 -0700
[PATCH] uml: fix strace -f
It turns out that we need to check for pending signals when a newly forked
process is run for the first time. With strace -f, strace needs to know about
the forked process before it gets going. If it doesn't, then it ptraces some
bogus values into its registers, and the process segfaults. So, I added calls
to interrupt_end, which does that, plus checks for reschedules. There
shouldn't be any of those, but x86 does the same thing, so I'm copying that
behavior to be safe.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1f96ddb4fb40961a8ebebf7a00bbfaad55aacbd2
tree 7c6ede0fdab8d85c29145c9ad1ae0f5ce9d56143
parent 501cb02b431fb88c7f157c46c8b54de59d1dd463
author Jeff Dike <jdike@addtoit.com> Wed, 08 Jun 2005 15:48:27 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:12 -0700
[PATCH] uml: clean up error path
This cleans an error path which used to leak file descriptors by returning
without trying to tidy up.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3df59529ad1045da61698bb5dd8ebaa547aeb46f
tree f7370854b4c8aa3a6c72990b00094dc454b3e039
parent a38133298fc678335a0229e97b6161a7ac6fec84
author Jeff Dike <jdike@addtoit.com> Wed, 08 Jun 2005 15:47:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:21:11 -0700
[PATCH] uml: make the emulated iomem driver work on 2.6
This makes the minimal fixes needed to make the UML iomem driver work in 2.6.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a38133298fc678335a0229e97b6161a7ac6fec84
tree 2500f23fd230e67a8eba96b380245ecb43c3fd4c
parent 97d26b8042a6f14cc4a19e84e911a953363e3d69
parent 70aa488cff83c965c9e1850f48d82b000d0d6c1c
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:06:15 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 16:06:15 -0700
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
commit 98e56405521b74b4826f855d45ef7859f34548ff
tree dbd9b7ac68a916f665c8d59f996913bfdf7bb07a
parent e1e284a4bd827db2288af9536664b44590e419eb
author Thomas Graf <tgraf@suug.ch> Wed, 08 Jun 2005 15:11:19 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 15:11:19 -0700
[PKT_SCHED]: Fix numeric comparison in meta ematch
This patch is brought to you by the department of applied stupidity.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1e284a4bd827db2288af9536664b44590e419eb
tree 040570a09a556d4e2ae13694b0d4b7aeae803feb
parent 4890062960cbc4d3cebdbd8261a68bc85efcf5d4
author Thomas Graf <tgraf@suug.ch> Wed, 08 Jun 2005 15:11:02 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 15:11:02 -0700
[PKT_SCHED]: Dump classification result for basic classifier
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4890062960cbc4d3cebdbd8261a68bc85efcf5d4
tree c834cb84fc939d64d5331a769abe6c20b8347ac8
parent b824979aeccbfd997e6e5dbe75c47d586b5a2923
author Thomas Graf <tgraf@suug.ch> Wed, 08 Jun 2005 15:10:48 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 15:10:48 -0700
[PKT_SCHED]: Allow socket attributes to be matched on via meta ematch
Adds meta collectors for all socket attributes that make sense
to be filtered upon. Some of them are only useful for debugging
but having them doesn't hurt.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b824979aeccbfd997e6e5dbe75c47d586b5a2923
tree 18cb867c7153a4608a65e3e0415b91ba64d8859b
parent e3876605450979fe52a1a03e7eb78a89bf59e76a
author Thomas Graf <tgraf@suug.ch> Wed, 08 Jun 2005 15:10:22 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 15:10:22 -0700
[PKT_SCHED]: Fix typo in NET_EMATCH_STACK help text
Spotted by Geert Uytterhoeven <geert@linux-m68k.org>.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e3876605450979fe52a1a03e7eb78a89bf59e76a
tree f9231d5bda84f4450583b4fbd64456ba3caeb499
parent 699a411451a32cc111410f44f172b265f6d679c8
author Stephen Hemminger <shemminger@osdl.org> Wed, 08 Jun 2005 14:56:01 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:56:01 -0700
[NET]: Fix sysctl net.core.dev_weight
Changing the sysctl net.core.dev_weight has no effect because the weight
of the backlog devices is set during initialization and never changed.
This patch propagates any changes to the global value affected by sysctl
to the per-cpu devices. It is done every time the packet handler
function is run.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 699a411451a32cc111410f44f172b265f6d679c8
tree 7a959a5f8a7da6c1f9d7a41c9c0425754625314c
parent 8181b8c1f3a69fe5abcc51cb732eb512ccd1566a
author Stephen Hemminger <shemminger@osdl.org> Wed, 08 Jun 2005 14:55:42 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:55:42 -0700
[NET]: Allow controlling NAPI device weight with sysfs
Simple interface to allow changing network device scheduling weight
with sysfs. Please consider this for 2.6.12, since risk/impact is small.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8181b8c1f3a69fe5abcc51cb732eb512ccd1566a
tree 1989bf25817c8fc838f7448d48bad9ddcc3e546e
parent 97d26b8042a6f14cc4a19e84e911a953363e3d69
author Gabor Fekete <gfekete@cc.jyu.fi> Wed, 08 Jun 2005 14:54:38 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:54:38 -0700
[IPV6]: Update parm.link in ip6ip6_tnl_change()
Signed-off-by: Gabor Fekete <gfekete@cc.jyu.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ed7fce6c13bdd802817e1988d67047d432e7e30b
tree dab851d41b05c17e10903e1e6d1609a2be1e54a4
parent 6d1cfbab4de64f2d0c5b0f81177ade0d75b69288
author David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:15:52 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:15:52 -0700
[TG3]: Update driver version and release date.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6d1cfbab4de64f2d0c5b0f81177ade0d75b69288
tree 9076b18ac9d821bedba5b3499a7f34515ef44e57
parent 35d1bc90546d1f0af198886ae8062a550142d926
author Michael Chan <mchan@broadcom.com> Wed, 08 Jun 2005 14:13:14 -0700
committer David S. Miller <davem@davemloft.net> Wed, 08 Jun 2005 14:13:14 -0700
[TG3]: Fix 5700/5701 DMA corruption on Apple G4.
Fix 5700/5701 DMA write corruption on Apple G4 by detecting the Apple
UniNorth PCI 1.5 chipset and adjusting the DMA write boundary to 16. DMA
test fails to detect the problem with this chipset.
Thanks to Manuel Perez Ayala for reporting the problem and helping to
debug it.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 70aa488cff83c965c9e1850f48d82b000d0d6c1c
tree 9236fa880fe3fab2ee3cf2bcb0ec4a4e19ded3c5
parent 86ebacd360767f6a5cf9c8810977593dccf3f3da
author Keith Owens <kaos@sgi.com> Fri, 27 May 2005 23:09:00 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 08 Jun 2005 12:25:24 -0700
[IA64] Extract correct break number for break.b
break.b does not store the break number in cr.iim, instead it stores 0,
which makes all break.b instructions look like BUG(). Extract the
break number from the instruction itself.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 86ebacd360767f6a5cf9c8810977593dccf3f3da
tree 9ee60c8036dcf3a260ce18580517c5a8dfe00b6b
parent 866ba633a81c1e179038f7527809d9513160a6f7
author Tony Luck <tony.luck@intel.com> Wed, 08 Jun 2005 12:12:48 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 08 Jun 2005 12:12:48 -0700
[IA64] Update comment to describe modes set in default control register.
Christian Hildner pointed out that the comment did not match what the
code does in cpu_init() when we set up the default control register.
Patch based on suggestions from Ken Chen.
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 97d26b8042a6f14cc4a19e84e911a953363e3d69
tree 9b72b650285720c17d0aa0a3795c30fe492700b3
parent 5131bf5db73529e972459060d8559f72e036fe53
parent dcef1f634657dabe7905af3ccda12cf7f0b6fcc1
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 11:43:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 11:43:17 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 5131bf5db73529e972459060d8559f72e036fe53
tree 0037ac7e0cc8b3433301042cf40b3fdc10955d6b
parent 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f
parent ff39bc772ad18d8c7f9334926053b718d7932de0
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 11:42:44 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 11:42:44 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
commit 866ba633a81c1e179038f7527809d9513160a6f7
tree 10c06d91204027a8688a2337aa061e51a3321c0f
parent ad597bd518559f59ede8d01262cdf4467e13282e
author Keith Owens <kaos@sgi.com> Mon, 06 Jun 2005 02:04:00 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 08 Jun 2005 11:41:31 -0700
[IA64] Module gp must point to valid memory
Some bits of the kernel assume that gp always points to valid memory,
in particular PHYSICAL_MODE_ENTER() assumes that both gp and sp are
valid virtual addresses with associated physical pages. The IA64
module loader puts gp well past the end of the module, with no physical
backing. Offsets on gp are still valid, but physical mode addressing
breaks for modules. Ensure that gp always falls within the module
body. Also ensure that gp is 8 byte aligned.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit ff39bc772ad18d8c7f9334926053b718d7932de0
tree bc2602207de0be0147cf5c2fae41aed4c22e26a4
parent eae936e21bd726f9d9555f2262d439fbcd61dccf
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 08 Jun 2005 19:26:47 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 08 Jun 2005 19:26:47 +0100
[PATCH] Serial: remove unused variable in sa1100 driver
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit dcef1f634657dabe7905af3ccda12cf7f0b6fcc1
tree e1b8bf471c3c268d0be919561268c24f298d031b
parent aeabbbbe126f3d5e61e2db07629443cd10932bb2
author Nicolas Pitre <nico@org.rmk.(none)> Wed, 08 Jun 2005 19:00:47 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Jun 2005 19:00:47 +0100
[PATCH] ARM: 2664/2: add support for atomic ops on pre-ARMv6 SMP systems
Patch from Nicolas Pitre
Not that there might be many of them on the planet, but at least RMK
apparently has one.
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit aeabbbbe126f3d5e61e2db07629443cd10932bb2
tree 36955efefca5f102c9c1e67fba3743ae91927062
parent 57cfa5e97ff60d909a7e0a5f6e4d0a49aa3e2aec
author Nicolas Pitre <nico@org.rmk.(none)> Wed, 08 Jun 2005 19:00:16 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Jun 2005 19:00:16 +0100
[PATCH] ARM: 2705/1: fix writesw for misaligned source pointer
Patch from Nicolas Pitre
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 57cfa5e97ff60d909a7e0a5f6e4d0a49aa3e2aec
tree 59b30be58f405d93542177f7d45a20037329e35f
parent 35d1bc90546d1f0af198886ae8062a550142d926
author Giorgio Padrin <giorgio@org.rmk.(none)> Wed, 08 Jun 2005 19:00:15 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Jun 2005 19:00:15 +0100
[PATCH] ARM: 2703/1: pxa-regs.h: complete I2S GPIO alternate functions for PXA27x
Patch from Giorgio Padrin
The patch completes I2S GPIO alternate functions for PXA27x, adding I2S_SYSCLK.
File: pxa-regs.h .
Signed-off-by: Giorgio Padrin
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit ad597bd518559f59ede8d01262cdf4467e13282e
tree d86cef4525e0bfb45b22bd67f40e9c8d0eaa66b5
parent 2bfe94905d3601774c6418c020ba830c118578b4
author David Mosberger-Tang <davidm@hpl.hp.com> Wed, 08 Jun 2005 10:45:00 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 08 Jun 2005 10:58:21 -0700
[IA64] Fill holes in FIXADDR_USER space with zero pages.
This fixes an oops reported by Jason Baron.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 7840e5e95c1a8622425f11454600a49b6c718886
tree 52fdb9af6d424196231e78ec17842a24de1fa8c5
parent 35d1bc90546d1f0af198886ae8062a550142d926
author Olaf Hering <olh@suse.de> Wed, 08 Jun 2005 15:12:00 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 10:18:59 -0700
[PATCH] ppc64: print negative numbers correctly in boot wrapper
if num has a value of -1, accessing the digits[] array will fail and the
format string will be printed in funny way, or not at all. This happens if
one prints negative numbers.
Just change the code to match lib/vsprintf.c
asm/div64.h cant be used because u64 maps to u32 for this build.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f
tree 3505f699e2de7a5c74bbe9d7073b2656d840e1d7
parent 7840e5e95c1a8622425f11454600a49b6c718886
author Ananth N Mavinakayanahalli <amavin@redhat.com> Wed, 08 Jun 2005 15:33:43 +1000
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 10:18:59 -0700
[PATCH] ppc64 kprobes: don't eat dabr/iabr exceptions
Kprobes was eating the hardware instruction and data address
breakpoint exceptions. This patch fixes it; kprobes doesn't use those
exceptions at all and should ignore them.
Signed-off-by: Ananth N Mavinakayanahalli <amavin@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 35d1bc90546d1f0af198886ae8062a550142d926
tree 5aa33046f09436fa292cdcdf6e6db138db6cf58a
parent 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839
parent f8f98a9335db4a7d6285b785180fad720bf22864
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 07:57:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 08 Jun 2005 07:57:17 -0700
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm
commit f8f98a9335db4a7d6285b785180fad720bf22864
tree 201cf5ce682812b0ed15544269930c0d45e1a42f
parent 17d82fcc6a15887b7138d35802ab8fc5f249794f
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 08 Jun 2005 15:28:24 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 08 Jun 2005 15:28:24 +0100
[PATCH] ARM: Fix Xscale copy_page implementation
The ARM copypage changes in 2.6.12-rc4-git1 removed the preempt locking
from the copypage functions which broke the XScale implementation.
This patch fixes the locking on XScale and removes the now unneeded
minicache code.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Checked-by: Richard Purdie
commit 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839
tree 65e75b32e0810961615101cb1f137a060c707c6b
parent eba4f669d6ec9be4173bb2619e9b8500b3c36542
author Trond Myklebust <Trond.Myklebust@netapp.com> Tue, 07 Jun 2005 18:37:01 -0400
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 15:53:47 -0700
[PATCH] NFS: Fix lookup intent handling
We should never apply a lookup intent to anything other than the last
path component in an open(), create() or access() call.
Introduce the helper nfs_lookup_check_intent() which always returns
zero if LOOKUP_CONTINUE or LOOKUP_PARENT are set, and returns the
intent flags if we're on the last component of the lookup.
By doing so, we fix a bug in open(O_EXCL), where we may end up
optimizing away a real lookup of the parent directory.
Problem noticed by Linda Dunaphant <linda.dunaphant@ccur.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit eba4f669d6ec9be4173bb2619e9b8500b3c36542
tree 60178d4f2dd4fa1f8985b38fdbe4cd6b99a58c7a
parent 93cffffa19960464a52f9c78d9a6150270d23785
parent 66bb8bf8b235ba4d37fda14375827864977c6a3e
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:41:30 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:41:30 -0700
Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
commit eda9937656e0b9879ca521140fe61cbc9788c398
tree 86c234bdcf33d664ed9881a9282976be9aa8e454
parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb
author Matthew Dobson <colpatch@us.ibm.com> Tue, 07 Jun 2005 13:22:05 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:39:26 -0700
[PATCH] send_IPI_mask_sequence() warning fix
In file included from arch/i386/kernel/smp.c:235:
include/asm-i386/mach-numaq/mach_ipi.h:4: warning: `send_IPI_mask_sequence'
declared inline after its definition
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ad95d6098dd1e94a09d2a1fdf39fd8281fcd8958
tree 527a17f1c54e7f3825440fdd4a85eadfedc1b78c
parent eda9937656e0b9879ca521140fe61cbc9788c398
author Eugene Surovegin <ebs@ebshome.net> Tue, 07 Jun 2005 13:22:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:39:26 -0700
[PATCH] ppc32: add 405EP cpu_spec entry
Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6
transition.
Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage
for unified caches") triggered this bug and 405EP boards don't boot
anymore.
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 a86d1f4301fad4ff44c1f614c897000bc574ab2f
tree 0eb60f1d27d9ae673285aecaa2769f877dc1a0c4
parent ad95d6098dd1e94a09d2a1fdf39fd8281fcd8958
author Vojtech Pavlik <vojtech@suse.cz> Tue, 07 Jun 2005 13:22:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:39:26 -0700
[PATCH] input: disable scroll feature on AT keyboards
This patch disables the scroll feature on AT keyboards by default, because
it causes the numbers of mouse devices to shift, breaking user setups.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 93cffffa19960464a52f9c78d9a6150270d23785
tree 67341f2e824b1812fde8c68bcd1bf42f3672e612
parent a86d1f4301fad4ff44c1f614c897000bc574ab2f
author Bjorn Helgaas <bjorn.helgaas@hp.com> Tue, 07 Jun 2005 13:22:18 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 07 Jun 2005 13:39:26 -0700
[PATCH] PCI: do VIA IRQ fixup always, not just in PIC mode
At least some VIA chipsets require the fixup even in IO-APIC mode.
This was found and debugged with the patient assistance of Stian
Jordet <liste@jordet.nu> on an Asus CUV266-DLS motherboard.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 66bb8bf8b235ba4d37fda14375827864977c6a3e
tree 830da5361c73af24b309f6ecc6b87482eb4f1c32
parent 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb
author David Mosberger <davidm@napali.hpl.hp.com> Mon, 04 Apr 2005 13:29:43 -0700
committer Dave Jones <davej@redhat.com> Tue, 07 Jun 2005 12:35:44 -0700
[PATCH] Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0).
[AGPGART] Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0).
As mentioned earlier, the current check_bridge_mode() code assumes
that AGP bridges are PCI devices. This isn't always true. Definitely
not for HP zx1 chipset and the same seems to be the case for SGI's AGP
bridge.
The patch below fixes the problem by picking up the AGP_MODE_3_0 bit
from bridge->mode. I feel like I may be missing something, since I
can't see any reason why check_bridge_mode() wasn't doing that in the
first place. According to the AGP 3.0 specs, the AGP_MODE_3_0 bit is
determined during the hardware reset and cannot be changed, so it
seems to me it should be safe to pick it up from bridge->mode.
With the patch applied, I can definitely use AGP acceleration both
with AGP 2.0 and AGP 3.0 (one with an Nvidia card, the other with an
ATI FireGL card).
Unless someone spots a problem, please apply this patch so 3d
acceleration can work on zx1 boxes again.
This makes AGP work again on machines with an AGP bridge that isn't a
PCI device.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Dave Jones <davej@redhat.com>
commit e29b545cb153f230fbd8ff4c19bc98ab950f9f5c
tree cfc8573440b7eb277aaf835842286a36c5e59531
parent d0de98fa16169562bd74913c6c9b3857f9065c79
author Michael Werner <werner@mrcoffee.engr.sgi.com> Sun, 27 Mar 2005 22:08:42 -0800
committer Dave Jones <davej@redhat.com> Tue, 07 Jun 2005 12:35:43 -0700
[PATCH] sgi-agp: fixes a problem with accessing GART memory in sgi_tioca_insert_memory and sgi_tioca_remove_memory
This patch fixes a problem with accessing GART memory in
sgi_tioca_insert_memory and sgi_tioca_remove_memory.
sgi-agp.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
Signed-off-by: Mike Werner <werner@sgi.com>
Signed-off-by: Dave Jones <davej@redhat.com>
commit 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb
tree a11d2e705253faaa9779cfd83bb8ca9de311b195
parent e29b545cb153f230fbd8ff4c19bc98ab950f9f5c
author Keir Fraser <Keir.Fraser@cl.cam.ac.uk> Wed, 30 Mar 2005 13:17:04 -0800
committer Dave Jones <davej@redhat.com> Tue, 07 Jun 2005 12:35:43 -0700
[PATCH] AGP fix for Xen VMM
When Linux is running on the Xen virtual machine monitor, physical
addresses are virtualised and cannot be directly referenced by the AGP
GART. This patch fixes the GART driver for Xen by adding a layer of
abstraction between physical addresses and 'GART addresses'.
Architecture-specific functions are also defined for allocating and freeing
the GATT. Xen requires this to ensure that table really is contiguous from
the point of view of the GART.
These extra interface functions are defined as 'no-ops' for all existing
architectures that use the GART driver.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Jones <davej@redhat.com>
commit d0de98fa16169562bd74913c6c9b3857f9065c79
tree 5a81c4e8e8ef76addec655f1edbf6abaa09acfb0
parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb
author Alan Hourihane <alanh@fairlite.demon.co.uk> Tue, 31 May 2005 19:50:49 +0100
committer Dave Jones <davej@redhat.com> Tue, 07 Jun 2005 12:35:42 -0700
[PATCH] i945G patch for agpgart
Attached is a small patch for i945G support against 2.6.11.11.
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Signed-off-by: Dave Jones <davej@redhat.com>
commit 2bfe94905d3601774c6418c020ba830c118578b4
tree 49f908df283332371b74c4686dd2f0109db2bc61
parent 26abd53d8e9e51bbeea0b4772e8dffece3eeff38
parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb
author Tony Luck <tony.luck@intel.com> Tue, 07 Jun 2005 11:29:43 -0700
committer Tony Luck <tony.luck@intel.com> Tue, 07 Jun 2005 11:29:43 -0700
Auto merge with /home/aegl/GIT/linus
commit 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb
tree b754365f2ca35a8f8d77c92af8a2c9ad056f0325
parent 74262de5d15fe0cab9e6fe75655a502d3c90acca
author David Mosberger <davidm@napali.hpl.hp.com> Mon, 06 Jun 2005 15:50:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 17:02:03 -0700
[PATCH] Include <linux/config.h> before testing CONFIG_ACPI
I'm not sure why this issue is suddenly showing, but without this
patchlet, the zx1 config won't compile anymore (e.g., to see the
compilation-error, look for "***" in [1]).
[1] http://www.gelato.unsw.edu.au/kerncomp/results//2005-06-06-17-00/zx1_defconfig-log.html
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 74262de5d15fe0cab9e6fe75655a502d3c90acca
tree fe97a42038552f22215c7d2c13d9c92b7aa3b9bc
parent ef130126cc8794f748d7513735ecb4d3d99fa39e
author Tom Rini <trini@kernel.crashing.org> Mon, 06 Jun 2005 15:50:08 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 17:02:02 -0700
[PATCH] ppc32: add <linux/compiler.h> to <asm/sigcontext.h>
On ppc32, <asm/sigcontext.h> uses __user, but doesn't directly include
<linux/compiler.h>. This adds that in. Without this, glibc will not
compile.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ef130126cc8794f748d7513735ecb4d3d99fa39e
tree be4d1ba5fbea1d83570d50d8be6ce92a07496d31
parent 5065cc02ccf9212d31ecb7fcd63d734e242e64b1
parent 15def7bfb6902aa2b2bc67059f26d696fb27c235
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 16:59:55 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 16:59:55 -0700
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
commit 5065cc02ccf9212d31ecb7fcd63d734e242e64b1
tree 7bd0b973ecc31a932a30ca9ab40797e4190d28da
parent 8f5bb0438b86d1a5393176ceeec2836fd469edf8
parent fa04ae5c09f3dfedbc923c2954a9a26a573833f1
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 16:58:53 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 16:58:53 -0700
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commit 26abd53d8e9e51bbeea0b4772e8dffece3eeff38
tree d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9
parent ff89bf3bc0534aa03b5375aa906544d96911bad4
parent 8f5bb0438b86d1a5393176ceeec2836fd469edf8
author Tony Luck <tony.luck@intel.com> Mon, 06 Jun 2005 15:42:07 -0700
committer Tony Luck <tony.luck@intel.com> Mon, 06 Jun 2005 15:42:07 -0700
auto merge with /home/aegl/GIT/linus
commit 15def7bfb6902aa2b2bc67059f26d696fb27c235
tree e3512682907cfa08041c26ea3c41f8e8c80fa64d
parent 9ba27794197a18168b99ccecfb7b799f18b64426
author David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:22:56 -0700
committer David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:22:56 -0700
[TG3]: Update driver version and release date.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9ba27794197a18168b99ccecfb7b799f18b64426
tree 1bb183a3fda7b5b8904d1d27663fced5f5035f50
parent 49cabf49abd7676d026a61baabf5aae9337a82be
author Michael Chan <mchan@broadcom.com> Mon, 06 Jun 2005 15:16:20 -0700
committer David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:16:20 -0700
[TG3] Fix link failure in 5701
On some 5701 devices with older bootcode, the LED configuration bits in
SRAM may be invalid with value zero. The fix is to check for invalid
bits (0) and default to PHY 1 mode. Incorrect LED mode will lead to
error in programming the PHY.
Thanks to Grant Grundler for debugging the problem.
>From Grant:
| In May, 2004, tg3 v3.4 changed how MAC_LED_CTRL (0x40c) was getting
| programmed and how to determine what to program into LED_CTRL. The new
| code trusted NIC_SRAM_DATA_CFG (0x00000b58) to indicate what to write
| to LED_CTRL and MII EXT_CTRL registers. On "IOX Core Lan", SRAM was
| saying MODE_MAC (0x0) and that doesn't work.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 49cabf49abd7676d026a61baabf5aae9337a82be
tree 942d26ce4359cec83cae75d5de8765454688bbb3
parent 9beb1d587f690d5b2f9087f8f10c0ff9f6b66886
author Michael Chan <mchan@broadcom.com> Mon, 06 Jun 2005 15:15:17 -0700
committer David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:15:17 -0700
[TG3]: Add TSO firmware license
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9beb1d587f690d5b2f9087f8f10c0ff9f6b66886
tree d9f65f5fd428aaa4af4ca2b75bab67259c4eb91f
parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6
author John W. Linville <linville@tuxdriver.com> Mon, 06 Jun 2005 15:14:35 -0700
committer David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:14:35 -0700
[TG3]: Update pci.ids for BCM5752
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fa04ae5c09f3dfedbc923c2954a9a26a573833f1
tree df0b22f8d9f8c954cfb6d863dabb89bde430aac4
parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6
author David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:07:19 -0700
committer David S. Miller <davem@davemloft.net> Mon, 06 Jun 2005 15:07:19 -0700
[ETHTOOL]: Check correct pointer in ethtool_set_coalesce().
It was checking the "GET" function pointer instead of
the "SET" one. Looks like a cut&paste error :-)
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8f5bb0438b86d1a5393176ceeec2836fd469edf8
tree 7b47dcf5d182cc3465cac1c904bdc3aec6e7e8f2
parent d671a1cbf7c7a5c5562106d39eb7f830ae5273ae
author Yoshinori Sato <ysato@users.sourceforge.jp> Mon, 06 Jun 2005 14:46:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:57:51 -0700
[PATCH] binfmt_flat mmap flag fix
Make sure that binfmt_flat passes the correct flags into do_mmap(). nommu's
validate_mmap_request() will simple return -EINVAL if we try and pass it a
flags value of zero.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d9d29a29669f96903d9950bb881c2a393fd33849
tree d2e12822db98a1bf8feac9f428ba18d867771a85
parent 4b7b9772e4c3d87e649d4c419d2487aacf1235aa
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:11 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:27 -0700
[PATCH] namei fixes (15/19)
Getting rid of sloppy logics:
a) in do_follow_link() we have the wrong vfsmount dropped if our symlink
had been mounted on something. Currently it worls only because we never
get such situation (modulo filesystem playing dirty tricks on us). And
it obfuscates already convoluted logics...
b) same goes for open_namei().
c) in __link_path_walk() we have another "it should never happen" sloppiness -
out_dput: there does double-free on underlying vfsmount and leaks the covering
one if we hit it just after crossing a mountpoint. Again, wrong vfsmount
getting dropped.
d) another too-early-mntput() race - in do_follow_mount() we need to postpone
conditional mntput(path->mnt) until after dput(path->dentry). Again, this one
happens only in it-currently-never-happens-unless-some-fs-plays-dirty
scenario...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d671a1cbf7c7a5c5562106d39eb7f830ae5273ae
tree c27ab7e75684cb70d943c3b2690ebbd62000a921
parent 634ee7017b31e46e28c0bd2cb488213331bfd39a
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:27 -0700
[PATCH] namei fixes (19/19)
__do_follow_link() passes potentially worng vfsmount to touch_atime(). It
matters only in (currently impossible) case of symlink mounted on something,
but it's trivial to fix and that actually makes more sense.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 634ee7017b31e46e28c0bd2cb488213331bfd39a
tree 98094ec596bd637bc305b626b3c9482860b13d88
parent 58c465eba4d7ed307c4c7cb3382ba7ee565e8858
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:27 -0700
[PATCH] namei fixes (18/19)
Cosmetical cleanups - __follow_mount() calls in __link_path_walk() absorbed
into do_lookup().
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 58c465eba4d7ed307c4c7cb3382ba7ee565e8858
tree f147af3fee122ec5cc054ac78fa30e1490a8acd0
parent 39ca6d49759346d4710c759d443eec8048b27213
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:27 -0700
[PATCH] namei fixes (17/19)
follow_mount() made void, reordered dput()/mntput() in it.
follow_dotdot() switched from struct vfmount ** + struct dentry ** to
struct nameidata *; callers updated.
Equivalent transformation + fix for too-early-mntput() race.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 39ca6d49759346d4710c759d443eec8048b27213
tree 559f7d4f5536d2f155ef4301bb2e4056e7a5e587
parent d9d29a29669f96903d9950bb881c2a393fd33849
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:27 -0700
[PATCH] namei fixes (16/19)
Conditional mntput() moved into __do_follow_link(). There it collapses with
unconditional mntget() on the same sucker, closing another too-early-mntput()
race.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e13b210f6f7bdc44dfee0a9bbd633a32db0d6333
tree f957ec2fc24f8a9eb84dcffe76341262c1acedf0
parent 463ffb2e9d39c2a3fd8c3c1d4a34e01f2078f972
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:06 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:26 -0700
[PATCH] namei fixes (10/19)
In open_namei(), __follow_down() loop turned into __follow_mount().
Instead of
if we are on a mountpoint dentry
if O_NOFOLLOW checks fail
drop path.dentry
drop nd
return
do equivalent of follow_mount(&path.mnt, &path.dentry)
nd->mnt = path.mnt
we do
if __follow_mount(path) had, indeed, traversed mountpoint
/* now both nd->mnt and path.mnt are pinned down */
if O_NOFOLLOW checks fail
drop path.dentry
drop path.mnt
drop nd
return
mntput(nd->mnt)
nd->mnt = path.mnt
Now __follow_down() can be folded into follow_down() - no other callers left.
We need to reorder dput()/mntput() there - same problem as in follow_mount().
Equivalent transformation + fix for a bug in O_NOFOLLOW handling - we used to
get -ELOOP if we had the same fs mounted on /foo and /bar, had something bound
on /bar/baz and tried to open /foo/baz with O_NOFOLLOW. And fix of
too-early-mntput() race in follow_down()
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ba7a4c1a76f56c607560f1676680ff491747bdae
tree c68f4fd0d5802819eb16dc6c126b2c24f4e09634
parent a15a3f6fc67d910f43098acec6e19d25a37d7cb9
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:08 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:26 -0700
[PATCH] namei fixes (13/19)
In open_namei() exit_dput: we have mntput() done in the wrong order -
if nd->mnt != path.mnt we end up doing
mntput(nd->mnt);
nd->mnt = path.mnt;
dput(nd->dentry);
mntput(nd->mnt);
which drops nd->dentry too late. Fixed by having path.mnt go first.
That allows to switch O_NOFOLLOW under if (__follow_mount(...)) back
to exit_dput, while we are at it.
Fix for early-mntput() race + equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a15a3f6fc67d910f43098acec6e19d25a37d7cb9
tree f00e6a3f505f2e77568695f6f5e2bd4786fcc8ca
parent 2f12dbfbb6286c725c283a169f8f05e89a86848b
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:08 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:26 -0700
[PATCH] namei fixes (12/19)
In open_namei() we take mntput(nd->mnt);nd->mnt=path.mnt; out of the if
(__follow_mount(...)), making it conditional on nd->mnt != path.mnt instead.
Then we shift the result downstream.
Equivalent transformations.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4b7b9772e4c3d87e649d4c419d2487aacf1235aa
tree 943427ad8ef5ed51ab0802cf81f5c0e721fb36c6
parent ba7a4c1a76f56c607560f1676680ff491747bdae
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:26 -0700
[PATCH] namei fixes (14/19)
shifted conditional mntput() into do_follow_link() - all callers were doing
the same thing.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f12dbfbb6286c725c283a169f8f05e89a86848b
tree 5d0a725f71a041955d49146c4837a0df19a015dc
parent e13b210f6f7bdc44dfee0a9bbd633a32db0d6333
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:07 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:26 -0700
[PATCH] namei fixes (11/19)
shifted conditional mntput() calls in __link_path_walk() downstream.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d671d5e51400aab03c713a16ce3545aa81ad7b1c
tree c0ba8f1af3d55320a52024d02be4ab9869a0f6e2
parent cd4e91d3bca8d5527289f5984cf32e9fe6fb8293
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:04 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:25 -0700
[PATCH] namei fixes (8/19)
In open_namei() we never use path.mnt or path.dentry after exit: or ok:.
Assignment of path.dentry in case of LAST_BIND is dead code and only
obfuscates already convoluted function; assignment of path.mnt after
__do_follow_link() can be moved down to the place where we set path.dentry.
Obviously equivalent transformations, just to clean the air a bit in that
region.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cd4e91d3bca8d5527289f5984cf32e9fe6fb8293
tree 5059fedcd7fb8e8893b8d204e18b5813dfae3449
parent 839d9f93c9f1623fb37234d464d739617879d97e
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:03 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:25 -0700
[PATCH] namei fixes (7/19)
The first argument of __do_follow_link() switched to struct path *
(__do_follow_link(path->dentry, ...) -> __do_follow_link(path, ...)).
All callers have the same calls of mntget() right before and dput()/mntput()
right after __do_follow_link(); these calls have been moved inside.
Obviously equivalent transformations.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 839d9f93c9f1623fb37234d464d739617879d97e
tree 1f3e2e6b31d0417a99868d748fae044a5fd0995e
parent 1be4a0900be5d2c2fd9cd012e3a153e1ea47b96a
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:02 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:25 -0700
[PATCH] namei fixes (6/19)
mntget(path->mnt) in do_follow_link() moved down to right before the
__do_follow_link() call and rigth after loop: resp.
dput()+mntput() on non-ELOOP branch moved up to right after __do_follow_link()
call.
resulting
loop:
mntget(path->mnt);
path_release(nd);
dput(path->mnt);
mntput(path->mnt);
replaced with equivalent
dput(path->mnt);
path_release(nd);
Equivalent transformations - the reason why we have that mntget() is that
__do_follow_link() can drop a reference to nd->mnt and that's what holds
path->mnt. So that call can happen at any point prior to __do_follow_link()
touching nd->mnt. The rest is obvious.
NOTE: current tree relies on symlinks *never* being mounted on anything. It's
not hard to get rid of that assumption (actually, that will come for free
later in the series). For now we are just not making the situation worse than
it is.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 463ffb2e9d39c2a3fd8c3c1d4a34e01f2078f972
tree e5d9b39aca2a546bf2b832c5a2a7066e34f9c1b5
parent d671d5e51400aab03c713a16ce3545aa81ad7b1c
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:05 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:25 -0700
[PATCH] namei fixes (9/19)
New helper: __follow_mount(struct path *path). Same as follow_mount(), except
that we do *not* do mntput() after the first lookup_mnt().
IOW, original path->mnt stays pinned down. We also take care to do dput()
before mntput() in the loop body (follow_mount() also needs that reordering,
but that will be done later in the series).
The following are equivalent, assuming that path.mnt == x:
(1)
follow_mount(&path.mnt, &path.dentry)
(2)
__follow_mount(&path);
if (path->mnt != x)
mntput(x);
(3)
if (__follow_mount(&path))
mntput(x);
Callers of follow_mount() in __link_path_walk() converted to (2).
Equivalent transformation + fix for too-late-mntput() race in __follow_mount()
loop.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d73ffe16b8baafae6e9249acee6b50c24099c6de
tree 321319974be9fcc50f4ec36ccad26b84d4b66b66
parent 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:01 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:24 -0700
[PATCH] namei fixes (4/19)
path.mnt in open_namei() set to mirror nd->mnt.
nd->mnt is set in 3 places in that function - path_lookup() in the beginning,
__follow_down() loop after do_last: and __do_follow_link() call after
do_link:.
We set path.mnt to nd->mnt after path_lookup() and __do_follow_link(). In
__follow_down() loop we use &path.mnt instead of &nd->mnt and set nd->mnt to
path.mnt immediately after that loop.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 90ebe5654febe3555a2516d51d3d251226d35fdb
tree 576e1b58886329a4ea0c8a4b20416ce0dead0e51
parent 4481e8eea761857367162b0957277d5524fbea63
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:35:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:24 -0700
[PATCH] namei fixes
OK, here comes a patch series that hopefully should close all
too-early-mntput() races in fs/namei.c. Entire area is convoluted as hell, so
I'm splitting that series into _very_ small chunks.
Patches alread in the tree close only (very wide) races in following symlinks
(see "busy inodes after umount" thread some time ago). Unfortunately, quite a
few narrower races of the same nature were not closed. Hopefully this should
take care of all of them.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5f92b3bcec0fa2e2d775b589850097f9dc6b2de2
tree 239ce9af16392b452f651780e85b40b809b8d17a
parent 90ebe5654febe3555a2516d51d3d251226d35fdb
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:35:59 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:24 -0700
[PATCH] namei fixes (2/19)
All callers of do_follow_link() do mntget() right before it and
dput()+mntput() right after. These calls are moved inside do_follow_link()
now.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a
tree 2c13ff8c1ed25fea1511e67a27575824fc56aabe
parent 5f92b3bcec0fa2e2d775b589850097f9dc6b2de2
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:24 -0700
[PATCH] namei fixes (3/19)
Replaced struct dentry *dentry in namei with struct path path. All uses of
dentry replaced with path.dentry there.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1be4a0900be5d2c2fd9cd012e3a153e1ea47b96a
tree e743475f1ff0e078bda6bc8555bfc5b9fb8b4097
parent d73ffe16b8baafae6e9249acee6b50c24099c6de
author Al Viro <viro@www.linux.org.uk> Mon, 06 Jun 2005 13:36:01 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:24 -0700
[PATCH] namei fixes (5/19)
fix for too early mntput() in open_namei() - we pin path.mnt down for the
duration of __do_follow_link(). Otherwise we could get the fs where our
symlink lived unmounted while we were in __do_follow_link(). That would end
up with dentry of symlink staying pinned down through the fs shutdown.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a51171816826b074828fa96cb6ef60fc3b13631a
tree e3c6f7a9852d45e9fdec75d7c71548ba404625e7
parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6
author Martin Schwidefsky <schwidefsky@de.ibm.com> Mon, 06 Jun 2005 13:35:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:23 -0700
[PATCH] broken fault_in_pages_readable call in generic_file_buffered_write()
fault_in_pages_readable() is being passed an incorrect `end' address, which
can result in writes accidentally faulting in pages which will not be affected
by the write() call.
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 8e2894e51d6407e47226a60c0d19bf384642c55a
tree 9450c84cb6467d17e13a9def59479216d6af1b29
parent 3399ba5b70eccc918ea4ab2630cac68f5c8ff845
author Yoshinori Sato <ysato@users.sourceforge.jp> Mon, 06 Jun 2005 13:35:56 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:23 -0700
[PATCH] h8300 build error fix
h8300 was missing a few definitions.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4481e8eea761857367162b0957277d5524fbea63
tree 2b8e0a7ae33b67be3e0a195a11919705e3934865
parent 8e2894e51d6407e47226a60c0d19bf384642c55a
author Kumar Gala <galak@freescale.com> Mon, 06 Jun 2005 13:35:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:23 -0700
[PATCH] ppc32: Fix incorrect CPU_FTR fixup usage for unified caches
Runtime feature support for unified caches was testing a userland feature
flag (PPC_FEATURE_UNIFIED_CACHE) instead of a cpu feature flag
(CPU_FTR_SPLIT_ID_CACHE). Luckily the current defined bit mask for cpu
features and userland features do not overlap so this only causes an issue
on machines with a unified cache, which is extremely rare on PPC today.
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 3399ba5b70eccc918ea4ab2630cac68f5c8ff845
tree 8bc0679962247a65012a2e39d137df4cd9e21d82
parent a51171816826b074828fa96cb6ef60fc3b13631a
author Denis Vlasenko <vda@ilport.com.ua> Mon, 06 Jun 2005 13:35:55 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 06 Jun 2005 14:42:23 -0700
[PATCH] moxa: do not ignore input
Stop using tty internal structure in mxser_receive_chars(), use
tty_insert_flip_char(tty, ch flag); instead.
Without this change driver ignores any rx'ed chars.
Run tested.
Cc: Alan Cox <alan@redhat.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 0b68177ccd12866d9f19cafad212b861c9d02a8c
tree 6fc26aa59fb183fe9c86d44ae14ce423ad7211da
parent d0d2f2df65ddea9a30ddd117f769bfff65d3fc56
parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6
author Steve French <sfrench@hera.kernel.org> Mon, 06 Jun 2005 09:57:33 -0700
committer Steve French <sfrench@hera.kernel.org> Mon, 06 Jun 2005 09:57:33 -0700
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit 17d82fcc6a15887b7138d35802ab8fc5f249794f
tree b550dc5b0acdb6017788d3c1aab36ae12352aab7
parent 8775420d2fbcfff866995471ea5f6130d14d121c
author Deepak Saxena <dsaxena@net.rmk.(none)> Fri, 03 Jun 2005 22:18:52 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 03 Jun 2005 22:18:52 +0100
[PATCH] ARM: 2700/1: Disable IXP2000 IRQs at bootup
Patch from Deepak Saxena
The IXDP2800 bootloader does not disable IRQs before jumping into
the kernel and this is causing the Grand Unified KGDB to crash
the system when we do an early call to trap_init() and irq handlers
have not yet been registered. This patch disables IRQs before we
jump into the kernel.
Signed-off-by: Deepak Saxena
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 8775420d2fbcfff866995471ea5f6130d14d121c
tree bef5911e6c02b5780a8d81e8db656177ff9b8c4a
parent 718a30a5cf0a9142f716a49853bd4b4a25a8da1b
author Todd Poynor <tpoynor@com.rmk.(none)> Fri, 03 Jun 2005 20:52:27 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 03 Jun 2005 20:52:27 +0100
[PATCH] ARM: 2691/1: PXA27x sleep fixes take 2
Patch from Todd Poynor
PXA27x sleep fixes:
* set additional sleep/wakeup registers for Mainstone boards.
* move CKEN=0 to pxa25x-specific code; that value is harmful on pxa27x.
* save/restore additional registers, including some found necessary for
C5 processors and/or newer blob versions.
* enable future support of additional sleep modes for PXA27x (eg,
standby, deep sleep).
* split off cpu-specific sleep processing between pxa27x and pxa25x into
separate files (partly in preparation for additional sleep modes).
Includes fixes from David Burrage.
Signed-off-by: Todd Poynor
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 718a30a5cf0a9142f716a49853bd4b4a25a8da1b
tree e7c825c4c835195a49b17372966be733dfcaa9ed
parent 105bb2698b54a838165947199f1c8be5c2e7d9bb
author Mike Frysinger <vapier@org.rmk.(none)> Fri, 03 Jun 2005 20:52:26 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 03 Jun 2005 20:52:26 +0100
[PATCH] ARM: 2696/1: remove ';' in ELF_DATA define in asm-arm{,26}/elf.h
Patch from Mike Frysinger
the ELF_DATA define in both arm asm subdirs of linux/include/ contain a
semicolon at the end. this of course will cause any code that tries to use
ELF_DATA in assignment or comparison to fail. no other arch has a semicolon
in their ELF_DATA defines.
Signed-off-by: Mike Frysinger
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 105bb2698b54a838165947199f1c8be5c2e7d9bb
tree bd5028148a5299bc1f064bbe631f42b59ba9a21a
parent 4ab5c01c7cc28f29d5cf5f2a591cb6f7bbece48e
author Albrecht Dreß <albrecht.dress@com.rmk.(none)> Fri, 03 Jun 2005 20:52:26 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 03 Jun 2005 20:52:26 +0100
[PATCH] ARM: 2694/1: [s3c2410/dma] release irq properly to fix kernel oops
Patch from Albrecht Dreß
Problem:
When a module requests a DMA channel via the function s3c2410_dma_request(), this function requests the appropriate irq under the name of the client module. When the client module is unloaded, it calls s3c2410_dma_free() which does not free the irq. Consequently, when e.g. running "cat /proc/interrupts", the irq owner points to freed memory, leading to a kernel oops.
File:
linux/arch/arm/mach-s3c2410/dma.c
Fix:
trivial, below
Signed-off-by: Albrecht Dreß
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 4ab5c01c7cc28f29d5cf5f2a591cb6f7bbece48e
tree d69fc21d2dbba664249efe6394213a11a119dcc1
parent eff910a91ac04ab1d9e210d4f721484af3b39c8d
author Deepak Saxena <dsaxena@net.rmk.(none)> Fri, 03 Jun 2005 20:52:25 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 03 Jun 2005 20:52:25 +0100
[PATCH] ARM: 2692/1: Fix compile warnings in include/asm-arm/arch-ixp2000/io.h
Patch from Deepak Saxena
This patch fixes the following warnings:
include/asm/arch/io.h: In function `insw':
include/asm/arch/io.h:78: warning: comparison of distinct pointer types
lacks acast
include/asm/arch/io.h:79: warning: comparison of distinct pointer types
lacks acast
include/asm/arch/io.h: In function `outsw':
include/asm/arch/io.h:103: warning: comparison of distinct pointer types
lacks a cast
include/asm/arch/io.h:104: warning: comparison of distinct pointer types
lacks a cast
include/asm/arch/io.h: In function `inw':
include/asm/arch/io.h:127: warning: comparison of distinct pointer types
lacks a cast
Signed-off-by: Deepak Saxena
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit ff89bf3bc0534aa03b5375aa906544d96911bad4
tree 530ad23b9a0879b3a17f2b6fee93760b24af0b22
parent 0fd56f67890acf7904c83e7de6cb71723eb1c962
author Dean Nelson <dcn@sgi.com> Fri, 03 Jun 2005 05:25:00 -0700
committer Tony Luck <tony.luck@intel.com> Fri, 03 Jun 2005 12:37:53 -0700
[IA64] fix setting of sn_hub_info->shub_1_1_found
Fix a bug in which shub_1_1_found is not being properly initialized or set,
resulting in the improper setting of sn_hub_info->shub_1_1_found.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit d0d2f2df65ddea9a30ddd117f769bfff65d3fc56
tree 43d7f695330199f8b384da4b78c5652aa06aeff3
parent 467ca22d3371f132ee225a5591a1ed0cd518cb3d
author Steve French <sfrench@hera.kernel.org> Thu, 02 Jun 2005 15:12:36 -0700
committer Steve French <sfrench@hera.kernel.org> Thu, 02 Jun 2005 15:12:36 -0700
[CIFS] Update cifs version number and fix whitespace
Signed-off-by: Steve French (sfrench@us.ibm.com)
commit 467ca22d3371f132ee225a5591a1ed0cd518cb3d
tree 0e3d6de84b4ffa379c2c7ddcebd3f55de52b9844
parent 12725675e26d52c39e856d341035b94bf7802458
parent 1e86d1c648508fd50e6c9960576b87906a7906ad
author Steve French <sfrench@hera.kernel.org> Thu, 02 Jun 2005 14:42:23 -0700
committer Steve French <sfrench@hera.kernel.org> Thu, 02 Jun 2005 14:42:23 -0700
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit 12725675e26d52c39e856d341035b94bf7802458
tree f9cf054ddcdf3845df7e9e0b4f84a87e86577a03
parent af6f5e3247a68074e384ef93c0b4bce1b73c9d80
parent eff910a91ac04ab1d9e210d4f721484af3b39c8d
author Steve French <sfrench@hera.kernel.org> Wed, 01 Jun 2005 15:02:37 -0700
committer Steve French <sfrench@hera.kernel.org> Wed, 01 Jun 2005 15:02:37 -0700
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit af6f5e3247a68074e384ef93c0b4bce1b73c9d80
tree 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd
parent 7e2987503dda95a5f80290bb8c06279009c2419e
parent 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35
author Steve French <sfrench@hera.kernel.org> Tue, 31 May 2005 14:32:44 -0700
committer Steve French <sfrench@hera.kernel.org> Tue, 31 May 2005 14:32:44 -0700
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git