15 years ago[PATCH] Fix copy-paste bug in ohci-ppc-soc.c
Andrey Volkov [Fri, 18 Nov 2005 09:10:48 +0000]
[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>

15 years agoFix ACPI processor power block initialization
Linus Torvalds [Fri, 18 Nov 2005 15:29:51 +0000]
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>

15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Fri, 18 Nov 2005 15:22:51 +0000]
Merge git://git./linux/kernel/git/paulus/powerpc-merge

15 years agooffb: Fix compile error on ppc32 systems
Paul Mackerras [Fri, 18 Nov 2005 05:41:49 +0000]
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>

15 years agopowerpc: Move defconfig over and remove remaining arch/ppc64 files
Paul Mackerras [Fri, 18 Nov 2005 05:39:08 +0000]
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>

15 years agopowerpc: Fix a couple of compile warnings for 32-bit compiles
Paul Mackerras [Fri, 18 Nov 2005 04:54:12 +0000]
powerpc: Fix a couple of compile warnings for 32-bit compiles

Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agopowerpc: time-of-day fixes for 32-bit CHRP systems
Paul Mackerras [Fri, 18 Nov 2005 04:52:38 +0000]
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>

15 years agopowerpc: Fix compile error on pSeries arising from delay.h changes
Paul Mackerras [Fri, 18 Nov 2005 04:47:18 +0000]
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>

15 years agopowerpc: Move remaining .c files from arch/ppc64 to arch/powerpc
Paul Mackerras [Fri, 18 Nov 2005 04:43:34 +0000]
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>

15 years ago[PATCH] Remove SPAN_OTHER_NODES config definition
Mike Kravetz [Tue, 15 Nov 2005 00:12:49 +0000]
[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>

15 years ago[PATCH] powerpc: merge align.c
Benjamin Herrenschmidt [Fri, 18 Nov 2005 03:09:41 +0000]
[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>

15 years agopowerpc: Fix delay functions for 601 processors
Paul Mackerras [Fri, 18 Nov 2005 02:44:17 +0000]
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>

15 years ago[PATCH] ppc: Fix warnings related to seq_file
Kumar Gala [Thu, 17 Nov 2005 23:45:40 +0000]
[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>

15 years ago[PATCH] ppc: Fix MPC83xx device table
Kumar Gala [Thu, 17 Nov 2005 23:05:02 +0000]
[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>

15 years ago[PATCH] powerpc: Maple: request I/O resource.
Segher Boessenkool [Thu, 17 Nov 2005 21:22:14 +0000]
[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>

15 years ago[PATCH] ppc boot: replace string labels with numbers
Olaf Hering [Thu, 17 Nov 2005 21:09:02 +0000]
[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>

15 years ago[PATCH] powerpc: Fix typo in topology.h
Michael Ellerman [Thu, 17 Nov 2005 09:34:35 +0000]
[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>

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 18 Nov 2005 01:26:56 +0000]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

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

15 years ago[PATCH] ppc: Fix warnings related to seq_file
Kumar Gala [Thu, 17 Nov 2005 23:45:40 +0000]
[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>

15 years ago[IPV6]: Fib dump really needs GFP_ATOMIC.
David S. Miller [Fri, 18 Nov 2005 00:52:51 +0000]
[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>

15 years ago[NET]: Sanitize NET_SCHED protection in /net/sched/Kconfig
Roman Zippel [Thu, 17 Nov 2005 23:22:39 +0000]
[NET]: Sanitize NET_SCHED protection in /net/sched/Kconfig

On Thu, 17 Nov 2005, David Gómez wrote:

> I found out that if i select NET_CLS_ROUTE4, save my changes and exit
> menuconfig, execute again make menuconfig and go to QoS options, then the new
> available options are visible. So menuconfig has some problem refreshing
> contents :?

No, they were there before too, but you have to go up one level to see
them.

It's better in 2.6.15-rc1-git5, but the menu structure is still a little
messed up, the patch below properly indents all menu entries.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[LLC]: Fix compiler warnings introduced by TX window scaling changes.
David S. Miller [Thu, 17 Nov 2005 23:17:42 +0000]
[LLC]: Fix compiler warnings introduced by TX window scaling changes.

Noticed by Olaf Hering.

The comparisons want a u8 here (the data type on the left-hand branch
is a u8 structure member, and the constant on the right-hand branch is
"~((u8) 128)"), but C turns it into an integer so we get:

net/llc/llc_c_ac.c: In function `llc_conn_ac_inc_npta_value':
net/llc/llc_c_ac.c:998: warning: comparison is always true due to limited range of data type
net/llc/llc_c_ac.c:999: warning: large integer implicitly truncated to unsigned type

Fix this up by explicitly recasting the right-hand branch constant
into a "u8" once more.

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

15 years ago[NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768
Harald Welte [Thu, 17 Nov 2005 23:06:47 +0000]
[NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768

Since we've converted the ftp/irc/tftp helpers to use the new
module_parm_array() some time ago, we ware accidentially using signed data
types - thus preventing those modules from being used on ports >= 32768.

This patch fixes it by using 'ushort' module parameters.

Thanks to Jan Nijs for reporting this bug.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[COMPAT]: Add ext3 ioctl translations.
David S. Miller [Thu, 17 Nov 2005 23:04:34 +0000]
[COMPAT]: Add ext3 ioctl translations.

So things like on-line resizing et al. work.

Based almost entirely upon a patch by Guido Günther <agx@sigxcpu.org>

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

15 years ago[TCP]: TCP highspeed build error
Stephen Hemminger [Thu, 17 Nov 2005 22:11:18 +0000]
[TCP]: TCP highspeed build error

There is a compile error that crept in with the last patch of
TCP patches.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[PATCH] VM: fix zone list restart in page allocatate
Jens Axboe [Thu, 17 Nov 2005 20:35:02 +0000]
[PATCH] VM: fix zone list restart in page allocatate

We must reassign z before looping through the zones kicking kswapd,
since it will be NULL if we hit an OOM condition and jump back to the
beginning again. 'z' is initially assigned before the restart: label. So
move the restart label up a little.

Signed-off-by: Jens Axboe <axboe@suse.de>

15 years ago[PATCH] USB: add the anydata usb-serial driver
Greg Kroah-Hartman [Thu, 17 Nov 2005 17:48:18 +0000]
[PATCH] USB: add the anydata usb-serial driver

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: delete the nokia_dku2 driver
Greg Kroah-Hartman [Thu, 17 Nov 2005 17:48:13 +0000]
[PATCH] USB: delete the nokia_dku2 driver

It was causing too many problems, and this is not the proper type of
driver for this device.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile
Greg Kroah-Hartman [Thu, 17 Nov 2005 17:48:09 +0000]
[PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile

This lets us remove a lot of code in the drivers that were all checking
the same thing.  It also found some bugs in a few of the drivers, which
has been fixed up.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: OHCI lh7a404 platform device conversion fixup
Richard Purdie [Thu, 17 Nov 2005 17:47:57 +0000]
[PATCH] USB: OHCI lh7a404 platform device conversion fixup

Fix an error in the OHCI lh7a404 driver after the platform device
conversion.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: Maxtor OneTouch button support for older drives
Antti Andreimann [Thu, 17 Nov 2005 17:47:53 +0000]
[PATCH] USB: Maxtor OneTouch button support for older drives

This small patch adds a device ID used by older Maxtor OneTouch drives
(the ones with blue face-plate instead of the fancy silver one used in
newer models). The button on those drives works well with the current
driver.

From: Antti Andreimann <Antti.Andreimann@mail.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] usb devio warning fix
Andrew Morton [Thu, 17 Nov 2005 17:47:49 +0000]
[PATCH] usb devio warning fix

drivers/usb/core/devio.c: In function `proc_ioctl_compat':
drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: fix race in kaweth disconnect
Herbert Xu [Thu, 17 Nov 2005 17:47:45 +0000]
[PATCH] USB: fix race in kaweth disconnect

this patch from Herbert Xu fixes a race by moving termination of
the URBs into close() exclusively.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver
Daniel Drake [Thu, 17 Nov 2005 17:48:01 +0000]
[PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver

Peter Favrholdt reported that his Kodak flash device was getting
detected as a CDROM, and he helped me track this down to the fact that
the device takes a long time (approx 440ms!) to reset.

This patch increases the delay to 500ms, which solves the problem.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: Adapt microtek driver to new scsi features
Oliver Neukum [Thu, 17 Nov 2005 17:47:41 +0000]
[PATCH] USB: Adapt microtek driver to new scsi features

the scsi layer now uses very short sg lists. This breaks the microtek
driver. Here is a patch fixes this and some other issues.

Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: pl2303: updates pl2303_update_line_status()
Luiz Fernando Capitulino [Thu, 17 Nov 2005 17:47:36 +0000]
[PATCH] USB: pl2303: updates pl2303_update_line_status()

Updates pl2303_update_line_status() to handle X75 and SX1 Siemens mobiles

Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: pl2303: adds new IDs.
Luiz Fernando Capitulino [Thu, 17 Nov 2005 17:47:32 +0000]
[PATCH] USB: pl2303: adds new IDs.

This patch adds two new Siemens mobiles IDs for the pl2303 driver.

Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: onetouch doesn't suspend yet
David Brownell [Thu, 17 Nov 2005 17:47:28 +0000]
[PATCH] USB: onetouch doesn't suspend yet

The onetouch support doesn't suspend correctly (leaves an interrupt
URB posted, instead of unlinking it) so for now just disable it
when PM is in the air.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: cp2101.c: Jablotron usb serial interface identification
Josef Balatka [Thu, 17 Nov 2005 17:47:24 +0000]
[PATCH] USB: cp2101.c: Jablotron usb serial interface identification

Jablotron usb serial interface identification

Signed-off-by: Josef Balatka <balatka@email.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: kill unneccessary usb-storage blacklist entries
Pavel Machek [Thu, 17 Nov 2005 17:47:11 +0000]
[PATCH] USB: kill unneccessary usb-storage blacklist entries

I actually have this device, and kernel reports blacklist entry is no
longer neccessary.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: usbdevfs_ioctl 32bit fix
Andrew Morton [Thu, 17 Nov 2005 17:47:02 +0000]
[PATCH] USB: usbdevfs_ioctl 32bit fix

drivers/usb/core/devio.c: In function `proc_ioctl_compat':
drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast

NFI if this is correct...

Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] usbfs: usbfs_dir_inode_operations cleanup
OGAWA Hirofumi [Thu, 17 Nov 2005 17:47:07 +0000]
[PATCH] usbfs: usbfs_dir_inode_operations cleanup

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: Delete leftovers from bluetty driver
Marcel Holtmann [Thu, 17 Nov 2005 17:46:39 +0000]
[PATCH] USB: Delete leftovers from bluetty driver

This patch deletes the bluetooth.txt help file of the bluetty driver and
hands over its major device nodes for character devices to the RFCOMM TTY
implementation of the Bluetooth subsystem.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: fix 'unused variable' warning
Dmitry Torokhov [Thu, 17 Nov 2005 17:46:44 +0000]
[PATCH] USB: fix 'unused variable' warning

USB: fix 'unused variable' warning

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: wacom tablet driver update
Ping Cheng [Thu, 17 Nov 2005 17:46:51 +0000]
[PATCH] USB: wacom tablet driver update

This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and
report Device IDs.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: add new wacom devices to usb hid-core list
Ping Cheng [Thu, 17 Nov 2005 17:46:33 +0000]
[PATCH] USB: add new wacom devices to usb hid-core list

This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB Serial: rename ChangeLog.old
Greg Kroah-Hartman [Thu, 17 Nov 2005 17:46:28 +0000]
[PATCH] USB Serial: rename ChangeLog.old

People are complaining about a .old file in the tree.  So rename
drivers/usb/serial/ChangeLog.old to ChangeLog.history.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] USB: fix build breakage in dummy_hcd.c
Greg Kroah-Hartman [Thu, 17 Nov 2005 17:46:24 +0000]
[PATCH] USB: fix build breakage in dummy_hcd.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Fix IXP4xx I2C driver build breakage
Deepak Saxena [Thu, 17 Nov 2005 19:09:53 +0000]
[PATCH] Fix IXP4xx I2C driver build breakage

Platform device conversion missed a couple of spots.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Thu, 17 Nov 2005 18:56:34 +0000]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

15 years agox86: Fix silly typo in recent <asm/signal.h> fixes
Linus Torvalds [Thu, 17 Nov 2005 18:04:31 +0000]
x86: Fix silly typo in recent <asm/signal.h> fixes

The second __const_sigaddset() should have been a sigdelset..  Compile
trouble noted by Greg K-H.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 17 Nov 2005 17:06:54 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

15 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 17 Nov 2005 16:45:42 +0000]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

15 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 17 Nov 2005 16:43:38 +0000]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

15 years ago[PATCH] x86: fix sigaddset() inline asm memory constraint
Constantine Gavrilov [Thu, 17 Nov 2005 09:40:43 +0000]
[PATCH] x86: fix sigaddset() inline asm memory constraint

Due to incomplete memory constraints, gcc would miscompile code with
sigaddset on i386 if sig arg was const.

A quote form Jakub to make the issue clear:

 "You need either
__asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc");
  or
__asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc");
  because the btsl instruction doesn't just set the memory to some
  value, but needs to read its previous content as well.  If you don't
  tell that fact to GCC, GCC is of course free to optimize as if the asm
  was just setting the value and not depended on the previous value."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] ipw2200: fix error log offset calculation
Zhu Yi [Thu, 17 Nov 2005 05:58:30 +0000]
[PATCH] ipw2200: fix error log offset calculation

This fixes a slab corruption issue in the ipw2200 driver: it essentially
multiplied the error log number _twice_ by the size of the error element
entry (once explicitly in the code, and once implicitly as part of the
regular pointer arithmetic).

Cc: Henrik Brix Andersen <brix@gentoo.org>
Cc: Bernard Blackham <bernard@blackham.com.au>
Cc: Zilvinas Valinskas <zilvinas@gemtek.lt>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
--

15 years ago[PATCH] ipw2200: disallow direct scanning when device is down
Pekka Enberg [Wed, 16 Nov 2005 19:55:05 +0000]
[PATCH] ipw2200: disallow direct scanning when device is down

The function ipw_request_direct_scan() should bail out when the device
is down.  This fixes a lockup caused by wpa_supplicant triggering
ipw_request_direct_scan() while the driver was in a middle of a reset
due to firmware errors.

Thanks to Zilvinas Valinskas for reporting the bug and helping me
debug it.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[MIPS] Update defconfigs
Ralf Baechle [Thu, 17 Nov 2005 16:23:58 +0000]
[MIPS] Update defconfigs

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] SEAD: More build fixes.
Ralf Baechle [Tue, 15 Nov 2005 16:10:01 +0000]
[MIPS] SEAD: More build fixes.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] TX3927: Try to glue the PCI code.
Ralf Baechle [Tue, 15 Nov 2005 13:55:06 +0000]
[MIPS] TX3927: Try to glue the PCI code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] SEAD: Delete seadint_init() prototype.
Ralf Baechle [Tue, 15 Nov 2005 13:25:59 +0000]
[MIPS] SEAD: Delete seadint_init() prototype.

There is no definition for seadint_init() and the unprotected prototype
breaks compilation of assembler files.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask.
Ralf Baechle [Tue, 15 Nov 2005 13:11:35 +0000]
[MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: Fix include wrapper symbol.
Ralf Baechle [Tue, 15 Nov 2005 13:05:26 +0000]
[MIPS] JMR3927: Fix include wrapper symbol.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: Fix compilation by including <linux/ds1742rtc.h>.
Ralf Baechle [Tue, 15 Nov 2005 13:01:50 +0000]
[MIPS] JMR3927: Fix compilation by including <linux/ds1742rtc.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path.
Ralf Baechle [Tue, 15 Nov 2005 12:19:46 +0000]
[MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.o
Ralf Baechle [Tue, 15 Nov 2005 12:17:42 +0000]
[MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.o

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[IDE] Add driver for Sibyte Swarm evaluation board
Ralf Baechle [Thu, 17 Nov 2005 16:23:50 +0000]
[IDE] Add driver for Sibyte Swarm evaluation board

This driver supports the IDE port on the Sibyte Swarm evaluation boards
and it's relatives for the BCM1250 family of systems on a chip.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

15 years ago[MIPS] Alchemy: Console output fixup
Pantelis Antoniou [Sun, 13 Nov 2005 21:27:46 +0000]
[MIPS] Alchemy: Console output fixup

This is needed to make console output appear with the new driver...

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] Fix documentation typos.
Arnaud Giersch [Sat, 12 Nov 2005 23:38:18 +0000]
[MIPS] Fix documentation typos.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] Add const qualifier to writes##bwlq.
Arnaud Giersch [Sat, 12 Nov 2005 23:38:18 +0000]
[MIPS] Add const qualifier to writes##bwlq.

Add const qualifier to parameter addr of writes##bwlq.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] IP32: Fix sparse warnings.
Arnaud Giersch [Sat, 12 Nov 2005 23:38:18 +0000]
[MIPS] IP32: Fix sparse warnings.

Add __iomem qualifier to crime and mace pointers.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] IP32 Fix and complete IP32 parport definitions
Arnaud Giersch [Sat, 12 Nov 2005 23:38:18 +0000]
[MIPS] IP32 Fix and complete IP32 parport definitions

Fix, complete, and indent IP32 parport definitions.
Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift).
Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] IP32: Export mace symbol.
Arnaud Giersch [Sat, 12 Nov 2005 23:38:18 +0000]
[MIPS] IP32: Export mace symbol.

Export mace symbol so that it can be used in modules.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: Fix syntax error.
Ralf Baechle [Fri, 11 Nov 2005 11:49:53 +0000]
[MIPS] JMR3927: Fix syntax error.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] JMR3927: Undo accidental rename.
Ralf Baechle [Fri, 11 Nov 2005 11:46:25 +0000]
[MIPS] JMR3927: Undo accidental rename.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] DDB5477: Fix unused variable warning.
Ralf Baechle [Fri, 11 Nov 2005 11:15:41 +0000]
[MIPS] DDB5477: Fix unused variable warning.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] IP32: No need to include <asm/io.h>.
Ralf Baechle [Thu, 17 Nov 2005 16:23:44 +0000]
[MIPS] IP32: No need to include <asm/io.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years agoAdd definitions for the Dallas DS1742 RTC / non-volatile memory.
Ralf Baechle [Thu, 17 Nov 2005 16:23:43 +0000]
Add definitions for the Dallas DS1742 RTC / non-volatile memory.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years agoAdd definitions for the Dallas DS17287 RTC.
Ralf Baechle [Thu, 17 Nov 2005 16:23:42 +0000]
Add definitions for the Dallas DS17287 RTC.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] Add missing arch defines for the Alchemy MTD driver.
Ralf Baechle [Thu, 17 Nov 2005 16:23:42 +0000]
[MIPS] Add missing arch defines for the Alchemy MTD driver.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years agoAdd GT64111 PCI ID back
Yoichi Yuasa [Thu, 10 Nov 2005 13:42:36 +0000]
Add GT64111 PCI ID back

Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] zs.c: Resurrect the deceased zs.c for now.
Maciej W. Rozycki [Mon, 13 Jun 2005 19:58:50 +0000]
[MIPS] zs.c: Resurrect the deceased zs.c for now.

Not that it's meant to be sustained for long, but from time to time it's
useful to have some console...

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal.
Ralf Baechle [Tue, 8 Nov 2005 22:36:48 +0000]
[MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal.

The 8250 serial driver now has the ability to deal with the differences
between the standard 8250 family of UARTs and their slightly strange
brother on Alchemy SOCs.  The loss of features is not considered an
issue.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[MIPS] Delete duplicate definitions of break codes.
Ralf Baechle [Tue, 8 Nov 2005 22:23:13 +0000]
[MIPS] Delete duplicate definitions of break codes.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

15 years ago[libata sata_mv] handle lack of hardware nIEN support
Jeff Garzik [Thu, 17 Nov 2005 10:44:44 +0000]
[libata sata_mv] handle lack of hardware nIEN support

Handle errata (it was unintentional on this h/w, whereas its intentional
on others) whereby the nIEN bit in Device Control is ignored, leading to
a situation where a hardware interrupt completes the qc before the
polling code has a chance to.

This will get fixed The Right Way(tm) once Albert Lee's irq-pio
branch is merged, as the more natural PIO method on this hardware is
interrupt-driven.

15 years ago[libata sata_mv] SATA probe, DMA boundary fixes
Jeff Garzik [Thu, 17 Nov 2005 15:59:48 +0000]
[libata sata_mv] SATA probe, DMA boundary fixes

- DMA boundary was being handled incorrectly.  Copied the code from
  ata_fill_sg(), since Marvell has the same DMA boundary needs.
  (we can't use ata_fill_sg directly since we have different hardware
   descriptors)
- cleaned up the SATA phy reset code, to deal with various errata

15 years ago[libata] add timeout to commands for which we call wait_completion()
Jeff Garzik [Thu, 17 Nov 2005 15:50:01 +0000]
[libata] add timeout to commands for which we call wait_completion()

15 years ago[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG
Patrick McHardy [Thu, 17 Nov 2005 07:14:19 +0000]
[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG

CC [M] net/netfilter/nf_conntrack_core.o
net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect':
net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function)
net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once
net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.)

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[PATCH] powerpc: Workaround for offb on 64 bits platforms
Benjamin Herrenschmidt [Thu, 17 Nov 2005 02:34:57 +0000]
[PATCH] powerpc: Workaround for offb on 64 bits platforms

This fixes a problem with offb not parsing addresses properly on 64 bits
machines, and thus crashing at boot.  The problem is worked around by
locating the matching PCI device and using the properly relocated PCI
base addresses instead of misparsing the Open Firmware properties.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] Avoid use of uninitialised spinlock in EEH.
David Woodhouse [Thu, 17 Nov 2005 00:44:03 +0000]
[PATCH] Avoid use of uninitialised spinlock in EEH.

If the kernel supports both G5 and pSeries, and CONFIG_EEH is enabled,
eeh_init() is (quite reasonably) never called when we boot on a G5. Yet
eeh_check_failure() still gets called. We should avoid doing that if
!eeh_subsystem_enabled.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years ago[PATCH] powerpc: Fix database regression due to scheduler changes
Nick Piggin [Wed, 16 Nov 2005 12:37:53 +0000]
[PATCH] powerpc: Fix database regression due to scheduler changes

PowerPC's NUMA domain doesn't currently set up some of the newer
sched-domains parameters.

Brian Twichell <tbrian@us.ibm.com> discovered and diagnosed a 1.5% OLTP
database regression on a 4 core POWER5 system that was due to the use of
NUMA scheduling on ppc64.

This patch applies some saneish values to the parameters, in line with
other architectures. This solves the regression.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

15 years agoMerge branch 'upstream-fixes'
Jeff Garzik [Thu, 17 Nov 2005 01:45:51 +0000]
Merge branch 'upstream-fixes'

15 years agoMerge branch 'master'
Jeff Garzik [Thu, 17 Nov 2005 01:45:40 +0000]
Merge branch 'master'

15 years ago[IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassembly
Yasuyuki Kozakai [Wed, 16 Nov 2005 20:55:37 +0000]
[IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassembly

Both of ipq and frag_queue have *next and **prev, and they can be replaced
with hlist. Thanks Arnaldo Carvalho de Melo for the suggestion.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years agoMerge branch 'upstream-fixes'
Jeff Garzik [Wed, 16 Nov 2005 20:12:58 +0000]
Merge branch 'upstream-fixes'

15 years ago[ARM] No need to include asm/proc-fns.h into asm/system.h
Russell King [Wed, 16 Nov 2005 18:36:49 +0000]
[ARM] No need to include asm/proc-fns.h into asm/system.h

In the old days when arm26/arm32 was combined into the same
architecture, proc-fns.h provided the xchg implementation for
arm26 CPUs.  Since we no longer combine these two, this include
is no longer required.  Remove it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] sa1111.c needs asm/sizes.h
Russell King [Wed, 16 Nov 2005 18:29:51 +0000]
[ARM] sa1111.c needs asm/sizes.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] Use unsigned long not u32 in atomic_cmpxchg
Russell King [Wed, 16 Nov 2005 18:03:10 +0000]
[ARM] Use unsigned long not u32 in atomic_cmpxchg

Since atomic.h does not include types.h, u32 may not be defined.
Since atomics are supposed to work on unsigned long quantities,
use unsigned long instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] Move zone adjustment for SA1111 on SA11x0 platforms
Russell King [Wed, 16 Nov 2005 17:38:40 +0000]
[ARM] Move zone adjustment for SA1111 on SA11x0 platforms

Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we
can't include asm/page.h into this file because then we have a circular
dependency.  Move the offending code to arch/arm/common/sa1111.c
instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>