]> git.neil.brown.name Git - history.git/log
history.git
21 years ago[IRDA]: Adaptive discovery query timer
Jean Tourrilhes [Thu, 21 Oct 2004 15:09:38 +0000 (08:09 -0700)]
[IRDA]: Adaptive discovery query timer

o [FEATURE] Adapt to the rate of the peer discovery (passive discovery)
o [FEATURE] Add extra safety margin in passive discovery
Allow to interoperate properly with device performing slow discovery

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IRDA]: IAS safety comments
Jean Tourrilhes [Thu, 21 Oct 2004 15:08:56 +0000 (08:08 -0700)]
[IRDA]: IAS safety comments

o [FEATURE] Make optional the del of IAS object when del IAS attrib
o [FEATURE] Clarify when/why it's safe to to the above

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IRDA]: IrNET char dev alias
Jean Tourrilhes [Thu, 21 Oct 2004 15:08:17 +0000 (08:08 -0700)]
[IRDA]: IrNET char dev alias

o [FEATURE] Add module alias for IrNET char dev

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IRDA]: Fix nsc-ircc dongle_id input
Jean Tourrilhes [Thu, 21 Oct 2004 15:07:40 +0000 (08:07 -0700)]
[IRDA]: Fix nsc-ircc dongle_id input

<Original patch from Maik Broemme>

o [CRITICA] Don't Oops on invalid dongle-id in nsc-ircc driver

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IRDA]: Fix lmp_lsap_inuse()
Jean Tourrilhes [Thu, 21 Oct 2004 15:06:57 +0000 (08:06 -0700)]
[IRDA]: Fix lmp_lsap_inuse()

o [CRITICA] Fix locking in error path in IrLMP (Stanford checker)
o [CORRECT] Don't reuse unconnected LSAPs (listening sockets)
o [CORRECT] Make sure the LSAP we are picking has just not been grabed
o [CORRECT] Wrap around the LSAP space properly back to 0x10

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: [zatm] eliminate pci_find_device (from Francois Romieu <romieu@fr.zoreil.com>)
Chas Williams [Thu, 21 Oct 2004 15:05:04 +0000 (08:05 -0700)]
[ATM]: [zatm] eliminate pci_find_device (from Francois Romieu <romieu@fr.zoreil.com>)

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: [firestream] remove dead code (from Francois Romieu <romieu@fr.zoreil.com>)
Chas Williams [Thu, 21 Oct 2004 15:04:07 +0000 (08:04 -0700)]
[ATM]: [firestream] remove dead code (from Francois Romieu <romieu@fr.zoreil.com>)

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: [ambassador] eliminate pci_find_device()
Chas Williams [Thu, 21 Oct 2004 14:58:31 +0000 (07:58 -0700)]
[ATM]: [ambassador] eliminate pci_find_device()

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: ambassador printk warning fix
Andrew Morton [Thu, 21 Oct 2004 14:57:02 +0000 (07:57 -0700)]
[ATM]: ambassador printk warning fix

From: Jesper Juhl <juhl-lkml@dif.dk>

drivers/atm/ambassador.c:2295: warning: unsigned int format, long unsigned int arg (arg 2)

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: Add new sysfs attribute 'carrier' for net devices.
Andrew Morton [Thu, 21 Oct 2004 14:55:58 +0000 (07:55 -0700)]
[NET]: Add new sysfs attribute 'carrier' for net devices.

From: Jesper Juhl <juhl-lkml@dif.dk>

The patch adds a new sysfs attribute called carrier for net devices that
exposes the result of netif_carrier_ok().  This allows a user to quickly
and easily determine if a given netdevice has carrier or not.  Reading
/sys/class/net/<interface>/carrier yields a '1' when there is a carrier and
a '0' when there is not.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[CRYPTO]: Deinline large function in blowfish.c
Andrew Morton [Thu, 21 Oct 2004 14:52:23 +0000 (07:52 -0700)]
[CRYPTO]: Deinline large function in blowfish.c

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: neigh_stat preempt fix
Andrew Morton [Thu, 21 Oct 2004 14:51:31 +0000 (07:51 -0700)]
[NET]: neigh_stat preempt fix

On some code paths this code is playing with per-cpu data with preemption
enabled.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: Replace dst_release refcount error with standard WARN_ON
Stephen Hemminger [Thu, 21 Oct 2004 14:49:37 +0000 (07:49 -0700)]
[NET]: Replace dst_release refcount error with standard WARN_ON

Replace the dst count underflow bug message with a standard WARN message.
This makes errors noticeable and also reduces the kernel text size by 600
since we aren't doing as much to setup the printk.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[CRYPTO]: Put khazad back into tcrypt table.
Aaron Grothe [Thu, 21 Oct 2004 14:47:48 +0000 (07:47 -0700)]
[CRYPTO]: Put khazad back into tcrypt table.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NETFILTER]: Avoid warning on CONNTRACK_STAT_INC in death_by_timeout()
Andrew Morton [Wed, 20 Oct 2004 15:04:24 +0000 (08:04 -0700)]
[NETFILTER]: Avoid warning on CONNTRACK_STAT_INC in death_by_timeout()

Module removal can call death_by_timeout() manually, which isn't in softirq
context, so the CONNTRACK_STAT_INC() call there (which assumes preempt
disabled) can give a warning.  Of course, the warning here is spurious, but
the simplest workaround is to call CONNTRACK_STAT_INC() inside the lock.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATALK]: Add appletalk 32-bit ioctl emulation.
Andi Kleen [Wed, 20 Oct 2004 15:01:54 +0000 (08:01 -0700)]
[ATALK]: Add appletalk 32-bit ioctl emulation.

From: Helmut Tschemernjak <helmut@helios.de>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IPV4]: Fix inet6_dev reference leak in ndisc_dst_alloc error path.
Patrick McHardy [Wed, 20 Oct 2004 15:00:19 +0000 (08:00 -0700)]
[IPV4]: Fix inet6_dev reference leak in ndisc_dst_alloc error path.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[TCP]: use const in tcp.h
Stephen Hemminger [Wed, 20 Oct 2004 14:58:58 +0000 (07:58 -0700)]
[TCP]: use const in tcp.h

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: dst: use const in accessors
Stephen Hemminger [Wed, 20 Oct 2004 14:58:16 +0000 (07:58 -0700)]
[NET]: dst: use const in accessors

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[PKT_SCHED]: Fix netem qlen accounting.
Patrick McHardy [Wed, 20 Oct 2004 14:57:25 +0000 (07:57 -0700)]
[PKT_SCHED]: Fix netem qlen accounting.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: point to multipoint signalling (from ekinzie@cmf.nrl.navy.mil)
Chas Williams [Wed, 20 Oct 2004 14:52:07 +0000 (07:52 -0700)]
[ATM]: point to multipoint signalling (from ekinzie@cmf.nrl.navy.mil)

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ATM]: use RCV_SHUTDOWN to exit skb_recv_datagram()
Chas Williams [Wed, 20 Oct 2004 14:51:00 +0000 (07:51 -0700)]
[ATM]: use RCV_SHUTDOWN to exit skb_recv_datagram()

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[XFRM]: Fix policy update bug when increasing priority of last policy.
Herbert Xu [Wed, 20 Oct 2004 14:49:52 +0000 (07:49 -0700)]
[XFRM]: Fix policy update bug when increasing priority of last policy.

Based upon a patch by Patrick McHardy.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[XFRM]: Apply policy checks to packets with a secpath when the policy list is empty
Patrick McHardy [Wed, 20 Oct 2004 14:47:54 +0000 (07:47 -0700)]
[XFRM]: Apply policy checks to packets with a secpath when the policy list is empty

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[XFRM]: Make {__,}xfrm_policy_check behave identically wrt. empty policy lists.
Herbert Xu [Wed, 20 Oct 2004 14:46:51 +0000 (07:46 -0700)]
[XFRM]: Make {__,}xfrm_policy_check behave identically wrt. empty policy lists.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: In netif_rx_ni, put netif_rx call inside preempt-disable.
David S. Miller [Wed, 20 Oct 2004 14:42:33 +0000 (07:42 -0700)]
[NET]: In netif_rx_ni, put netif_rx call inside preempt-disable.

Noticed by Herbert Xu.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NETFILTER]: Add iptables hashlimit match
Harald Welte [Wed, 20 Oct 2004 14:26:24 +0000 (07:26 -0700)]
[NETFILTER]: Add iptables hashlimit match

It was previously known as dstlimit, but has now
been generalized one step further.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[TCP]: Add total num retransmits accounting.
David S. Miller [Wed, 20 Oct 2004 14:21:01 +0000 (07:21 -0700)]
[TCP]: Add total num retransmits accounting.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NETFILTER]: Add iptables CONNMARK match+target
Harald Welte [Wed, 20 Oct 2004 14:14:41 +0000 (07:14 -0700)]
[NETFILTER]: Add iptables CONNMARK match+target

This is the first patch, adding something similar like nfmark, but on a
per-conntrack (as opposed to per-skb) level.  Very useful especially for
asymmatric routing in combination with MASQUERADE, as often found on
home DSL setups with dymamic IP address that also have e.g. a tunnel
device with static IP.

Signed-off-by: Henrik Nordstrom <hno@marasystems.com>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[TG3]: Update driver version and reldate.
David S. Miller [Wed, 20 Oct 2004 14:11:19 +0000 (07:11 -0700)]
[TG3]: Update driver version and reldate.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[B44]: Add MODULE_VERSION.
John W. Linville [Wed, 20 Oct 2004 14:09:39 +0000 (07:09 -0700)]
[B44]: Add MODULE_VERSION.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[TG3]: Add MODULE_VERSION.
John W. Linville [Wed, 20 Oct 2004 14:08:25 +0000 (07:08 -0700)]
[TG3]: Add MODULE_VERSION.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IPV6]: Fix netdevice/inet6_dev reference leaks in ip6_route_add error paths
Patrick McHardy [Wed, 20 Oct 2004 14:06:04 +0000 (07:06 -0700)]
[IPV6]: Fix netdevice/inet6_dev reference leaks in ip6_route_add error paths

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[TG3]: tg3_nvram_read_using_eeprom cannot be __init.
Randy Dunlap [Wed, 20 Oct 2004 14:03:30 +0000 (07:03 -0700)]
[TG3]: tg3_nvram_read_using_eeprom cannot be __init.

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years agoMerge nuts.davemloft.net:/disk1/BK/network-2.6
David S. Miller [Wed, 20 Oct 2004 14:00:23 +0000 (07:00 -0700)]
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6

21 years agoFix posix timer direct user space access
Linus Torvalds [Wed, 20 Oct 2004 10:44:41 +0000 (03:44 -0700)]
Fix posix timer direct user space access

This makes us do the proper copy_to_user() for the new
posix timers code.

Acked by Christoph Lameter <clameter@sgi.com>.

21 years agoMerge http://lia64.bkbits.net/linux-ia64-release-2.6.10
Linus Torvalds [Wed, 20 Oct 2004 10:32:29 +0000 (03:32 -0700)]
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge
Tony Luck [Wed, 20 Oct 2004 22:58:50 +0000 (22:58 +0000)]
Merge

21 years ago[IA64-SGI] more sparse I/O accessor fixes
Jesse Barnes [Wed, 20 Oct 2004 22:53:23 +0000 (22:53 +0000)]
[IA64-SGI] more sparse I/O accessor fixes

I forgot to add 'const volatile' to the I/O read/write functions in the last
patch, and also forgot to update the _relaxed variants.  This patch fixes
that by adding 'const volatile' to the sn2 specific read/write routines as
well as the ia64 machine vector wrappers.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] sparse cleanups & misc fixes for sn2
Jesse Barnes [Wed, 20 Oct 2004 20:40:02 +0000 (20:40 +0000)]
[IA64-SGI] sparse cleanups & misc fixes for sn2

This is a big patch mostly because I trimmed shub_mmr.h down from 17M to 11k
or so.  It fixes a number of things sparse discovered and removes some dead
code, fixes up some prototypes, etc.  Of note:

o sn_proc_fs.c was directly dereferencing user pointers, fixed
o sn_hwperf.c was missing an include and was using asm-ia64 directly
o the I/O routines were all missing proper sparse annotations
o dead code in prominfo_proc.c has been removed
o fix generic build by putting numionodes into asm/sn/io.h

With this patch applied, the check build is pretty clean.  The sn_console bit
depends on some of the other changes, so it's included here.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] fix sba_iommu build
Jesse Barnes [Wed, 20 Oct 2004 20:29:33 +0000 (20:29 +0000)]
[IA64] fix sba_iommu build

sba_iommu.c needs to include linux/nodemask.h for node_online now.  Here's a
patch to add it.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] Mod to allow functions other than zero to use virtual channel 1.
Pat Gefre [Wed, 20 Oct 2004 20:26:30 +0000 (20:26 +0000)]
[IA64-SGI] Mod to allow functions other than zero to use virtual channel 1.

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] snsc.c: snsc needs asm/sn/io.h
Jesse Barnes [Wed, 20 Oct 2004 20:23:20 +0000 (20:23 +0000)]
[IA64-SGI] snsc.c: snsc needs asm/sn/io.h

The sn system controller driver needs asm/sn/io.h in order to build correctly
(it was missing the numionodes declaration).

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] export sn_dma_mapping_error for libata
Pat Gefre [Wed, 20 Oct 2004 19:01:36 +0000 (19:01 +0000)]
[IA64] export sn_dma_mapping_error for libata

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] numa.c, discontig.c: sparse: use NULL, not 0
Jesse Barnes [Wed, 20 Oct 2004 18:32:46 +0000 (18:32 +0000)]
[IA64] numa.c, discontig.c: sparse: use NULL, not 0

Clean up a couple of places that were using 0 instead of NULL, which is the
more proper value.

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] mca.c: sparse cleanup
Jesse Barnes [Wed, 20 Oct 2004 18:28:59 +0000 (18:28 +0000)]
[IA64] mca.c: sparse cleanup

Looks like we were casting a value into a union and sparse doesn't like that.
Why not just assign it directly to the appropriate field?

Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] top level scheduler domain for ia64
John Hawkes [Wed, 20 Oct 2004 18:23:39 +0000 (18:23 +0000)]
[IA64] top level scheduler domain for ia64

Some have noticed that the overlapping sched domains code doesn't quite work
as intended (it results in disjoint domains on some machines), and that a top
level, machine spanning domain is needed.  This patch from John Hawkes adds
it to the ia64 code.  This allows processes to run on all CPUs in large
systems, though balancing is limited.  It should go to Linus soon now
otherwise large systems will only have ~16p (depending on topology) usable by
the scheduler.  I sanity checked it on a small system after rediffing John's
original, and he's done some testing on very large systems.

 Nick, can you buy off on the sched.c change?  Alternatively, do you want to
 send that fix separately John? Nick did indeed ACK this change, but it isn't
 dependent on this ia64 specific part ... so it's going to be submitted
 separately.

Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years agoMerge intel.com:/data/home/aegl/BK/Linus
Tony Luck [Wed, 20 Oct 2004 18:16:51 +0000 (18:16 +0000)]
Merge intel.com:/data/home/aegl/BK/Linus
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

21 years agoMerge bk://kernel.bkbits.net/davem/sparc-2.6
Linus Torvalds [Wed, 20 Oct 2004 10:31:29 +0000 (03:31 -0700)]
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PATCH] qla1820 iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:18:52 +0000 (03:18 -0700)]
[PATCH] qla1820 iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ioremap cleanups in aic7xxx
Alexander Viro [Wed, 20 Oct 2004 10:18:40 +0000 (03:18 -0700)]
[PATCH] ioremap cleanups in aic7xxx

ioremap() is capable of dealing with addresses that are not
page-aligned; no need to duplicate that in driver.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] aac7xxx iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:18:25 +0000 (03:18 -0700)]
[PATCH] aac7xxx iomem annotations

aic7xxx annotations - trivial part

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nsp32 iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:18:13 +0000 (03:18 -0700)]
[PATCH] nsp32 iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] megaraid iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:17:58 +0000 (03:17 -0700)]
[PATCH] megaraid iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ips iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:17:45 +0000 (03:17 -0700)]
[PATCH] ips iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ipr iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:17:32 +0000 (03:17 -0700)]
[PATCH] ipr iomem annotations

Annotated.  Original reused the structure that contained pointers into
remapped iomem for storing offsets in such area, so we need to split that
beast.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] isurf iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:17:20 +0000 (03:17 -0700)]
[PATCH] isurf iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] teles{0,pci} iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:17:09 +0000 (03:17 -0700)]
[PATCH] teles{0,pci} iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] kyro iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:16:54 +0000 (03:16 -0700)]
[PATCH] kyro iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] skystar2 iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:16:42 +0000 (03:16 -0700)]
[PATCH] skystar2 iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sx.c iomem annotations and fixes
Alexander Viro [Wed, 20 Oct 2004 10:16:29 +0000 (03:16 -0700)]
[PATCH] sx.c iomem annotations and fixes

a bunch of missing readb() and check of 64Kb alignment of physical address
done on remapped one.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] if_ppp.h __user annotation
Alexander Viro [Wed, 20 Oct 2004 10:16:17 +0000 (03:16 -0700)]
[PATCH] if_ppp.h __user annotation

annotated ioctl structure

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sparc32 kconfig fixes
Alexander Viro [Wed, 20 Oct 2004 10:16:02 +0000 (03:16 -0700)]
[PATCH] sparc32 kconfig fixes

a) CONFIG_VT should set CONFIG_INPUT
b) parport_pc and serial/8250 are broken for sparc32 same as for
sparc64

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] moxa iomem annotations
Alexander Viro [Wed, 20 Oct 2004 10:15:50 +0000 (03:15 -0700)]
[PATCH] moxa iomem annotations

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge bk://bart.bkbits.net/ide-2.6
Linus Torvalds [Wed, 20 Oct 2004 10:08:10 +0000 (03:08 -0700)]
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ide] unify PIO code
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 21:10:23 +0000 (23:10 +0200)]
[ide] unify PIO code

Use PIO code from ide-taskfile.c in ide-disk.c so:
* drive status is checked after PIO read
* request is failed if invalid data phase
  is detected during PIO write

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] ide-disk: unify PIO write/multiwrite code
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 21:05:20 +0000 (23:05 +0200)]
[ide] ide-disk: unify PIO write/multiwrite code

Merge multwrite_intr() into write_intr().

The only change in functionality is that rq->errors is
now also cleared for multiwrite PIO (if there is no error).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] sg PIO for fs requests
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 20:52:39 +0000 (22:52 +0200)]
[ide] sg PIO for fs requests

Convert CONFIG_IDE_TASKFILE_IO=n code
to use scatterlists for PIO transfers.

Fixes longstanding 'data integrity on error'
issue and makes barriers work with PIO.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] sg PIO for taskfile requests
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 20:48:28 +0000 (22:48 +0200)]
[ide] sg PIO for taskfile requests

Use scatterlists for taskfile based PIO transfers
instead of directly walking rq->[bio,cbio] lists.

If CONFIG_IDE_TASKFILE_IO is defined
this code will be used for fs requests.

ide_pio_sector() is based on ata_pio_sector()
from libata-core.c so kudos to Jeff.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] always allocate hwif->sg_table
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 19:08:34 +0000 (21:08 +0200)]
[ide] always allocate hwif->sg_table

Allocate hwif->sg_table in hwif_init() so it can also be used for PIO.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] pmac: use more ide_hwif_t fields
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 19:02:39 +0000 (21:02 +0200)]
[ide] pmac: use more ide_hwif_t fields

Use dmatable_dma, sg_table, sg_nents and sg_dma_direction fields
of ide_hwif_t and remove their equivalents from pmac_ide_hwif_t.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[PATCH] i2o: missing bits from merge
Andrew Morton [Wed, 20 Oct 2004 10:05:52 +0000 (03:05 -0700)]
[PATCH] i2o: missing bits from merge

A couple of functions got themselves lost.

cc: <Markus.Lidel@shadowconnect.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] v4l: missing bits
Andrew Morton [Wed, 20 Oct 2004 10:05:35 +0000 (03:05 -0700)]
[PATCH] v4l: missing bits

Missing parts of the v4l update

Cc: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
Linus Torvalds [Wed, 20 Oct 2004 10:04:34 +0000 (03:04 -0700)]
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[NET]: Uninline netif_rx_ni().
David S. Miller [Wed, 20 Oct 2004 09:57:53 +0000 (02:57 -0700)]
[NET]: Uninline netif_rx_ni().

It expands to a lot of code when SMP or PREEMPT is
enabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-rmk
Linus Torvalds [Wed, 20 Oct 2004 09:43:55 +0000 (02:43 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ARM] Add seqlocking to timers.
Russell King [Wed, 20 Oct 2004 21:34:23 +0000 (22:34 +0100)]
[ARM] Add seqlocking to timers.

Sometimes, it's useful to have locking.  Especially when we're
talking about time keeping.

It would appear that shemminger's patch of 5th February 2003
completely missed updating _ANY_ ARM timer implementations and,
because linux-arch didn't exist at the time, there appears to
have been no notification to any architecture developer that
maybe, just maybe, some work was required.

One wonders how many other changes are in the kernel which
architecture maintainers have missed.

21 years ago[ARM] Export find_{first,next}_bit_{l,b}e
Russell King [Wed, 20 Oct 2004 15:57:54 +0000 (16:57 +0100)]
[ARM] Export find_{first,next}_bit_{l,b}e

21 years ago[ARM] Cleanup some quirks.
Russell King [Wed, 20 Oct 2004 15:47:09 +0000 (16:47 +0100)]
[ARM] Cleanup some quirks.

- Ensure FIQs are enabled when cpu_idle() is called.
- Remove unused members of irq_cpustat_t.
- Remove unnecessary #ifndef CONFIG_SMP...#endif around irq_exit()
  macro.
- Rename __stf/__clf such that it stresses that they affect only
  local state (as per local_irq_xxx).
- Move THREAD_SIZE such that it can be used in current_thread_info()

21 years ago[SPARC64]: Update defconfig.
David S. Miller [Wed, 20 Oct 2004 09:38:33 +0000 (02:38 -0700)]
[SPARC64]: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IEEE1394]: ohci1394.c/pcylynx.c need asm/irq.h
David S. Miller [Wed, 20 Oct 2004 09:37:26 +0000 (02:37 -0700)]
[IEEE1394]: ohci1394.c/pcylynx.c need asm/irq.h

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[SPARC64]: Make iomap.o obj-y instead of lib-y for module exports.
David S. Miller [Wed, 20 Oct 2004 09:33:46 +0000 (02:33 -0700)]
[SPARC64]: Make iomap.o obj-y instead of lib-y for module exports.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[NET]: TSO requires SG, enforce this at device registry.
David S. Miller [Wed, 20 Oct 2004 09:16:33 +0000 (02:16 -0700)]
[NET]: TSO requires SG, enforce this at device registry.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IA64] fallback to swiotlb for consistent DMA mappings
Suresh B. Siddha [Wed, 20 Oct 2004 06:43:58 +0000 (06:43 +0000)]
[IA64] fallback to swiotlb for consistent DMA mappings

Patch supplied by Suresh Siddha

This is mainly needed for EM64T platforms and makes sense for ia64 too.
Need of this was broughtup sometime(long time?) back on lkml.
http://www.ussg.iu.edu/hypermail/linux/kernel/0406.3/0112.html

Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] Avoid a rare deadlock during unwind
Keith Owens [Wed, 20 Oct 2004 06:39:59 +0000 (06:39 +0000)]
[IA64] Avoid a rare deadlock during unwind

There is a rare deadlock condition during unwind script creation.  If
build_script() is interrupted in the middle of creating the script, it
holds the script write lock.  If the interrupt handler needs to call
unwind for some failure condition, unwind will try to read the
incomplete script and will deadlock on the script lock.

The fix is to disable interrupts while building the script, so
interrupt handlers never see partial scripts.

Promoting spin_lock_irqsave() from script_new() to find_save_locs()
changes the indentation, so the patch looks bigger than it really is.

Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] uninitialised flags element could cause crashes
Tony Luck [Wed, 20 Oct 2004 06:37:21 +0000 (06:37 +0000)]
[IA64] uninitialised flags element could cause crashes

window is not zeroed, so the flags should be assigned, not modified.
This can lead to crashes at boot if the IO and Memory resources overlap.

Patch supplied by Matthew Wilcox

Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] Add missing prototypes to kill warnings in sys_ia32.c
Arun Sharma [Wed, 20 Oct 2004 06:32:04 +0000 (06:32 +0000)]
[IA64] Add missing prototypes to kill warnings in sys_ia32.c

Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] Allow -mtune=merced for gcc 3.4
Tony Luck [Wed, 20 Oct 2004 06:24:38 +0000 (06:24 +0000)]
[IA64] Allow -mtune=merced for gcc 3.4

Patch submitted by H. J. Lu

  Gcc 3.4.2 fixed ia64 -mtune=merced regressions on Linux 2.6 kernel:

  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16278

  I have been using this patch for several months now.

Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years agoMerge bk://kernel.bkbits.net/davem/sparc-2.6
Linus Torvalds [Wed, 20 Oct 2004 03:02:44 +0000 (20:02 -0700)]
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Wed, 20 Oct 2004 03:00:37 +0000 (20:00 -0700)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PATCH] typhoon build fix
Andrew Morton [Wed, 20 Oct 2004 01:46:19 +0000 (18:46 -0700)]
[PATCH] typhoon build fix

Fix incorrect attempt to doubly-initialise the ethtool ops.

Cc: <jgarzik@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] doc: scsihosts parameter no longer exists
Phil Oester [Wed, 20 Oct 2004 01:46:04 +0000 (18:46 -0700)]
[PATCH] doc: scsihosts parameter no longer exists

The scsihosts boot parameter was removed in 2.5.73, but references to it
still exist in docs.  Cleanup below.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ext3 directio block leak fix
Stephen C. Tweedie [Wed, 20 Oct 2004 01:45:49 +0000 (18:45 -0700)]
[PATCH] ext3 directio block leak fix

The orphan list holds inodes that need to be truncated on recovery.  In the
O_DIRECT case, it's used if we extend the inode --- the truncate on recovery
means we'll recover the newly-allocated disk blocks if we crash after the IO
starts but before i_size is updated on disk.

Now, the orphan list is *also* used to delete inodes that are unlinked but
still-open.  Those get truncated but also deleted on recovery.

The orphan list is held both in memory and on disk.  So the rules are that the
inode can't be reclaimed while on the orphan list.  There are only two cases
--- either the inode is actively being written(O_DIRECT) or truncated (in
which case the inode is by definition not going to be reused), or it's
unlinked but still open (again, non-reclaimable).

But in the case where you're truncating or write(O_DIRECT)ing a file that is
*ALSO* unlinked, there's a problem --- the final unlink would put the inode on
the orphan list, but the write/truncate would try to add/remove it.  End
result is that the inode disappears from the orphan list while it's still
unlinked-but-in-use.

That's just a leak-on-crash, it's not going to be detectable in normal use.
But it's still a bug, and the way we fix it is for direct-IO and truncate not
to do the ext3_orphan_del if the file is unlinked (ie.  i_nlink==0).

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: add the new lock manager callbacks to the documentation
William A. Adamson [Wed, 20 Oct 2004 01:45:34 +0000 (18:45 -0700)]
[PATCH] nfs4 lease: add the new lock manager callbacks to the documentation

Add the new lock manager callbacks to the documentation

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: export remove_lease
William A. Adamson [Wed, 20 Oct 2004 01:45:19 +0000 (18:45 -0700)]
[PATCH] nfs4 lease: export remove_lease

Export remove_lease(), an interface to time_out_leases() with an
fl_break_time in the past.  needed by nfsd

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: export setlease
William A. Adamson [Wed, 20 Oct 2004 01:45:03 +0000 (18:45 -0700)]
[PATCH] nfs4 lease: export setlease

Export setlease(), a direct interface to __setlease() used by nfsd

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: use the inode i_writecount
William A. Adamson [Wed, 20 Oct 2004 01:44:48 +0000 (18:44 -0700)]
[PATCH] nfs4 lease: use the inode i_writecount

Use the inode i_writecount to test for handing out a F_RDLCK lease.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: separate the lease processsing code
William A. Adamson [Wed, 20 Oct 2004 01:44:33 +0000 (18:44 -0700)]
[PATCH] nfs4 lease: separate the lease processsing code

nfsd will not have a file descriptor, nor an owner on the filp.  nfsd also
will not use signals.  Seperate the lease processsing coe from
fcntl_setlease() into a __setlease() call.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: move the f_delown processing
William A. Adamson [Wed, 20 Oct 2004 01:44:22 +0000 (18:44 -0700)]
[PATCH] nfs4 lease: move the f_delown processing

Move the f_delown processing from lease_modify() into a new default lock
manager fl_release_private callback.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] nfs4 lease: aeparate the lease initialization code
William A. Adamson [Wed, 20 Oct 2004 01:44:07 +0000 (18:44 -0700)]
[PATCH] nfs4 lease: aeparate the lease initialization code

Separate the lease initialization code from lease_alloc().  set the default
lock manager ops.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>