linux-2.6
18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 19 Nov 2005 23:21:51 +0000 (15:21 -0800)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

18 years agopowerpc: Fix bug in timebase synchronization on 32-bit SMP powermac
Paul Mackerras [Sat, 19 Nov 2005 10:24:55 +0000 (21:24 +1100)] 
powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac

We were using udelay in the loop on the primary cpu waiting for the
secondary cpu to take the timebase value.  Unfortunately now that
udelay uses the timebase, and the timebase is stopped at this point,
the udelay never terminated.  This fixes it by not using udelay, and
increases the number of loops before we time out to compensate.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[ARM] 3168/1: Update ARM signal delivery and masking
Daniel Jacobowitz [Sat, 19 Nov 2005 10:01:07 +0000 (10:01 +0000)] 
[ARM] 3168/1: Update ARM signal delivery and masking

Patch from Daniel Jacobowitz

After delivering a signal (creating its stack frame) we must check for
additional pending unblocked signals before returning to userspace.
Otherwise signals may be delayed past the next syscall or reschedule.

Once that was fixed it became obvious that the ARM signal mask manipulation
was broken.  It was a little bit broken before the recent SA_NODEFER
changes, and then very broken after them.  We must block the requested
signals before starting the handler or the same signal can be delivered
again before the handler even gets a chance to run.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agopowerpc: Merge spinlock.h
Paul Mackerras [Sat, 19 Nov 2005 09:50:46 +0000 (20:50 +1100)] 
powerpc: Merge spinlock.h

The result is mostly similar to the original ppc64 version but with
some adaptations for 32-bit compilation.

include/asm-ppc64 is now empty!

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel
Paul Mackerras [Sat, 19 Nov 2005 09:47:22 +0000 (20:47 +1100)] 
powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel

It's only used by arch/powerpc/kernel/ptrace{,32}.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Merge pci.h
Paul Mackerras [Sat, 19 Nov 2005 09:46:04 +0000 (20:46 +1100)] 
powerpc: Merge pci.h

This involves some minor changes: a few unused functions that the
ppc32 pci.c provides are no longer declared here or exported;
pcibios_assign_all_busses now just refers to the pci_assign_all_buses
variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now
just 0 instead of a function that always returns 0 on 64-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
Paul Mackerras [Sat, 19 Nov 2005 09:17:32 +0000 (20:17 +1100)] 
powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc

For these, I have just done the lame-o merge where the file ends up
looking like:

#ifndef CONFIG_PPC64
#include <asm-ppc/foo.h>
#else
... contents from asm-ppc64/foo.h
#endif

so nothing has changed, really, except that we reduce include/asm-ppc64
a bit more.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: Remove imalloc.h
David Gibson [Wed, 16 Nov 2005 04:43:48 +0000 (15:43 +1100)] 
[PATCH] powerpc: Remove imalloc.h

asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm.
We already have a header for mm local definitions,
arch/powerpc/mm/mmu_decl.h.  Thus, this patch moves the contents of
imalloc.h into mmu_decl.h.  The only exception are the definitions of
PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END.  Those are moved into
pgtable.h, next to similar definitions of VMALLOC_START and
VMALLOC_SIZE.

Built for multiplatform 32bit and 64bit (ARCH=powerpc).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr
Paul Mackerras [Sat, 19 Nov 2005 03:25:23 +0000 (14:25 +1100)] 
Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr

18 years ago[PATCH] powerpc: Fix setting MPIC priority
Benjamin Herrenschmidt [Fri, 18 Nov 2005 06:18:15 +0000 (17:18 +1100)] 
[PATCH] powerpc: Fix setting MPIC priority

Trying to set the priority would just disable the interrupt due to an
incorrect mask used. We rarely use that call, in fact, I think only in
the powermac code for the cmd-power key combo that triggers xmon. So it
got unnoticed for a while.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Fri, 18 Nov 2005 23:58:38 +0000 (15:58 -0800)] 
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

18 years ago[COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR().
David S. Miller [Fri, 18 Nov 2005 22:50:20 +0000 (14:50 -0800)] 
[COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR().

Noticed by Helge Deller.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Fri, 18 Nov 2005 22:33:03 +0000 (14:33 -0800)] 
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

18 years agoMerge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Fri, 18 Nov 2005 22:25:40 +0000 (14:25 -0800)] 
Merge branch 'parisc' of /linux/kernel/git/kyle/parisc-2.6

18 years agoIB/umad: make sure write()s have sufficient data
Roland Dreier [Fri, 18 Nov 2005 22:18:26 +0000 (14:18 -0800)] 
IB/umad: make sure write()s have sufficient data

Make sure that userspace passes in enough data when sending a MAD.  We
always copy at least sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR
bytes from userspace, so anything less is definitely invalid.  Also,
if the length is less than this limit, it's possible for the second
copy_from_user() to get a negative length and trigger a BUG().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years ago[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU
James Bottomley [Fri, 18 Nov 2005 22:13:33 +0000 (23:13 +0100)] 
[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU

The following patch fixes a crash caused by attempting to bounce buffer
when an IDE CD-ROM is used on a machine with an IO-MMU. [At least, this
patch fixes things so I can use my IDE CD-ROM behind an ns87415 on a
HP PA-RISC workstation.]

Signed-off-by: James Bottomley <jejb@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] ide: make comment match reality
Ralf Baechle [Fri, 18 Nov 2005 22:11:24 +0000 (23:11 +0100)] 
[PATCH] ide: make comment match reality

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years agoIB/mthca: Safer max_send_sge/max_recv_sge calculation
Michael S. Tsirkin [Fri, 18 Nov 2005 22:11:17 +0000 (14:11 -0800)] 
IB/mthca: Safer max_send_sge/max_recv_sge calculation

Calculation of QP capabilities still isn't exactly right in mthca:
max_send_sge/max_recv_sge fields returned in create_qp can exceed the
handware supported limits.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years ago[PATCH] cs5520: fix return value of cs5520_init_one()
Amit Gud [Fri, 18 Nov 2005 22:03:19 +0000 (23:03 +0100)] 
[PATCH] cs5520: fix return value of cs5520_init_one()

From: Amit Gud <amitg@calsoftinc.com>

Patch follows from the suggestions by AC and Felipe W Damasio for fixing the
return codes from IDE drivers.

[ bart: fix coding style while at it ]

Signed-off-by: Amit Gud <gud@eth.net>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] siimage: docs urls
Jeff Garzik [Fri, 18 Nov 2005 21:55:47 +0000 (22:55 +0100)] 
[PATCH] siimage: docs urls

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] aec62xxx: remove all dead (#if0'd) code
Thibaut VARENE [Fri, 18 Nov 2005 21:51:48 +0000 (22:51 +0100)] 
[PATCH] aec62xxx: remove all dead (#if0'd) code

Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years agoMerge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Fri, 18 Nov 2005 21:49:44 +0000 (13:49 -0800)] 
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

18 years agoMerge branch 'master'
Kyle McMartin [Fri, 18 Nov 2005 21:39:20 +0000 (16:39 -0500)] 
Merge branch 'master'

18 years ago[PATCH] pmac IDE: don't release empty interfaces
Thibaut VARENE [Fri, 18 Nov 2005 21:37:37 +0000 (22:37 +0100)] 
[PATCH] pmac IDE: don't release empty interfaces

From: Thibaut VARENE <T-Bone@parisc-linux.org>

Cleaning up the hwif without knowing its previous state in pmac.c is a big
and potentially dangerous job, and there seems to be no generic code interface
that would provide either a way to properly release an hwif or to clean it up.

Fixes OOPS for empty PMAC interface and add-on PCI controller.

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] alim15x3: use KERN_WARNING
Alexey Dobriyan [Fri, 18 Nov 2005 21:22:21 +0000 (22:22 +0100)] 
[PATCH] alim15x3: use KERN_WARNING

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PARISC] Update CREDITS entries
Kyle McMartin [Fri, 18 Nov 2005 21:21:12 +0000 (16:21 -0500)] 
[PARISC] Update CREDITS entries

Update Randolph Chung's location, and add Thibaut Varene.

Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Thibaut Varene <varenet@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
18 years ago[PARISC] Mark hisax and pcbit ISDN drivers as not for parisc
Matthew Wilcox [Fri, 18 Nov 2005 21:20:10 +0000 (16:20 -0500)] 
[PARISC] Mark hisax and pcbit ISDN drivers as not for parisc

These drivers do not compile on big endian systems, and parisc
is big endian. Also mark some as broken on m68k as well.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
18 years ago[PATCH] alim15x3: replace pci_find_device() with pci_dev_present()
Hanna Linder [Fri, 18 Nov 2005 21:19:15 +0000 (22:19 +0100)] 
[PATCH] alim15x3: replace pci_find_device() with pci_dev_present()

From: Hanna Linder <hannal@us.ibm.com>

The dev returned from pci_find_device() was not used so it can be
replaced with pci_dev_present().  Compile tested.

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PARISC] Mention PA-RISC in NS87415 help
Matthew Wilcox [Fri, 18 Nov 2005 21:18:40 +0000 (16:18 -0500)] 
[PARISC] Mention PA-RISC in NS87415 help

Mention PA-RISC in NS87415 help. PA-RISC [BCJ]xxx0 workstations come with
NS87415 integrated for their CD-ROM drives.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
18 years ago[PARISC] Make Serial MUX depend on a specific bus type.
Matthew Wilcox [Fri, 18 Nov 2005 21:17:50 +0000 (16:17 -0500)] 
[PARISC] Make Serial MUX depend on a specific bus type.

Depend on GSC, not PARISC.  Machines without GSC don't have a MUX.

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
18 years ago[PARISC] Fix compile warning caused by conflicting types of expand_upwards()
Matthew Wilcox [Fri, 18 Nov 2005 21:16:42 +0000 (16:16 -0500)] 
[PARISC] Fix compile warning caused by conflicting types of expand_upwards()

Fix compile warning caused by conflicting types of expand_upwards. IA64
requires it to not be static inline, as it's used outside mm/mmap.c

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
18 years ago[PATCH] ide: remove ide_driver_t.owner field
Laurent Riffard [Fri, 18 Nov 2005 21:15:40 +0000 (22:15 +0100)] 
[PATCH] ide: remove ide_driver_t.owner field

The structure ide_driver_t have a .owner field which is a duplicate
of .gendriver.owner field (.gen_driver is a struct device_driver).

This patch removes ide_driver_t's owner field.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] via82cxxx IDE: support multiple controllers
Daniel Drake [Fri, 18 Nov 2005 21:09:45 +0000 (22:09 +0100)] 
[PATCH] via82cxxx IDE: support multiple controllers

Support multiple controllers in the via82cxxx IDE driver.
Cable detection and ISA bridge finding have been moved into
their own functions.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH] via82cxxx IDE: remove /proc/via entry
Daniel Drake [Fri, 18 Nov 2005 21:08:29 +0000 (22:08 +0100)] 
[PATCH] via82cxxx IDE: remove /proc/via entry

This entry adds needless complication to the driver as it requires the use of
global variables to be passed into via_get_info(), making things quite ugly
when we try and make this driver support multiple controllers simultaneously.

This patch removes /proc/via for simplicity.

On 10/13/05, Daniel Drake <dsd@gentoo.org> wrote:
> Per Bart's suggestion, I've created a user-space app which shows identical
> data (and doesn't even rely on the via82cxxx IDE driver).
>
> http://www.reactivated.net/software/viaideinfo/
>
> So, I think we should be clear to drop /proc/ide/via now.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
18 years ago[PATCH 3/3] cciss: add put_disk into cleanup routines
mikem [Fri, 18 Nov 2005 21:05:36 +0000 (22:05 +0100)] 
[PATCH 3/3] cciss: add put_disk into cleanup routines

Jeff Garzik pointed me to his code to see how to remove a disk from
the system _properly_. Well, here it is...
Every place we remove disks we are now testing before calling del_gendisk
or blk_cleanup_queue and then call put_disk.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH 2/3] cciss: bug fix for BIG_PASS_THRU
Jens Axboe [Fri, 18 Nov 2005 21:02:44 +0000 (22:02 +0100)] 
[PATCH 2/3] cciss: bug fix for BIG_PASS_THRU

Applications using CCISS_BIG_PASSTHRU complained that the data written
was zeros. The problem is that the buffer is being cleared after the
user copy, unless the user copy has failed... Correct that logic.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[PATCH 1/3] cciss: bug fix for hpacucli
mikem [Fri, 18 Nov 2005 21:00:17 +0000 (22:00 +0100)] 
[PATCH 1/3] cciss: bug fix for hpacucli

This patch fixes a bug that breaks hpacucli, a command line interface
for the HP Array Config Utility. Without this fix the utility will
not detect any controllers in the system. I thought I had already fixed
this, but I guess not.

Thanks to all who reported the issue. Please consider this this inclusion.

Signed-off-by: Mike Miller <mikem@beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years ago[BLOCK] new block/ directory comment tidy
Coywolf Qi Hunt [Wed, 16 Nov 2005 14:27:24 +0000 (15:27 +0100)] 
[BLOCK] new block/ directory comment tidy

Some leftover comments referring to drivers/block that are now block/.
They don't add any information we don't already have, so kill them.

Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
18 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 18 Nov 2005 20:23:07 +0000 (12:23 -0800)] 
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6

18 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 18 Nov 2005 20:19:12 +0000 (12:19 -0800)] 
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

18 years ago[wireless hermes] build fix
Jeff Garzik [Fri, 18 Nov 2005 20:06:59 +0000 (15:06 -0500)] 
[wireless hermes] build fix

18 years ago[libata sata_mv] update copyright, driver version
Jeff Garzik [Fri, 18 Nov 2005 19:04:23 +0000 (14:04 -0500)] 
[libata sata_mv] update copyright, driver version

18 years agoMerge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl
Jeff Garzik [Fri, 18 Nov 2005 18:57:44 +0000 (13:57 -0500)] 
Merge branch 'upstream-fixes' of git://git.tuxdriver.com/git/netdev-jwl

18 years ago[PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message
James Ketrenos [Sat, 12 Nov 2005 18:50:12 +0000 (12:50 -0600)] 
[PATCH] ipw2100: Fix 'Driver using old /proc/net/wireless...' message

ipw2100: Fix 'Driver using old /proc/net/wireless...' message

Wireless extensions moved the get_wireless_stats handler from being
in net_device into wireless_handler.

A prior instance of this patch resolved the issue for the ipw2200.
This one fixes it for the ipw2100.

Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
John W. Linville [Mon, 7 Nov 2005 18:24:59 +0000 (13:24 -0500)] 
[PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx

Change CONFIG_FEC_8XX to depend on CONFIG_8xx instead of CONFIG_FEC.
CONFIG_FEC depends on ColdFire CPUs, which does not apply for the
PPC 8xx processors.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] update Documentation/00-INDEX
Greg Kroah-Hartman [Fri, 18 Nov 2005 17:31:15 +0000 (09:31 -0800)] 
[PATCH] update Documentation/00-INDEX

Update the index file with descriptions of the stable_api_nonsense.txt
and stable_kernel_rules.txt files.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Add HOWTO do kernel development document to the Documentation directory
Greg Kroah-Hartman [Fri, 18 Nov 2005 17:31:11 +0000 (09:31 -0800)] 
[PATCH] Add HOWTO do kernel development document to the Documentation directory

Here's a document that describes the process and procedures of how to do Linux
kernel development.  It has gone through a number of rounds of review on the
linux-kernel mailing list, and contains contributions and help from Paolo
Ciarrocchi, Randy Dunlap, Gerrit Huizenga, Pat Mochel, Hanna Linder, Kay
Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer, Kees Cook, Andrew Morton, Andi
Kleen, Vadim Lobanov, Jesper Juhl, Adrian Bunk, Keri Harris, Frans Pop, David
A. Wheeler, Junio Hamano, Michael Kerrisk, and Alex Shepard.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Add SCM info to MAINTAINERS
Jody McIntyre [Fri, 18 Nov 2005 17:31:06 +0000 (09:31 -0800)] 
[PATCH] Add SCM info to MAINTAINERS

Add tree information to MAINTAINERS file.

Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] git-netdev-all-ieee80211_get_payload-warning-fix
Andrew Morton [Wed, 9 Nov 2005 19:30:51 +0000 (11:30 -0800)] 
[PATCH] git-netdev-all-ieee80211_get_payload-warning-fix

include/net/ieee80211.h: In function `ieee80211_get_payload':
include/net/ieee80211.h:1046: warning: control reaches end of non-void function

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] drivers/net/wireless/hermes.c unsigned int comparision
Gabriel A. Devenyi [Sat, 12 Nov 2005 21:00:46 +0000 (16:00 -0500)] 
[PATCH] drivers/net/wireless/hermes.c unsigned int comparision

hermas_bap_pread,  hermes_bap_pwrite, and hermes_bap_pwrite_pad all have a parameter "len" that is declared unsigned,
but checked for a value less than zero. Auditing the callers, it is possible for len to be passed a negative value, so len should be an int.

Thanks to LinuxICC (http://linuxicc.sf.net)

Signed-off-by: Gabriel A. Devenyi <ace@staticwave.ca>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] prism54 : Remove extraneous udelay/register read
Roger While [Mon, 14 Nov 2005 10:50:46 +0000 (11:50 +0100)] 
[PATCH] prism54 : Remove extraneous udelay/register read

In isl_38xx.c
In routine isl38xx_trigger-device

Move unnecessary udelay/register read.
This is only required when hand-compiling the driver and
setting  VERBOSE > SHOW_ERROR_MESSAGES

Signed-off-by: Roger While <simrw@sim-basis.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] SAA9730: Add missing header bits.
Ralf Baechle [Mon, 14 Nov 2005 00:19:44 +0000 (00:19 +0000)] 
[PATCH] SAA9730: Add missing header bits.

This header file patch was missing from the recent SAA9730 patch.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] au1000_eth: Include <linux/config.h>
Ralf Baechle [Mon, 14 Nov 2005 00:16:29 +0000 (00:16 +0000)] 
[PATCH] au1000_eth: Include <linux/config.h>

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
The Au1000 ethernet driver references plenty of CONFIG_* symbols.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] IOC3: Replace obsolete PCI API
Ralf Baechle [Sun, 13 Nov 2005 10:13:05 +0000 (10:13 +0000)] 
[PATCH] IOC3: Replace obsolete PCI API

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] i82593.h: make header comment GPL-compatible
John W. Linville [Wed, 16 Nov 2005 21:09:53 +0000 (16:09 -0500)] 
[PATCH] i82593.h: make header comment GPL-compatible

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] e100: re-enable microcode with more useful defaults
Jesse Brandeburg [Mon, 14 Nov 2005 21:15:49 +0000 (13:15 -0800)] 
[PATCH] e100: re-enable microcode with more useful defaults

For the four versions of hardware that we (currently) support microcode
download on, the default configuration of our receive interrupt mitigation
microcode was too aggressive, and caused unnecessary delays when pinging,
and low(er) throughput on single connection latency sensitive performance
tests.

This code adds microcode support, and sets the defaults to more reasonable
settings. It also explains the functionality in the code in more detail.
Compile and load tested, shows expected behavior for slight delay of ping
packets (1-2ms) when ucode is loaded, and decent interrupt moderation for
small packets, while maintaining good throughput.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl
Jeff Garzik [Fri, 18 Nov 2005 18:24:33 +0000 (13:24 -0500)] 
Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl

18 years agoMerge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
Jeff Garzik [Fri, 18 Nov 2005 18:21:24 +0000 (13:21 -0500)] 
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

18 years ago[PATCH] sil24: make error_intr less verbose
Tejun Heo [Fri, 18 Nov 2005 05:22:03 +0000 (14:22 +0900)] 
[PATCH] sil24: make error_intr less verbose

sil24_error_intr logs all error interrupts.  ATAPI devices generates
many harmless errors which can be ignored and all serious ones are
reported via sense data by SCSI layer.  Don't log device errors from
ATAPI devices.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sil24: add ATAPI support
Tejun Heo [Fri, 18 Nov 2005 05:16:45 +0000 (14:16 +0900)] 
[PATCH] sil24: add ATAPI support

This patch implements ATAPI support for sil24 and bumps driver version
to 0.23.

Signed-off-by: Tejun Heo <htejun@gmail.com>
--

Jeff, it has been converted to use ->dev_config as pointed out.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sil24: use SRST for phy_reset
Tejun Heo [Fri, 18 Nov 2005 05:14:01 +0000 (14:14 +0900)] 
[PATCH] sil24: use SRST for phy_reset

There seems to be no way to obtain device signature from sil24 after
SATA phy reset and SRST is needed anyway for later port multiplier
suppport.  This patch converts sil24_phy_reset to use SRST instaed.

Signed-off-by: Tejun Heo <htejun@gmail.com>
--

Jeff, I didn't remove the 10ms sleep just to be on the safe side.  I
think we can live with 10ms sleep on SRST.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sil24: add sil24_restart_controller
Tejun Heo [Fri, 18 Nov 2005 05:09:05 +0000 (14:09 +0900)] 
[PATCH] sil24: add sil24_restart_controller

When an error condition is raised by device via D2H FIS or SDB.  sil24
controller should be restarted by setting PORT_CS_INIT and waiting
until PORT_CS_RDY is asserted instead of resetting the controller.
This patch implements sil24_restart_controller for those cases.  This
patch also makes sure that PORT_CS_RDY is asserted on
sil24_reset_controller completion.

Signed-off-by: Tejun Heo <htejun@gmail.com>
--

Jeff, delay is reduced to 1us and cnt increased to 10k.  My sil3124
turns on PORT_CS_RDY on the second iteration even without any delay.
I think 10k * 1us should be more than enough.

I tried to convert both restart and reset to use msleep's with work
queue, but if we do that, host_set lock should be released after
initiating restart or reset, leading to race condition among
reset/restart, other interrupts and timeout.  Implementing
synchronization among those in low-level driver doesn't seem right.
Well, reduced timeout should work for the time being.

Thanks.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] smc91x: fix bank mismatch
Russell King [Fri, 18 Nov 2005 17:57:55 +0000 (12:57 -0500)] 
[PATCH] smc91x: fix bank mismatch

The smc91x driver relies upon register bank 2 being selected whenever
the interrupt handler is called.  This isn't always so, especially if
we have a link change event during PHY configuration.

This results in register bank 0 being selected when the interrupt
handler is called, causing the wrong registers to be read for the
IRQ mask and status.  In turn, this causes us to spin with a
permanently asserted IRQ.

The patch ensures that smc_phy_configure always exits with register
bank 2 selected.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] smc91x: fix one source of spurious interrupts
Nicolas Pitre [Thu, 17 Nov 2005 19:02:48 +0000 (14:02 -0500)] 
[PATCH] smc91x: fix one source of spurious interrupts

Not only SMC_ACK_INT(IM_TX_EMPTY_INT) in in smc_hardware_send_pkt)
appears to be unnecessary (tested with an SMC91C94 and SMC91C111), but
it seems to trigger spurious interrupts on some machines as well.
Removed.

While at it, let's log any remaining spurious interrupts if any (and
clean usage of the max IRQ loop count value).

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 18 Nov 2005 17:27:05 +0000 (09:27 -0800)] 
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

18 years ago[PATCH] s390: fix class_device_create calls in 3270 the driver
Martin Schwidefsky [Fri, 18 Nov 2005 09:11:03 +0000 (01:11 -0800)] 
[PATCH] s390: fix class_device_create calls in 3270 the driver

Add the missing NULL argument to the class_device_create calls.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ppc64 need HPAGE_SHIFT when huge pages disabled
Andy Whitcroft [Fri, 18 Nov 2005 09:11:02 +0000 (01:11 -0800)] 
[PATCH] ppc64 need HPAGE_SHIFT when huge pages disabled

With the new powerpc architecture we don't seem to be able to disable huge
pages anymore.

    mm/built-in.o(.toc1+0xae0): undefined reference to `HPAGE_SHIFT'
    make: *** [.tmp_vmlinux1] Error 1

We seem to need to define HPAGE_SHIFT to something when HUGETLB_PAGE isn't
defined.  This patch defines it to PAGE_SHIFT when we have no support.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] md: fix is_mddev_idle calculation now that disk/sector accounting happens...
NeilBrown [Fri, 18 Nov 2005 09:11:01 +0000 (01:11 -0800)] 
[PATCH] md: fix is_mddev_idle calculation now that disk/sector accounting happens when request completes

md needs to monitor the rate of requests to its devices when doing
resync/recovery so that it can back-off when there is non-resync IO.  It
does this by comparing resync IO, which it counts, with total IO which is
taken from disk_stats.

disk_stats were recently changed to account sectors when a request
completes instead of when it is queued.  This upsets md's calculations.

We could do the sync_io accounting at the end of requests too, but that has
problems.  If an underlying device is an md array, the accounting will
still be done when the request is submitted.  This could be changed for
some raid levels, but it cannot be changed for raid0 or linear without
substantial code changes.

So instead, we increase the error that is_mddev_idle allows, up to the
maximum amount of resync IO that can be in flight at any time.  The
calculation is current fragile as each personality as different limits for
in-flight resync.  This should be fixed up.

For now, this simple patch fixes the problem.

Increasing the error margin decreases the sensitivity to non-resync IO.  To
partially compensate for this, the time to wait when non-resync IO is
detected is increased so that less steady IO is required to keep the resync
at bay.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] md: don't pass a NULL file* into ->prepare_write()
Neil Brown [Fri, 18 Nov 2005 09:10:59 +0000 (01:10 -0800)] 
[PATCH] md: don't pass a NULL file* into ->prepare_write()

Some filesystems go oops.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] tpm: remove PCI kconfig dependency
Kylene Jo Hall [Fri, 18 Nov 2005 09:10:59 +0000 (01:10 -0800)] 
[PATCH] tpm: remove PCI kconfig dependency

The driver dependencies on PCI have been removed.  This patch clears that
up in the Kconfig file

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] tpm: use ioread8 and iowrite8
Kylene Jo Hall [Fri, 18 Nov 2005 09:10:58 +0000 (01:10 -0800)] 
[PATCH] tpm: use ioread8 and iowrite8

Use ioread8 and iowrite8 as suggested.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] tpm: use flush_scheduled_work()
Kylene Jo Hall [Fri, 18 Nov 2005 09:10:57 +0000 (01:10 -0800)] 
[PATCH] tpm: use flush_scheduled_work()

Add the necessary flush_schedule_work calls when canceling the timer.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ppc32: add missing define for fs_enet Ethernet driver
Vitaly Bordug [Fri, 18 Nov 2005 09:10:55 +0000 (01:10 -0800)] 
[PATCH] ppc32: add missing define for fs_enet Ethernet driver

This adds the FCC_PSMR_RMII defenition, which is used in fs_enet to enable
RMII mode.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ipmi: missing NULL test for kthread
Matt Domsch [Fri, 18 Nov 2005 09:10:54 +0000 (01:10 -0800)] 
[PATCH] ipmi: missing NULL test for kthread

On IPMI systems with BT interfaces, we don't start the kernel thread, so
smi_info->thread is NULL.  Test for NULL when stopping the thread, because
kthread_stop() doesn't, and an oops ensues otherwise.

Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Acked-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] re-export clear_page_dirty_for_io()
Hans Reiser [Fri, 18 Nov 2005 09:10:53 +0000 (01:10 -0800)] 
[PATCH] re-export clear_page_dirty_for_io()

2.6.14 has this exported, and reiser4 (at least) uses it.  Put things back
the way they were.

Signed-off-by: Vladimir V. Saveliev <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] add success/failure indication to RCU torture test
Paul E. McKenney [Fri, 18 Nov 2005 09:10:50 +0000 (01:10 -0800)] 
[PATCH] add success/failure indication to RCU torture test

One issue with the RCU torture test is that the current error flagging can
be lost in dmesg.  This patch adds a "SUCCESS"/"FAILURE" string to the line
that flags the end of the test, where it can easily be seen with "dmesg |
tail" at the end of the test.  Also adds tests of architecture-specific
memory barriers -- or, more likely, of the RCU torture test itself.

Cc: <vatsa@in.ibm.com>
Signed-off-by: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix copy-paste bug in ohci-ppc-soc.c
Andrey Volkov [Fri, 18 Nov 2005 09:10:48 +0000 (01:10 -0800)] 
[PATCH] Fix copy-paste bug in ohci-ppc-soc.c

Fix copy-paste bug in ohci-ppc-soc.c(ohci_hcd_ppc_soc_drv_remove)

Signed-off-by: Andrey Volkov <avolkov@varma-el.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>
18 years agoFix ACPI processor power block initialization
Linus Torvalds [Fri, 18 Nov 2005 15:29:51 +0000 (07:29 -0800)] 
Fix ACPI processor power block initialization

Properly clear the memory, and set "pr->flags.power" only if a C2 or
deeper state is valid (to make the code match both the comment and
previous behaviour).

This fixes a boot-time lockup reported by Maneesh Soni when using
"maxcpus=1".

Acked-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Fri, 18 Nov 2005 15:22:51 +0000 (07:22 -0800)] 
Merge git://git./linux/kernel/git/paulus/powerpc-merge

18 years agopowerpc: merge dma-mapping.h
Stephen Rothwell [Fri, 18 Nov 2005 14:40:46 +0000 (01:40 +1100)] 
powerpc: merge dma-mapping.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
18 years agoppc32: move some dma routines
Stephen Rothwell [Fri, 18 Nov 2005 13:33:56 +0000 (00:33 +1100)] 
ppc32: move some dma routines

Every other architecture define dma_cache_{inv,wback,wback_inv}
in asm/io.h and doing so brings us closer to ppc64.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
18 years ago[ARM] Fix get_user when passed a const pointer
Russell King [Fri, 18 Nov 2005 14:22:03 +0000 (14:22 +0000)] 
[ARM] Fix get_user when passed a const pointer

Unfortunately, later gcc versions error out when our get_user is passed
a const pointer, since we write to a temporary variable declared as
typeof(*(p)) which propagates the const-ness.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agooffb: Fix compile error on ppc32 systems
Paul Mackerras [Fri, 18 Nov 2005 05:41:49 +0000 (16:41 +1100)] 
offb: Fix compile error on ppc32 systems

The code Ben H added needs <linux/pci.h> for things like pci_dev, etc.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Move defconfig over and remove remaining arch/ppc64 files
Paul Mackerras [Fri, 18 Nov 2005 05:39:08 +0000 (16:39 +1100)] 
powerpc: Move defconfig over and remove remaining arch/ppc64 files

make defconfig will now use arch/powerpc/configs/ppc64_defconfig
if running on a ppc64 system.  I need to add an
arch/powerpc/configs/ppc_defconfig sometime.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Fix a couple of compile warnings for 32-bit compiles
Paul Mackerras [Fri, 18 Nov 2005 04:54:12 +0000 (15:54 +1100)] 
powerpc: Fix a couple of compile warnings for 32-bit compiles

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: time-of-day fixes for 32-bit CHRP systems
Paul Mackerras [Fri, 18 Nov 2005 04:52:38 +0000 (15:52 +1100)] 
powerpc: time-of-day fixes for 32-bit CHRP systems

This makes 32-bit CHRP systems use the RTAS time-of-day routines if
available.  It fixes a bug in the RTAS time-of-day routines where they
were storing a 64-bit timebase value in an unsigned long by making
those variables u64.  Also, the direct-access time-of-day routines
had the wrong convention for the month and year in the struct rtc_time.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Fix compile error on pSeries arising from delay.h changes
Paul Mackerras [Fri, 18 Nov 2005 04:47:18 +0000 (15:47 +1100)] 
powerpc: Fix compile error on pSeries arising from delay.h changes

pseries_dedicated_idle() was using __get_tb which used to be defined
in asm/delay.h.  Change it to use get_tb from asm/time.h, which is
in fact exactly the same thing.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Move remaining .c files from arch/ppc64 to arch/powerpc
Paul Mackerras [Fri, 18 Nov 2005 04:43:34 +0000 (15:43 +1100)] 
powerpc: Move remaining .c files from arch/ppc64 to arch/powerpc

This also deletes the now-unused Makefiles under arch/ppc64.

Both of the files moved over could use some merging, but for now I
have moved them as-is and arranged for them to be used only in 64-bit
kernels.  For 32-bit kernels we still use arch/ppc/kernel/idle.c and
drivers/char/generic_nvram.c as before.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] Remove SPAN_OTHER_NODES config definition
Mike Kravetz [Tue, 15 Nov 2005 00:12:49 +0000 (16:12 -0800)] 
[PATCH] Remove SPAN_OTHER_NODES config definition

The config option SPAN_OTHER_NODES was created so that we could
make pSeries numa layouts work within the DISCONTIG memory model.
Now that DISCONTIG has been replaced by SPARSEMEM, we can eliminate
this option.

I'll be sending a separate patch to Andrew to remove the arch
independent code as pSeries was the only arch that needed this.

Signed-off-by: Mike Kravetz <kravetz@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: merge align.c
Benjamin Herrenschmidt [Fri, 18 Nov 2005 03:09:41 +0000 (14:09 +1100)] 
[PATCH] powerpc: merge align.c

This patch merges align.c, the result isn't quite what was in ppc64 nor
what was in ppc32 :) It should implement all the functionalities of both
though. Kumar, since you played with that in the past, I suppose you
have some test cases for verifying that it works properly before I dig
out the 601 machine ? :)

Since it's likely that I won't be able to test all scenario, code
inspection is much welcome.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: Fix delay functions for 601 processors
Paul Mackerras [Fri, 18 Nov 2005 02:44:17 +0000 (13:44 +1100)] 
powerpc: Fix delay functions for 601 processors

My earlier merge of delay.h introduced a timebase-based udelay for
32-bit machines but also broke the 601, which doesn't have the
timebase register.  This fixes it by using the 601's RTC register on
the 601, and also moves __delay() and udelay() to be out-of-line in
arch/powerpc/kernel/time.c.  These functions aren't really performance
critical, after all.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] ppc: Fix warnings related to seq_file
Kumar Gala [Thu, 17 Nov 2005 23:45:40 +0000 (17:45 -0600)] 
[PATCH] ppc: Fix warnings related to seq_file

When we moved things around in irq.h seq_file became an issue.  Fix
warnings related to its usage.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] ppc: Fix MPC83xx device table
Kumar Gala [Thu, 17 Nov 2005 23:05:02 +0000 (17:05 -0600)] 
[PATCH] ppc: Fix MPC83xx device table

The SVRs for MPC8343/E were incorrect and really the SVRs
for MPC8347/E.

Signed-off-by: David Updegraff <dave@cray.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: Maple: request I/O resource.
Segher Boessenkool [Thu, 17 Nov 2005 21:22:14 +0000 (22:22 +0100)] 
[PATCH] powerpc: Maple: request I/O resource.

Reserve the Maple RTC I/O resource.  Needed now we use genrtc.

Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] ppc boot: replace string labels with numbers
Olaf Hering [Thu, 17 Nov 2005 21:09:02 +0000 (22:09 +0100)] 
[PATCH] ppc boot: replace string labels with numbers

Replacing the string labels with numbers saves 117 bytes in the final zImage.
These local labels are not discared.

Signed-off-by: Olaf Hering <olh@suse.de>
 arch/powerpc/boot/crt0.S |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: Fix typo in topology.h
Michael Ellerman [Thu, 17 Nov 2005 09:34:35 +0000 (20:34 +1100)] 
[PATCH] powerpc: Fix typo in topology.h

The fix to topology.h (5cfccd7f132432dd4705444a44b51d12ef88a85f) seems to have
a typeo, struct sched_domain has an idle_idx member but not an idle_id
member. I assume this is the fix.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 18 Nov 2005 01:26:56 +0000 (17:26 -0800)] 
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 18 Nov 2005 01:26:26 +0000 (17:26 -0800)] 
Merge /pub/scm/linux/kernel/git/davem/net-2.6

18 years ago[PATCH] ppc: Fix warnings related to seq_file
Kumar Gala [Thu, 17 Nov 2005 23:45:40 +0000 (17:45 -0600)] 
[PATCH] ppc: Fix warnings related to seq_file

When we moved things around in irq.h seq_file became an issue.  Fix
warnings related to its usage.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[IPV6]: Fib dump really needs GFP_ATOMIC.
David S. Miller [Fri, 18 Nov 2005 00:52:51 +0000 (16:52 -0800)] 
[IPV6]: Fib dump really needs GFP_ATOMIC.

Revert: 8225ccbaf01b459cf1e462047a51b2851e756bc1

Based upon a report by Yan Zheng.

Signed-off-by: David S. Miller <davem@davemloft.net>