]> git.neil.brown.name Git - history.git/log
history.git
22 years ago[PATCH] scsi_ioctl reference counting
Jens Axboe [Thu, 7 Aug 2003 02:58:43 +0000 (19:58 -0700)]
[PATCH] scsi_ioctl reference counting

Now that we properly track queue references, that showed a bug in
scsi_ioctl.c, where it was dropping queues that it had never properly
gotten in the first place.

22 years ago[PATCH] Proper block queue reference counting
Jens Axboe [Wed, 6 Aug 2003 17:35:12 +0000 (10:35 -0700)]
[PATCH] Proper block queue reference counting

To be able to properly be able to keep references to block queues,
we make blk_init_queue() return the queue that it initialized, and
let it be independently allocated and then cleaned up on the last
reference.

I have grepped high and low, and there really shouldn't be any broken
uses of blk_init_queue() in the kernel drivers left.  The added bonus
being blk_init_queue() error checking is explicit now, most of the
drivers were broken in this regard (even IDE/SCSI).

No drivers have embedded request queue structures. Drivers that don't
use blk_init_queue() but blk_queue_make_request(), should allocate the
queue with blk_alloc_queue(gfp_mask). I've converted all of them to do
that, too. They can call blk_cleanup_queue() now too, using the define
blk_put_queue() is probably cleaner though.

22 years agoMerge bk://kernel.bkbits.net/davem/net-2.5
Linus Torvalds [Wed, 6 Aug 2003 16:11:07 +0000 (09:11 -0700)]
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[PATCH] Fix bio RW_AHEAD test
Jens Axboe [Wed, 6 Aug 2003 15:58:02 +0000 (08:58 -0700)]
[PATCH] Fix bio RW_AHEAD test

This patch fixes the BIO_RW_AHEAD being tested at the wrong end
in the bio layer.

22 years ago[PATCH] remove PF_READAHEAD
Andrew Morton [Wed, 6 Aug 2003 15:57:31 +0000 (08:57 -0700)]
[PATCH] remove PF_READAHEAD

The problem with PF_READAHEAD is that if someone does a non-GFP_ATOMIC memory
allocation we can enter page reclaim and then call writepage, while
PF_READAHEAD is set.  The block layer then drops writes or the wrong reads on
the floor.  It can cause data loss.

A fix is complex (well, intrusive).  Given that the readahead code is now
skipping the entire readahead attempt if the queue is congested, the setting
of PF_READAHEAD probably is not doing anything useful anyway, so simply
remove it.

22 years ago[PATCH] Athlon Machine Check fix
Dave Jones [Wed, 6 Aug 2003 15:57:23 +0000 (08:57 -0700)]
[PATCH] Athlon Machine Check fix

There seemed to be increase in Athlon users reporting MCEs in 2.6 that
they never saw in 2.4 and I didn't buy the "2.6 pushes hardware harder"
for a second given folks are running 2.4+preempt+O(1) etc patchkits
without problems.

So I did a mini-audit of the mcheck code.

How embarressing. Another fix that went into 2.4 that never made
it forward. Once I'm done with various Red Hat administrivia
I'll see if I can devote some time to going through the changesets
mailing list. I wonder just how many other really stupid bugs
like this got fixed and not brought forward.

22 years agoMerge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
David S. Miller [Wed, 6 Aug 2003 12:05:59 +0000 (05:05 -0700)]
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5

22 years agoMerge bk://cifs.bkbits.net/linux-2.5cifs
Linus Torvalds [Wed, 6 Aug 2003 11:13:22 +0000 (04:13 -0700)]
Merge bk://cifs.bkbits.net/linux-2.5cifs
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoMerge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
Linus Torvalds [Wed, 6 Aug 2003 10:14:05 +0000 (03:14 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[PCMCIA] Report subsystem vendor/device IDs
Russell King [Thu, 7 Aug 2003 01:14:38 +0000 (02:14 +0100)]
[PCMCIA] Report subsystem vendor/device IDs

In order to properly track down who needs to program the IRQ MUX
register, add the subsystem vendor and device IDs to the kernel
message indicating discovery of the cardbus bridge.

22 years ago[PCMCIA] Disable IRQ steering and don't change the IRQ MUX register.
Russell King [Thu, 7 Aug 2003 01:00:41 +0000 (02:00 +0100)]
[PCMCIA] Disable IRQ steering and don't change the IRQ MUX register.

The IRQ steering code operates too early at present, and actually
prevents us detecting ISA interrupts.

We should not touch the IRQ MUX register on TI bridges - only the
machine itself knows the right value for this.  The kernel doesn't
have the knowledge to know what function the cardbus controllers
multi-function pins have been assigned by the hardware manufacturer.

22 years ago[PCMCIA] Fix cardbus init failure paths.
Russell King [Thu, 7 Aug 2003 00:53:14 +0000 (01:53 +0100)]
[PCMCIA] Fix cardbus init failure paths.

Currently, yenta does not try to clean up after an error occurs while
initialising a cardbus socket.  This cset ensures that we release
resources.  We also claim the cardbus MMIO memory resource.

22 years ago[PCMCIA] Fix PnP Probing in i82365.c
Adam Belay [Wed, 6 Aug 2003 22:58:03 +0000 (23:58 +0100)]
[PCMCIA] Fix PnP Probing in i82365.c

pnp_x_valid returns 1 if valid.  Therefore we should be using
!pnp_port_valid.  Also cleans up some formatting issues.

22 years agoMerge nuts.ninka.net:/home/davem/src/BK/network-2.5
David S. Miller [Wed, 6 Aug 2003 10:08:51 +0000 (03:08 -0700)]
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5

22 years agoMerge http://linux-lksctp.bkbits.net/lksctp-2.5
David S. Miller [Wed, 6 Aug 2003 09:58:57 +0000 (02:58 -0700)]
Merge http://linux-lksctp.bkbits.net/lksctp-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5

22 years ago[NET] X.25 async net_device fixup
Stephen Hemminger [Wed, 6 Aug 2003 20:31:47 +0000 (06:31 +1000)]
[NET] X.25 async net_device fixup

Convert X.25 async driver to have dynamic net_device's.
This driver is a lot like SLIP so the code changes were similar.
        - Added similar locking to SLIP
        - replaced code that snooped for MTU changes with the
          net_device change mtu callback.
        - cleaned up the statistics by using the net_device_stats structure.

Patch is against 2.6.0-test2.

Not sure if anyone ever uses this.  I tested by bringing up an x.25 async
line using a modified version of slattach.

22 years ago[NET] Fix X.25 use after free.
Stephen Hemminger [Wed, 6 Aug 2003 20:31:11 +0000 (06:31 +1000)]
[NET] Fix X.25 use after free.

The conversion from cli/sti to locking in X.25 must not have been tested
on a real SMP with memory debugging enabled.  It OOPS right away if
I do:
        modprobe x25; ifconfig -a

The problem is that it dereferences the socket after it has already been
freed.  The fix for this is to make the call to sock_put, later in
x25_destroy_socket do the free.  Also, need a go to avoid references
in x25_release.

22 years ago[NET] Fix use after free in AX.25
Stephen Hemminger [Wed, 6 Aug 2003 20:30:30 +0000 (06:30 +1000)]
[NET] Fix use after free in AX.25

This patch is against 2.6.0-test2.  The problem is that the ax25_destroy_socket
function frees the socket buffer, but then ax25_release dereferences this causing
an OOPS.  To reproduce:
        modprobe ax25; ifconfig -a

Replaced sk_free with sock_put which will free if this is the last reference.

22 years ago[NET] Convert ROSE to seq_file
Stephen Hemminger [Wed, 6 Aug 2003 20:29:48 +0000 (06:29 +1000)]
[NET] Convert ROSE to seq_file

The existing ROSE /proc interface has no module owner, and doesn't check for
bounds overflow.  Easier to just convert it to the seq_file wrapper functions.

This patch is against 2.6.0-test2 (offsets assume earlier patch).

22 years ago[NET] Dynamically allocate net_device structures for ROSE
Stephen Hemminger [Wed, 6 Aug 2003 20:28:33 +0000 (06:28 +1000)]
[NET] Dynamically allocate net_device structures for ROSE

This patch changes the ROSE protocol to allocate an array of pointers and each network device
separately.  This sets up later change where network_device object's are released on last use
which may be after the module is unloaded.

The patch is against 2.6.0-test2 (though this code hasn't changed in a long time).

Allocation is done via alloc_netdev so the dev->priv area is already reserved and
doesn't need to be allocated separately.

22 years agoFix blocksize and allocation size mismatch
Steve French [Wed, 6 Aug 2003 05:45:39 +0000 (22:45 -0700)]
Fix blocksize and allocation size mismatch

22 years agoDon't try to signal already-zombied threads in zap_threads.
Linus Torvalds [Tue, 5 Aug 2003 17:54:03 +0000 (10:54 -0700)]
Don't try to signal already-zombied threads in zap_threads.

22 years ago[PATCH] fix spinlock deadlock in ptrace-reaping of detached thread
Roland McGrath [Tue, 5 Aug 2003 17:52:34 +0000 (10:52 -0700)]
[PATCH] fix spinlock deadlock in ptrace-reaping of detached thread

When a dead detached thread has been temporarily zombified because it's
ptraced and its tracer tries to reap it, it deadlocks on SMP.

Here's the fix.

22 years ago[PATCH] Fix the sunrpc cache/reader management properly.
Neil Brown [Tue, 5 Aug 2003 16:52:41 +0000 (09:52 -0700)]
[PATCH] Fix the sunrpc cache/reader management properly.

A recent patch changed the rpc/*/channel files to behave
differently depending on whether they were open for read or not.

This hadn't been tested thoroughly.  The cache_reader structure
that was now only allocated when opening for read, had a field that
was iused when writing.

This patch removes that field and takes a different approach to solving
the issue it addressed.

And it has been tested a bit better.

22 years ago[PATCH] spurious SIGCHLD from dying thread group leader
Roland McGrath [Tue, 5 Aug 2003 15:30:45 +0000 (08:30 -0700)]
[PATCH] spurious SIGCHLD from dying thread group leader

A dying initial thread (thread group leader) sends SIGCHLD when it exits,
but it ought to wait until all other threads exit as well.  The cases of
secondary threads exitting first were handled properly, but not this one.

This exit.c patch fixes that test case, and I think catches the other
potential bugs of this kind as well.  The signal.c change adds some bug
catchers, the second of which will trip on the test case in the absence
of the exit.c fix.

22 years ago[PATCH] PATCH intel ich5 irq router, pci ids
Jeff Garzik [Tue, 5 Aug 2003 14:47:32 +0000 (07:47 -0700)]
[PATCH] PATCH intel ich5 irq router, pci ids

22 years agoMerge bk://linux-pnp.bkbits.net/pnp-2.5
Linus Torvalds [Tue, 5 Aug 2003 14:40:03 +0000 (07:40 -0700)]
Merge bk://linux-pnp.bkbits.net/pnp-2.5
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[PNP] Increment Version Number
Adam Belay [Tue, 5 Aug 2003 21:22:55 +0000 (21:22 +0000)]
[PNP] Increment Version Number

22 years ago[PNP] Remove device naming based on id
Adam Belay [Tue, 5 Aug 2003 21:21:39 +0000 (21:21 +0000)]
[PNP] Remove device naming based on id

This patch removes the pnp name database code.  Most buses, including
pnp, will be using userspace to name devices in the near future.  Also
dev->name will be removed from the driver model soon.

22 years ago[PNPBIOS] Move low level code into a separate file
Adam Belay [Tue, 5 Aug 2003 20:34:05 +0000 (20:34 +0000)]
[PNPBIOS] Move low level code into a separate file

This patch moves the low level bios calls to a separate file,
"bioscalls.c".  It is a cleanup that will improve organization of the
pnpbios driver code.

22 years ago[SOUND] Remove __(dev)initdata from all pnp sound drivers
Adam Belay [Tue, 5 Aug 2003 20:18:25 +0000 (20:18 +0000)]
[SOUND] Remove __(dev)initdata from all pnp sound drivers

This patch is needed in order to avoid a potential oops.  It is
similiar to the changes made to pci.

22 years ago[PNPBIOS] Move Parsing Functions to the PnPBIOS driver
Adam Belay [Tue, 5 Aug 2003 20:15:00 +0000 (20:15 +0000)]
[PNPBIOS] Move Parsing Functions to the PnPBIOS driver

This patch moves the resource parsing functions from support.c to the
pnpbios driver.  Originally these functions were intended for other
pnp protocols but in reality they are only used by the PnPBIOS driver.
This patch greatly cleans up the code in both the parsing functions
and their connection with the pnpbios driver.  Also note that
pnpbios.h has been added for local pnpbios functions.

22 years ago[PNP] Remove protocol_data from pnp_dev and pnp_card
Adam Belay [Tue, 5 Aug 2003 14:36:01 +0000 (14:36 +0000)]
[PNP] Remove protocol_data from pnp_dev and pnp_card

This is not needed.

22 years ago [PNP] Handle unset resources properly
Adam Belay [Tue, 5 Aug 2003 14:29:11 +0000 (14:29 +0000)]
  [PNP] Handle unset resources properly

  This patch is similar to the disabled resource patch in that it
  avoids direct numeric comparisons with data in unset resource
  structures.

22 years agoFix vfsmnt leak: make autofs4 mount point expiry release
Linus Torvalds [Tue, 5 Aug 2003 08:58:59 +0000 (01:58 -0700)]
Fix vfsmnt leak: make autofs4 mount point expiry release
the entry that we got through the lookup_mnt().

Noted by Dick Streefland.

22 years agoMerge bk://bk.arm.linux.org.uk/linux-2.5-rmk
Linus Torvalds [Tue, 5 Aug 2003 07:11:44 +0000 (00:11 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[ARM] Add asm-arm/local.h
Russell King [Tue, 5 Aug 2003 23:02:32 +0000 (00:02 +0100)]
[ARM] Add asm-arm/local.h

22 years ago[ARM] Fix platform_add_devices() prototype
Russell King [Tue, 5 Aug 2003 22:44:58 +0000 (23:44 +0100)]
[ARM] Fix platform_add_devices() prototype

22 years ago[ARM] Fix two Acorn SCSI drivers
Russell King [Tue, 5 Aug 2003 22:22:57 +0000 (23:22 +0100)]
[ARM] Fix two Acorn SCSI drivers

ARXESCSI does not have the interrupt routed to the host
machine, so we need to babysit the host interface.  We
do this via a variant of the normal command function in
fas216.c

Fix a bug in the procfs file handling in the EESOX SCSI
driver.

22 years ago[ARM] Remove more static register accesses from sa1111.c
Russell King [Tue, 5 Aug 2003 21:39:43 +0000 (22:39 +0100)]
[ARM] Remove more static register accesses from sa1111.c

Use the ioremapped region for accesses to SA1111 IRQ
controller registers.

22 years ago[ARM] Update machine types file.
Russell King [Tue, 5 Aug 2003 21:27:31 +0000 (22:27 +0100)]
[ARM] Update machine types file.

22 years ago[ARM] Fix SSP IRQ handler return type.
Russell King [Tue, 5 Aug 2003 21:20:43 +0000 (22:20 +0100)]
[ARM] Fix SSP IRQ handler return type.

22 years ago[ARM] Remove unused get_hackkit_scr prototype
Russell King [Tue, 5 Aug 2003 21:16:48 +0000 (22:16 +0100)]
[ARM] Remove unused get_hackkit_scr prototype

22 years ago[PATCH] nfsv4 page boundary handling fixes.
Neil Brown [Tue, 5 Aug 2003 06:21:13 +0000 (23:21 -0700)]
[PATCH] nfsv4 page boundary handling fixes.

From: Galen Michael Elias <gme@citi.umich.edu>

  This patch fixes two places where the handling of page boundaries was
incorrect and caused to IO_ERR's when it shouldn't have.

1.  In decode_write it was just a small typo.
2.  In decode_compound we avoid using READ_BUF, but don't provide all of
it's functionality, specifically crosses a page boundary.

22 years ago[PATCH] Create a mountpoint for the nfsd filesystem.
Neil Brown [Tue, 5 Aug 2003 06:20:40 +0000 (23:20 -0700)]
[PATCH] Create a mountpoint for the nfsd filesystem.

Though the nfsd module can create this, having it always
there makes auto-loading-on-mount work better.

Note: it was previously recommended that the nfsd filesystem be mounted
on /proc/fs/nfs, which I was never comfortable with.
Henceforth the recommended location will be /proc/fs/nfsd.
nfs-utils 1.0.6 and later will support both.

22 years ago[PATCH] Change atomic_inc to cache_get twice.
Neil Brown [Tue, 5 Aug 2003 06:20:16 +0000 (23:20 -0700)]
[PATCH] Change atomic_inc to cache_get twice.

22 years ago[PATCH] Protect against NFS requests to create symlinks bigger than one page
Neil Brown [Tue, 5 Aug 2003 06:19:58 +0000 (23:19 -0700)]
[PATCH] Protect against NFS requests to create symlinks bigger than one page

Such a request would cause the nul terminator to be written
to some other page, and cause havoc.

Also rearrange two tests to avoid the possibility of testing the byte
just past the end of a buffer - doing so can causes an oops with appropriate
kernel-debug config options

22 years ago[PATCH] Remove some unused export flags and reserve a new one.
Neil Brown [Tue, 5 Aug 2003 06:19:41 +0000 (23:19 -0700)]
[PATCH] Remove some unused export flags and reserve a new one.

The 'acl' folks would like an export flag, so this patch
reserves one and also discards some that aren't used and never
will be (for the named purpose).

22 years ago[PATCH] Change NFSEXP_CROSSMNT to NFSEXP_CROSSMOUNT
Neil Brown [Tue, 5 Aug 2003 06:19:29 +0000 (23:19 -0700)]
[PATCH] Change NFSEXP_CROSSMNT to NFSEXP_CROSSMOUNT

NFSEXP_CROSSMNT used to mean something different, so
using a different name reduces the chance of confusion.
Also there is currently a surplus of vowels, so there is
no need to be frugal

22 years ago[PATCH] Make sure sunrpc/cache doesn't confuse writers with readers.
Neil Brown [Tue, 5 Aug 2003 06:19:20 +0000 (23:19 -0700)]
[PATCH] Make sure sunrpc/cache doesn't confuse writers with readers.

When a sunrpc/cache channel is not open for reading, the
cache doesn't bother making and waiting for up-calls.

However it doesn't currently distingish between open-for-read/write
and open-for-write, so an op-for-write will look like a reader
and will cause inappropriate waiting.

This patch checks if a file is open-for-read and will only register
a file as a reader if it really is one.

22 years agoMerge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
Linus Torvalds [Tue, 5 Aug 2003 04:58:33 +0000 (21:58 -0700)]
Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[power] Remove unused function reset_videobios_after_s3().
Patrick Mochel [Tue, 5 Aug 2003 04:36:49 +0000 (21:36 -0700)]
[power] Remove unused function reset_videobios_after_s3().

Resided in arch/i386/kernel/dmi_scan.c and was not used by any of the
blacklist functions. If it turns out to required, we can add it back later.

22 years ago[power] Fix up compiler warnings.
Patrick Mochel [Tue, 5 Aug 2003 04:29:59 +0000 (21:29 -0700)]
[power] Fix up compiler warnings.

22 years agoMerge bk://kernel.bkbits.net//home/mochel/linux-2.5-power/
Linus Torvalds [Tue, 5 Aug 2003 04:06:09 +0000 (21:06 -0700)]
Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power/
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago"kernel_locked()" needs <linux/smp_lock.h>.
Linus Torvalds [Tue, 5 Aug 2003 03:36:56 +0000 (20:36 -0700)]
"kernel_locked()" needs <linux/smp_lock.h>.

So make sure to include it in <asm-i386/hardirq.h> when needed
(ie for the CONFIG_PREEMPT case).

22 years ago[PATCH] __initdata must not be marked const
Anton Blanchard [Tue, 5 Aug 2003 03:26:39 +0000 (20:26 -0700)]
[PATCH] __initdata must not be marked const

Fix up a few places where we marked __initdata as being const.

This causes a section conflict (init section vs .rodata)

22 years agoMerge http://linux-watchdog.bkbits.net/linux-2.5-watchdog
Linus Torvalds [Tue, 5 Aug 2003 03:15:07 +0000 (20:15 -0700)]
Merge http://linux-watchdog.bkbits.net/linux-2.5-watchdog
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoMake "static const" initializer to zero explicit, since truly
Linus Torvalds [Tue, 5 Aug 2003 03:13:37 +0000 (20:13 -0700)]
Make "static const" initializer to zero explicit, since truly
constant values should not end up in the BSS.

We're better off having the compiler put it in the .rodata
section (which it will, thanks to the initializer and the
"const"), since that will result in it being nicely cacheable
in shared SMP caches.

22 years agoFix up ieee1394 compile
Linus Torvalds [Tue, 5 Aug 2003 03:11:04 +0000 (20:11 -0700)]
Fix up ieee1394 compile

22 years ago[power] Fix compilation when CONFIG_PM=n
Patrick Mochel [Tue, 5 Aug 2003 02:53:03 +0000 (19:53 -0700)]
[power] Fix compilation when CONFIG_PM=n

22 years agoMerge http://linux.bkbits.net/linux-2.5
Wim Van Sebroeck [Tue, 5 Aug 2003 02:47:29 +0000 (19:47 -0700)]
Merge http://linux.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/repos/l/linux-watchdog/linux-2.5-watchdog

22 years ago[WATCHDOG] advantechwdt patches
Wim Van Sebroeck [Tue, 5 Aug 2003 20:38:46 +0000 (22:38 +0200)]
[WATCHDOG] advantechwdt patches

use module_param, removed __setup code,
general cleanup (mostly of comments and trailing spaces, also removed include of config.h),
made the watchdog's timeout a module_param.

22 years agoMerge bk://ppc.bkbits.net/for-linus-ppc
Linus Torvalds [Tue, 5 Aug 2003 02:24:10 +0000 (19:24 -0700)]
Merge bk://ppc.bkbits.net/for-linus-ppc
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoMerge samba.org:/home/paulus/kernel/linux-2.5
Paul Mackerras [Wed, 6 Aug 2003 02:26:05 +0000 (12:26 +1000)]
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc

22 years agoPPC32: Fix the help message for the SANDPOINT config option.
Paul Mackerras [Tue, 5 Aug 2003 19:11:07 +0000 (05:11 +1000)]
PPC32: Fix the help message for the SANDPOINT config option.

22 years agoMerge samba.org:/home/paulus/kernel/linux-2.5
Paul Mackerras [Tue, 5 Aug 2003 17:40:29 +0000 (03:40 +1000)]
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc

22 years agoMerge http://ppc.bkbits.net/for-linus-ppc64
Linus Torvalds [Tue, 5 Aug 2003 02:22:49 +0000 (19:22 -0700)]
Merge http://ppc.bkbits.net/for-linus-ppc64
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoMerge samba.org:/scratch/anton/linux-2.5
Anton Blanchard [Wed, 6 Aug 2003 03:33:52 +0000 (13:33 +1000)]
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3

22 years agoMerge samba.org:/scratch/anton/linux-2.5
Anton Blanchard [Tue, 5 Aug 2003 19:33:18 +0000 (05:33 +1000)]
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3

22 years agoMerge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
Patrick Mochel [Tue, 5 Aug 2003 02:19:20 +0000 (19:19 -0700)]
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-power

22 years agoMerge bk://kernel.bkbits.net/davem/sparc-2.5
Linus Torvalds [Tue, 5 Aug 2003 02:17:20 +0000 (19:17 -0700)]
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoppc64: Reserve 8042 IO space on machines with no keyboard
Anton Blanchard [Tue, 5 Aug 2003 00:39:11 +0000 (10:39 +1000)]
ppc64: Reserve 8042 IO space on machines with no keyboard

22 years agoPPC32: Make strncpy clear the unused part of the destination.
Paul Mackerras [Tue, 5 Aug 2003 00:32:20 +0000 (10:32 +1000)]
PPC32: Make strncpy clear the unused part of the destination.

22 years agoMerge samba.org:/scratch/anton/linux-2.5
Anton Blanchard [Tue, 5 Aug 2003 00:08:06 +0000 (10:08 +1000)]
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3

22 years agoPPC32: Fix compilation when CPU_FREQ is defined.
Paul Mackerras [Tue, 5 Aug 2003 00:05:23 +0000 (10:05 +1000)]
PPC32: Fix compilation when CPU_FREQ is defined.

22 years agoPPC32: Compile fix for arch/ppc/kernel/setup.c
Paul Mackerras [Tue, 5 Aug 2003 00:01:15 +0000 (10:01 +1000)]
PPC32: Compile fix for arch/ppc/kernel/setup.c

22 years agoMerge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
Linus Torvalds [Mon, 4 Aug 2003 16:15:05 +0000 (09:15 -0700)]
Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power
into home.osdl.org:/home/torvalds/v2.5/linux

22 years agoMerge nuts.ninka.net:/home/davem/src/BK/network-2.5
David S. Miller [Mon, 4 Aug 2003 12:16:27 +0000 (05:16 -0700)]
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5

22 years agoMerge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
David S. Miller [Mon, 4 Aug 2003 12:14:25 +0000 (05:14 -0700)]
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

22 years ago[ATM]: Minor LANAI fixes from mitch@sfgoth.com.
Chas Williams [Mon, 4 Aug 2003 10:49:39 +0000 (03:49 -0700)]
[ATM]: Minor LANAI fixes from mitch@sfgoth.com.

1. pci_device_id structures shouldn't be __devinitdata.  Greg removed
   all of the instances of this in the 2.6.0-test1 tree, but unforunately
   my recent coversion of lanai.c introduced another one.

2. The lanai PCI id constants have now been merged into the kernel headers
   so we don't need to define our own copies.

3. The ioctl's exported by lanai shouldn't be - they were intended for
   debugging only, never for release.  For now they're just '#if 0'ed out.
   They're somewhat dangerous since they don't check any capabilities so
   any user could DoS the interface.

22 years ago[power] Make sure ACPI prepares a console during S3.
Patrick Mochel [Mon, 4 Aug 2003 10:39:28 +0000 (03:39 -0700)]
[power] Make sure ACPI prepares a console during S3.

Orginally from Pavel Machek.

22 years ago[power] Divorce suspend console code from swsusp.
Patrick Mochel [Mon, 4 Aug 2003 10:35:30 +0000 (03:35 -0700)]
[power] Divorce suspend console code from swsusp.

- Create kernel/power/console.c
- Rename prepare_suspend_console() to pm_prepare_console() and
  restore_console() to pm_restore_console().
- Add prototypes to include/linux/suspend.h.
- Make kernel/power/console.o dependent only on CONFIG_PM
- Simplify logic for SUSPEND_CONSOLE define
- Make software_resume() prepare console much earlier, so we can localize
  the loglevel variables in console.c.
- Remove #ifdef CONFIG_VT from console.c, and just check for SUSPEND_CONSOLE.
  (Perhaps we should make entire file dependent on CONFIG_VT_CONSOLE?)
- Add kernel/power/power.h to share things across local files.

22 years ago[NET]: Trivial fix for 82596 driver.
Angelo Dell\'Aera [Mon, 4 Aug 2003 10:34:16 +0000 (03:34 -0700)]
[NET]: Trivial fix for 82596 driver.

22 years ago[power] Minor swsusp cleanups.
Patrick Mochel [Mon, 4 Aug 2003 10:14:08 +0000 (03:14 -0700)]
[power] Minor swsusp cleanups.

- Call blk_run_queues() from do_software_suspend() directly, instead of
  wrapping it in helper function.
- Get rid of ominous compiler warning.
- Change BUG_ON(in_interrupt()) to might_sleep() in software_suspend(), so
  we still get back trace, but don't actually BUG().

Orginally from Pavel Machek.

22 years ago[NET]: Convert lp486e over to dynamic allocation.
Stephen Hemminger [Mon, 4 Aug 2003 10:01:18 +0000 (03:01 -0700)]
[NET]: Convert lp486e over to dynamic allocation.

22 years ago[PATCH] Fix incorrect umem iounmap() call
Randy Dunlap [Mon, 4 Aug 2003 09:21:17 +0000 (02:21 -0700)]
[PATCH] Fix incorrect umem iounmap() call

From: Leann Ogasawara <ogasawara@osdl.org>

Acked by Neil Brown.

22 years agoMerge bk://bk.arm.linux.org.uk/linux-2.5-rmk
Linus Torvalds [Mon, 4 Aug 2003 09:20:15 +0000 (02:20 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[ARM] Remove old ARC and A5K machine class.
Russell King [Tue, 5 Aug 2003 00:45:56 +0000 (01:45 +0100)]
[ARM] Remove old ARC and A5K machine class.

The ARC and A5K machine class is handled by the arm26 architecture
now.  This cset removes the obsolete files from the 32-bit ARM
architecture.

22 years ago[ARM] Fix do_settimeofday()
Russell King [Tue, 5 Aug 2003 00:15:49 +0000 (01:15 +0100)]
[ARM] Fix do_settimeofday()

ARM seems to have missed an update for the time keeping code; this
cset fixes a problem where the altering the system time changes the
reported uptime.

22 years ago[ARM] Add generic sections.h for ARM.
Russell King [Tue, 5 Aug 2003 00:02:58 +0000 (01:02 +0100)]
[ARM] Add generic sections.h for ARM.

22 years ago[SCTP] Fix to avoid large kmalloc failures on 64-bit platforms.
Sridhar Samudrala [Mon, 4 Aug 2003 09:09:37 +0000 (02:09 -0700)]
[SCTP] Fix to avoid large kmalloc failures on 64-bit platforms.

When spinlock debugging is enabled, the size of assoc hash table and
port hash table for a fixed value of 4096 entries exceeds the size
of the largest possible kmalloc() on 64-bit platforms. This problem is
avoided by using page allocations similar to the methodology followed
for tcp hash table allocations.

22 years ago[power] Fix up refrigerator to work with ^Z-ed processes
Patrick Mochel [Mon, 4 Aug 2003 09:08:22 +0000 (02:08 -0700)]
[power] Fix up refrigerator to work with ^Z-ed processes

Originally from Pavel Machek:

schedule() added makes processes start at exactly that point, making
printouts nicer.

22 years agoMerge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
Linus Torvalds [Mon, 4 Aug 2003 09:06:53 +0000 (02:06 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.osdl.org:/home/torvalds/v2.5/linux

22 years ago[PCMCIA] don't call functions twice
Daniel Ritz [Mon, 4 Aug 2003 23:32:30 +0000 (00:32 +0100)]
[PCMCIA] don't call functions twice

this patches removes unneccessary calls to yenta_init()/ti_set_zv() in
ti1250_init() as the called ti113x_init() already does this..

22 years ago[power] Kill some unnessecary printk()s.
Patrick Mochel [Mon, 4 Aug 2003 08:49:17 +0000 (01:49 -0700)]
[power] Kill some unnessecary printk()s.

From Pavel Machek.

22 years ago[power] Move drivers/power/ to kernel/power/
Patrick Mochel [Mon, 4 Aug 2003 08:45:48 +0000 (01:45 -0700)]
[power] Move drivers/power/ to kernel/power/

22 years agoMerge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
Patrick Mochel [Mon, 4 Aug 2003 06:55:56 +0000 (23:55 -0700)]
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-power

22 years ago[PATCH] Fix 32/64-bit bug in ext3
Theodore Y. Ts'o [Mon, 4 Aug 2003 06:45:00 +0000 (23:45 -0700)]
[PATCH] Fix 32/64-bit bug in ext3

Fix 32/64-bit error in ext2_file_write; before, the top 32-bits of
the return value was getting chopped off.

22 years ago[PATCH] fix 64-bit architectures for the binprm change
Andrew Morton [Mon, 4 Aug 2003 05:42:10 +0000 (22:42 -0700)]
[PATCH] fix 64-bit architectures for the binprm change

Various 32-bit emulators need to fill in linux_binprm.interp

22 years agoDocument non-standard do_div() calling convention, since
Linus Torvalds [Mon, 4 Aug 2003 05:24:02 +0000 (22:24 -0700)]
Document non-standard do_div() calling convention, since
it does not work like a C function.

(Effectively, the first argument ends up being "passed-
by-reference" without the use of pointers)