]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
18 years agoARM: OMAP: Update H4 defconfig with keypad and Irda support enabled
Komal Shah [Sat, 25 Feb 2006 01:11:36 +0000 (17:11 -0800)]
ARM: OMAP: Update H4 defconfig with keypad and Irda support enabled

Update H4 defconfig with keypad and Irda support enabled

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years ago[PATCH] ARM: OMAP: Irda: Remove warning
Komal Shah [Sat, 25 Feb 2006 01:08:54 +0000 (17:08 -0800)]
[PATCH] ARM: OMAP: Irda: Remove warning

arch/arm/mach-omap1/board-h2.c:244: warning: 'h2_transceiver_mode'
defined but not used.

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years ago[PATCH] Fix next_timer_interrupt() for hrtimer
Tony Lindgren [Sat, 25 Feb 2006 00:46:47 +0000 (16:46 -0800)]
[PATCH] Fix next_timer_interrupt() for hrtimer

This patch adds support for hrtimer to next_timer_interrupt()
and fixes current breakage.

Function next_timer_interrupt() got broken with a recent patch
6ba1b91213e81aa92b5cf7539f7d2a94ff54947c as sys_nanosleep() was
moved to hrtimer. This broke things as next_timer_interrupt()
did not check hrtimer tree for next event.

Function next_timer_interrupt() is needed with dyntick
(CONFIG_NO_IDLE_HZ, VST) implementations, as the system can
be in idle when next hrtimer event was supposed to happen.
At least ARM and S390 currently use next_timer_interrupt().

Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years agoARM: OMAP: Turn on hrtimer sys_nanosleep again
Tony Lindgren [Sat, 25 Feb 2006 00:45:27 +0000 (16:45 -0800)]
ARM: OMAP: Turn on hrtimer sys_nanosleep again

The next patch will fix dyntick problem properly.

18 years agohrtimer: Reverse patch to switch sys_nanosleep to hrtimer
Tony Lindgren [Wed, 22 Feb 2006 03:26:44 +0000 (19:26 -0800)]
hrtimer: Reverse patch to switch sys_nanosleep to hrtimer

Patch 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c hrtimer: switch
sys_nanosleep to hrtimer breaks dynamic tick. All usleep calls
will fail as the next_timer_interrupt currently does not scan
hrtimer queues. This means the system will be potentially
asleep in the idle mode when the next hrtimer is supposed to
run. Until hrtimer_next_interrupt is implemented, we'll use
the old sys_nanosleep.

18 years agoARM: OMAP: Add external LCD controller support for DSP Gateway
Juha Yrjola [Tue, 21 Feb 2006 16:08:48 +0000 (18:08 +0200)]
ARM: OMAP: Add external LCD controller support for DSP Gateway

If an external LCD controller is in manual update mode, the DSP
must let the FB driver know when a frame should be send over the
remote framebuffer interface.

Original code by Toshihiro, FB parts by Imre.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>
18 years agoARM: OMAP: MMC driver interoperability updates
Juha Yrjola [Tue, 21 Feb 2006 15:57:23 +0000 (17:57 +0200)]
ARM: OMAP: MMC driver interoperability updates

- Decreased the MMC max sectors count

Some MMC cards get stuck hard when the max sectors count is >= 128.

- Add a delay after enabling the MMC power regulators

Regulator voltages typically have a rising delay. We have to make sure
the voltage has stabilized before sending the MMC init sequence.

- Add MMC cover switch last state initialization

The default last state was left to value 0 (= cover closed). If the cover
switch was initially open and then closed, no kevent about it is sent,
because the state didn't change from the last seen state.

- Add MMC transfer timeout

Very rarely the controller itself gets stuck. It needs a really hard reset
to recover. Add a timeout to work around against this.

Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>
18 years agoARM: OMAP: Fix uWire SPI driver CS deselect.
Imre Deak [Wed, 15 Feb 2006 16:02:02 +0000 (18:02 +0200)]
ARM: OMAP: Fix uWire SPI driver CS deselect.

CS deselection didn't work as expected. Writing 0 to CSR isn't enough,
the given CS value with CS_CMD cleared has to be written.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Juha Yrjola <juha.yrjola@nokia.com>
18 years agoMerge source.mvista.com:linux-omap
Juha Yrjola [Tue, 21 Feb 2006 11:46:43 +0000 (13:46 +0200)]
Merge source.mvista.com:linux-omap

18 years agoARM: OMAP: Set serial 8250 ECB for TX fifo
Tony Lindgren [Mon, 20 Feb 2006 23:51:49 +0000 (15:51 -0800)]
ARM: OMAP: Set serial 8250 ECB for TX fifo

Code to fix serial TX fifo by Richard Woodruff.

The extended capabilities bit is needed to write fcr, or else some
settings don't get set.  That is what the OMAP-UART data sheet says.
The write water mark bits 4:5 are not accessible unless ECB is set.

The data sheet says it is TI16C750 compatible but it seems to share more
with what the code calls a TI16C752.  The 750 has a DLAB to set 64bit
fifo and I don't believe that is the case for ours.

A minor note is we are still only using 32 bytes of the 64 byte TX fifo
for transmits in the current code.  I'm not sure if there is an
application that this matters to.

Note that the current code id's OMAP serial ports as a 16654 which isn't
quite correct.

Also note that to use the actual TX watermark interrupt set at 32bytes
required too ugly of a hack to use (not use OMAP_SCR=0).

18 years ago[PATCH] ARM: OMAP: update flash timing on OMAP5912OSK
Hiroki Kaminaga [Mon, 20 Feb 2006 23:04:35 +0000 (15:04 -0800)]
[PATCH] ARM: OMAP: update flash timing on OMAP5912OSK

In linux-2.6.15-omap1 patch, in arch/arm/mach-omap1/board-osk.c,
EMIFS_CS3_VAL is set to 0x30003361.

This was introduced to fix flash timing error.
http://linux.omap.com/pipermail/linux-omap-open-source/2005-July/004717.html

On the other hand, in SectionE:Errata in EMIFS timing at:
http://omap.spectrumdigital.com/osk5912/osk5912_faq.html
EMIFS_CS3_VAL was set to 0x88013141, fixing write/read rate.

Reading from
http://focus.ti.com/lit/ug/spru742/spru742.pdf
3.6 EMIFS Registers,

0x30003361 will set read mode from "page mode, 4 word/page" to
"asynchronous read", and read from flash slowed down.

I tested with new value 0x88013141, and works good so far.

18 years agoARM: OMAP: Support all four OMAP1610 GPIO trigger modes
Dirk Behme [Mon, 20 Feb 2006 22:52:12 +0000 (14:52 -0800)]
ARM: OMAP: Support all four OMAP1610 GPIO trigger modes

(proposed by David Brownell)

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years agoARM: OMAP: Update usage of SA_SAMPLE_RANDOM flag
Dirk Behme [Mon, 20 Feb 2006 22:49:12 +0000 (14:49 -0800)]
ARM: OMAP: Update usage of SA_SAMPLE_RANDOM flag

As proposed by Juha Yrjölä.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years agoARM: OMAP: Add missing '=' in omap_ts.c as proposed by
Dirk Behme [Mon, 20 Feb 2006 22:43:48 +0000 (14:43 -0800)]
ARM: OMAP: Add missing '=' in omap_ts.c as proposed by
Andrzej Zaborowski.
Fix error
CC      drivers/input/touchscreen/omap/omap_ts.o
drivers/input/touchscreen/omap/omap_ts.c:230: error: syntax
error
before '{' token
drivers/input/touchscreen/omap/omap_ts.c:233: error: syntax
error
before '}' token

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years ago[PATCH] ARM: OMAP: omap keypad H4 update
Komal Shah [Mon, 20 Feb 2006 22:42:22 +0000 (14:42 -0800)]
[PATCH] ARM: OMAP: omap keypad H4 update

Move H4 Menelaus specific gpio settings to board-h4.c and fix
get_row_gpio_val function.

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
18 years ago[PATCH] ARM: OMAP: various whitespace cleanups
Ladislav Michl [Mon, 20 Feb 2006 22:38:35 +0000 (14:38 -0800)]
[PATCH] ARM: OMAP: various whitespace cleanups

Please use 'let c_space_errors=1' in vim to see what this patch fixes.
While there, remove initilizers from variables which are by default
initialized to zero (to respect linux policy). No code changes.

18 years agoMerge with /home/tmlind/src/kernel/linux-2.6
Tony Lindgren [Mon, 20 Feb 2006 19:56:19 +0000 (11:56 -0800)]
Merge with /home/tmlind/src/kernel/linux-2.6

18 years agoARM: OMAP: lcd_lph8923: fix register read / write
Imre Deak [Mon, 20 Feb 2006 16:51:18 +0000 (18:51 +0200)]
ARM: OMAP: lcd_lph8923: fix register read / write

A local variable hiding the one with the same name at an upper scope,
resulted in storing the register address instead of the desired value in
LCD registers.

In register writes there is no extra cycle after the command, so we use
only 9-bit word size.

Fix from Peter Ujfalusi <peter.ujfalusi@nokia.com>.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>
18 years agoMerge branch 'master' of /home/git/linux-omap-2.6
Juha Yrjola [Mon, 20 Feb 2006 14:12:38 +0000 (07:12 -0700)]
Merge branch 'master' of /home/git/linux-omap-2.6

18 years agoLinux v2.6.16-rc4 v2.6.16-rc4
Linus Torvalds [Fri, 17 Feb 2006 22:23:45 +0000 (14:23 -0800)]
Linux v2.6.16-rc4

18 years ago[PATCH] ACPI: fix vendor resource length computation
Bjorn Helgaas [Fri, 17 Feb 2006 21:59:50 +0000 (13:59 -0800)]
[PATCH] ACPI: fix vendor resource length computation

acpi_rs_get_list_length() needs to account for all the vendor-defined data
bytes.  Failing to include these causes buffers to be sized too small,
which causes slab corruption when we later convert AML to resources and run
off the end of the buffer.

This causes slab corruption on machines that use ACPI vendor-defined
resources.  All HP ia64 machines do, and I'm told that some NEC machines
may as well.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sys_mbind sanity checking
Chris Wright [Fri, 17 Feb 2006 21:59:36 +0000 (13:59 -0800)]
[PATCH] sys_mbind sanity checking

Make sure maxnodes is safe size before calculating nlongs in
get_nodes().

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] select: time comparison fixes
Andrew Morton [Fri, 17 Feb 2006 21:52:58 +0000 (13:52 -0800)]
[PATCH] select: time comparison fixes

I got all of these backwards.  We want to return

min(input timeout, new timeout)

to userspace to prevent increasing the time-remaining value.

Thanks to Ernst Herzberg <earny@net4u.de> for reporting and diagnosing.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] powerpc: Fix accidentally-working typo in __pud_free_tlb
David Gibson [Fri, 17 Feb 2006 21:52:56 +0000 (13:52 -0800)]
[PATCH] powerpc: Fix accidentally-working typo in __pud_free_tlb

One of the parameters to the __pud_free_tlb() macro for powerpc is
incorrect (see patch) .  We get away with it by accident, because the one
place the macro is called, the second parameter is a variable named "pud".

Signed-off-by: David Gibson <dwg@au1.ibm.com>
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] Remove KERN_INFO from middle of printk line
Tim Hockin [Fri, 17 Feb 2006 21:52:54 +0000 (13:52 -0800)]
[PATCH] Remove KERN_INFO from middle of printk line

Don't print KERN_INFO in the middle of a printk line.
printk(KERN_INFO "OEM ID: %s ",str);
is just above this. This is already fixed up in i386 copy.

Signed-off-by: Martin J. Bligh <mbligh@google.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] allow windfarm_pm112 module to load
Johannes Berg [Fri, 17 Feb 2006 21:52:54 +0000 (13:52 -0800)]
[PATCH] allow windfarm_pm112 module to load

The windfarm_pm112 module relies on smu_sat_get_sdb_partition which is in
windfarm_smu_sat.c but is not exported to modules, so despite Kconfig
having the option to build the pm112 as modules, this can never be loaded.

This patch fixes that by exporting smu_sat_get_sdb_partition with
EXPORT_SYMBOL_GPL

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: 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] fuse: fix bug in aborted fuse_release_end()
Miklos Szeredi [Fri, 17 Feb 2006 21:52:52 +0000 (13:52 -0800)]
[PATCH] fuse: fix bug in aborted fuse_release_end()

There's a rather theoretical case of the BUG triggering in
fuse_reset_request():

  - iget() fails because of OOM after a successful CREATE_OPEN request
  - during IO on the resulting RELEASE request the connection is aborted

Fix and add warning to fuse_reset_request().

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] swsusp: fix breakage with swap on LVM
Rafael J. Wysocki [Fri, 17 Feb 2006 21:52:51 +0000 (13:52 -0800)]
[PATCH] swsusp: fix breakage with swap on LVM

Restore the compatibility with the older code and make it possible to
suspend if the kernel command line doesn't contain the "resume=" argument

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: sys32_fstatat -> sys32_fstatat64
Heiko Carstens [Fri, 17 Feb 2006 21:52:50 +0000 (13:52 -0800)]
[PATCH] s390: sys32_fstatat -> sys32_fstatat64

Just rename the compat system call to keep the name consistent with all the
other *64 compat system calls.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: fix assignment instead of check in ccw_device_set_online()
Cornelia Huck [Fri, 17 Feb 2006 21:52:49 +0000 (13:52 -0800)]
[PATCH] s390: fix assignment instead of check in ccw_device_set_online()

Fix assignment instead of check in ccw_device_set_online().  Also remove
unneeded assignment in ccw_device_do_sense().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: smp initialization speed
Heiko Carstens [Fri, 17 Feb 2006 21:52:48 +0000 (13:52 -0800)]
[PATCH] s390: smp initialization speed

The last changes that introduced the additional_cpus command line parameter
also introduced a regression regarding smp initialization speed.  In
smp_setup_cpu_possible_map() cpu_present_map is set to the same value as
cpu_possible_map.  Especially that means that bits in the present map will be
set for cpus that are not present.  This will cause a slow down in the initial
cpu_up() loop in smp_init() since trying to take cpus online that aren't
present takes a while.

Fix this by setting only bits for present cpus in cpu_present_map and set
cpu_present_map to cpu_possible_map in smp_cpus_done().

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: possible_cpus parameter
Heiko Carstens [Fri, 17 Feb 2006 21:52:47 +0000 (13:52 -0800)]
[PATCH] s390: possible_cpus parameter

Introduce possible_cpus command line option.  Hard sets the number of bits set
in cpu_possible_map.  Unlike the additional_cpus parameter this one guarantees
that num_possible_cpus() will stay constant even if the system gets rebooted
and a different number of cpus are present at startup.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: additional_cpus parameter
Heiko Carstens [Fri, 17 Feb 2006 21:52:46 +0000 (13:52 -0800)]
[PATCH] s390: additional_cpus parameter

Introduce additional_cpus command line option.  By default no additional cpu
can be attached to the system anymore.  Only the cpus present at IPL time can
be switched on/off.  If it is desired that additional cpus can be attached to
the system the maximum number of additional cpus needs to be specified with
this option.

This change is necessary in order to limit the waste of per_cpu data
structures.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: fix preempt_count of idle thread with cpu hotplug
Heiko Carstens [Fri, 17 Feb 2006 21:52:46 +0000 (13:52 -0800)]
[PATCH] s390: fix preempt_count of idle thread with cpu hotplug

Set preempt_count of idle_thread to zero before switching off cpu.  Otherwise
the preempt_count will be wrong if the cpu is switched on again since the
thread will be reused.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s390: ccw device disbanding
Cornelia Huck [Fri, 17 Feb 2006 21:52:45 +0000 (13:52 -0800)]
[PATCH] s390: ccw device disbanding

If __ccw_device_disband_start() fails to initiate disbanding, it should finish
with ccw_device_disband_done() (which leaves the device in offline state)
instead of ccw_device_verify_done() (which leaves the device in online state).

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Introduce CONFIG_DEFAULT_MIGRATION_COST
Ingo Molnar [Fri, 17 Feb 2006 21:52:44 +0000 (13:52 -0800)]
[PATCH] Introduce CONFIG_DEFAULT_MIGRATION_COST

Heiko Carstens <heiko.carstens@de.ibm.com> wrote:

  The boot sequence on s390 sometimes takes ages and we spend a very long
  time (up to one or two minutes) in calibrate_migration_costs.  The time
  spent there differs from boot to boot.  Also the calculated costs differ
  a lot.  I've seen differences by up to a factor of 15 (yes, factor not
  percent).  Also I doubt that making these measurements make much sense on
  a completely virtualized architecture where you cannot tell how much cpu
  time you will get anyway.

So introduce the CONFIG_DEFAULT_MIGRATION_COST method for an architecture
to set the scheduler migration costs.  This turns off automatic detection
of migration costs.  Makes sense on virtual platforms, where migration
costs are hard to measure accurately.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] arch/sh/Kconfig: fix the ISA_DMA_API dependencies
Adrian Bunk [Fri, 17 Feb 2006 21:52:42 +0000 (13:52 -0800)]
[PATCH] arch/sh/Kconfig: fix the ISA_DMA_API dependencies

Jean-Luc Leger <reiga@dspnet.fr.eu.org> found this obvious typo.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Infineon TPM: IO-port leakage fix, WTX-bugfix
Marcel Selhorst [Fri, 17 Feb 2006 21:52:41 +0000 (13:52 -0800)]
[PATCH] Infineon TPM: IO-port leakage fix, WTX-bugfix

Fix IO-port leakage from request_region in case of error during TPM
initialization, adds more pnp-verification and fixes a WTX-bug.

Signed-off-by: Marcel Selhorst <selhorst@crypto.rub.de>
Acked-by: Kylene Jo 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] fix deadlock in ext2
Peter Staubach [Fri, 17 Feb 2006 21:52:36 +0000 (13:52 -0800)]
[PATCH] fix deadlock in ext2

Fix a deadlock possible in the ext2 file system implementation.  This
deadlock occurs when a file is removed from an ext2 file system which was
mounted with the "sync" mount option.

The problem is that ext2_xattr_delete_inode() was invoking the routine,
sync_dirty_buffer(), using a buffer head which was previously locked via
lock_buffer().  The first thing that sync_dirty_buffer() does is to lock
the buffer head that it was passed.  It does this via lock_buffer().  Oops.

The solution is to unlock the buffer head in ext2_xattr_delete_inode()
before invoking sync_dirty_buffer().  This makes the code in
ext2_xattr_delete_inode() obey the same locking rules as all other callers
of sync_dirty_buffer() in the ext2 file system implementation.

Signed-off-by: Peter Staubach <staubach@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 17 Feb 2006 21:47:16 +0000 (13:47 -0800)]
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

18 years ago[PATCH] Add missing FUA write to sata_mv dma command list
Jens Axboe [Wed, 15 Feb 2006 14:59:25 +0000 (15:59 +0100)]
[PATCH] Add missing FUA write to sata_mv dma command list

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] libata: minor fix for 2.6.16-rc3
Albert Lee [Mon, 13 Feb 2006 10:55:25 +0000 (18:55 +0800)]
[PATCH] libata: minor fix for 2.6.16-rc3

 - Fix the array index value in ata_rwcmd_protocol() for the added FUA commands.
 - Filter out ATAPI packet command error messages in ata_pio_error()

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 17 Feb 2006 21:27:40 +0000 (13:27 -0800)]
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

18 years ago[PATCH] Necessary evil to get sata_vsc to initialize with Intel iq3124h hba
Dan Williams [Wed, 14 Dec 2005 20:10:49 +0000 (13:10 -0700)]
[PATCH] Necessary evil to get sata_vsc to initialize with Intel iq3124h hba

* libata does not care about error interrupts, so handle them locally
* the interrupts that are ignored only appear to happen at init time

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] Handle holes in node mask in node fallback list setup
Linus Torvalds [Fri, 17 Feb 2006 19:38:21 +0000 (20:38 +0100)]
[PATCH] Handle holes in node mask in node fallback list setup

Change the find_next_best_node algorithm to correctly skip
over holes in the node online mask. Previously it would not handle
missing nodes correctly and cause crashes at boot.

[Written by Linus, tested by AK]

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] bonding: fix a locking bug in bond_release
Jay Vosburgh [Wed, 8 Feb 2006 05:17:22 +0000 (21:17 -0800)]
[PATCH] bonding: fix a locking bug in bond_release

bond_release returns EINVAL without releasing the bond lock if the
slave device is not being bonded by the bond.  The following patch
ensures that the lock is released in this case.

Signed-off-by: Stephen J. Bevan <stephen@dino.dnsalias.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] s390: some qeth driver fixes
Frank Pavlic [Tue, 7 Feb 2006 16:04:38 +0000 (17:04 +0100)]
[PATCH] s390: some qeth driver fixes

[patch 2/2] s390: some qeth driver fixes

From: Frank Pavlic <fpavlic@de.ibm.com>
- fixed kernel panic when using EDDP support in Layer 2 mode
- NULL pointer exception in qeth_set_offline fixed.
- setting EDDP in Layer 2 mode did not set NETIF_F_(SG/TSO)
  flags when device became online.
- use sscanf for parsing and converting IPv4 addresses
  from string to __u8 values.
- qeth_string_to_ipaddr6 fixed. in case of double colon
  the converted IPv6 address out from the string was not correct
  in previous implementation.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
diffstat:
 qeth.h      |  112 +++++++++++++++++++++++++-----------------------------------
 qeth_eddp.c |   11 ++++-
 qeth_main.c |   17 +++------
 3 files changed, 63 insertions(+), 77 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] s390: lcs performance enhancements
Frank Pavlic [Tue, 7 Feb 2006 16:04:36 +0000 (17:04 +0100)]
[PATCH] s390: lcs performance enhancements

[patch 1/2] s390: lcs performance enhancements

From: Klaus Wacker <kdwacker@de.ibm.com>
- When flood pinging (with large packet size) an LCS device,
  about 90 % of all packets are dropped by driver.
- increased number of lcs IO buffers to 32.
- use netif_stop_queue/netif_wake_queue in lcs_start_xmit routine
- don't lock the whole xmit routine but just the piece of code where
  tx_buffer is touched.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
diffstat:
 lcs.c |   31 +++++++++++++++++--------------
 lcs.h |    2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] smctr warning fix
Andrew Morton [Fri, 10 Feb 2006 10:00:43 +0000 (02:00 -0800)]
[PATCH] smctr warning fix

drivers/net/tokenring/smctr.c: In function `smctr_load_firmware':
drivers/net/tokenring/smctr.c:2981: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sky2: speed setting fix
Stephen Hemminger [Fri, 10 Feb 2006 23:58:59 +0000 (15:58 -0800)]
[PATCH] sky2: speed setting fix

Users report problems w/ auto-negotiation disabled and the link set
to 100/Half or 10/Half.  Problems range from poor performance to no
link at all.

The current sky2 code does not set things properly on link up if
autonegotiation is disabled.  Plus it does not contemplate a 10Mbit
setting at all.  This patch corrects that.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] skge: speed setting
Stephen Hemminger [Mon, 13 Feb 2006 23:46:48 +0000 (15:46 -0800)]
[PATCH] skge: speed setting

This is a clone of John Linville's fixed for speed setting on sky2 driver.
The skge driver has the same code (and bug). It would not allow manually forcing
100 and 10 mbit.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] skge: no longer experimental
Stephen Hemminger [Mon, 13 Feb 2006 23:48:08 +0000 (15:48 -0800)]
[PATCH] skge: no longer experimental

Take the experimental dependency of skge driver, it is as stable as the
others.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sk98lin: no d-link support (kconfig)
Stephen Hemminger [Mon, 13 Feb 2006 23:49:55 +0000 (15:49 -0800)]
[PATCH] sk98lin: no d-link support (kconfig)

The sk98lin driver was changed a while ago to remove support for the
D-Link 530T card because that hardware has no working VPD data.  The help
text for Kconfig was not updated.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] Wavelan_cs bitfield fixes
Jean Tourrilhes [Fri, 17 Feb 2006 01:44:54 +0000 (17:44 -0800)]
[PATCH] Wavelan_cs bitfield fixes

Some bitfields were incorrectly initialised in wavelan_cs,
causing some compiler warning. Also killed a error message that should
not be there...

Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
Jeff Garzik [Fri, 17 Feb 2006 21:11:47 +0000 (16:11 -0500)]
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

18 years agoMerge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Fri, 17 Feb 2006 21:10:20 +0000 (16:10 -0500)]
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

18 years ago[PATCH] i386: fix singlestepping though a syscall
Chuck Ebbert [Fri, 17 Feb 2006 08:16:55 +0000 (03:16 -0500)]
[PATCH] i386: fix singlestepping though a syscall

Do not mask TIF_SINGLESTEP bit in _TIF_WORK_MASK. Masking this stopped
do_notify_resume() from being called when it should have been.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix SGI O2 compile error in drivers/video/gbefb.c
Joshua Kinard [Fri, 17 Feb 2006 03:52:25 +0000 (03:52 +0000)]
[PATCH] Fix SGI O2 compile error in drivers/video/gbefb.c

A sysfs function call uses the wrong parameter, and thus breaks a build on
SGI O2.

  CC      drivers/video/gbefb.o
drivers/video/gbefb.c: In function ‘gbefb_remove’:
drivers/video/gbefb.c:1246: error: ‘dev’ undeclared (first use in this function)
drivers/video/gbefb.c:1246: error: (Each undeclared identifier is reported only once
drivers/video/gbefb.c:1246: error: for each function it appears in.)
make[2]: *** [drivers/video/gbefb.o] Error 1

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Provide an interface for getting the current tick length
Paul Mackerras [Thu, 16 Feb 2006 23:30:23 +0000 (10:30 +1100)]
[PATCH] Provide an interface for getting the current tick length

This provides an interface for arch code to find out how many
nanoseconds are going to be added on to xtime by the next call to
do_timer.  The value returned is a fixed-point number in 52.12 format
in nanoseconds.  The reason for this format is that it gives the
full precision that the timekeeping code is using internally.

The motivation for this is to fix a problem that has arisen on 32-bit
powerpc in that the value returned by do_gettimeofday drifts apart
from xtime if NTP is being used.  PowerPC is now using a lockless
do_gettimeofday based on reading the timebase register and performing
some simple arithmetic.  (This method of getting the time is also
exported to userspace via the VDSO.)  However, the factor and offset
it uses were calculated based on the nominal tick length and weren't
being adjusted when NTP varied the tick length.

Note that 64-bit powerpc has had the lockless do_gettimeofday for a
long time now.  It also had an extremely hairy routine that got called
from the 32-bit compat routine for adjtimex, which adjusted the
factor and offset according to what it thought the timekeeping code
was going to do.  Not only was this only called if a 32-bit task did
adjtimex (i.e. not if a 64-bit task did adjtimex), it was also
duplicating computations from kernel/timer.c and it wasn't clear that
it was (still) correct.

The simple solution is to ask the timekeeping code how long the
current jiffy will be on each timer interrupt, after calling
do_timer.  If this jiffy will be a different length from the last one,
we then need to compute new values for the factor and offset used in
the lockless do_gettimeofday.  In this way we can keep xtime and
do_gettimeofday in sync, even when NTP is varying the tick length.

Note that when adjtimex varies the tick length, it almost always
introduces the variation from the next tick on.  The only case I could
see where adjtimex would vary the length of the current tick is when
an old-style adjtime adjustment is being cancelled.  (It's not clear
to me why the adjustment has to be cancelled immediately rather than
from the next tick on.)  Thus I don't see any real need for a hook in
adjtimex; the rare case of an old-style adjustment being cancelled can
be fixed up at the next tick.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Acked-by: john stultz <johnstul@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Handle all and empty zones when setting up custom zonelists for mbind
Andi Kleen [Fri, 17 Feb 2006 00:39:16 +0000 (01:39 +0100)]
[PATCH] Handle all and empty zones when setting up custom zonelists for mbind

The memory allocator doesn't like empty zones (which have an
uninitialized freelist), so a x86-64 system with a node fully
in GFP_DMA32 only would crash on mbind.

Fix that up by putting all possible zones as fallback into the zonelist
and skipping the empty ones.

In fact the code always enough allocated space for all zones,
but only used it for the highest. This change just uses all the
memory that was allocated before.

This should work fine for now, but whoever implements node hot removal
needs to fix this somewhere else too (or make sure zone datastructures
by itself never go away, only their memory)

Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 17 Feb 2006 16:16:35 +0000 (08:16 -0800)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Fri, 17 Feb 2006 16:13:38 +0000 (08:13 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Fri, 17 Feb 2006 16:13:11 +0000 (08:13 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Fri, 17 Feb 2006 16:12:08 +0000 (08:12 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

18 years ago[PATCH] x86_64: Always pass full number of nodes to NUMA hash computation
Andi Kleen [Thu, 16 Feb 2006 22:42:16 +0000 (23:42 +0100)]
[PATCH] x86_64: Always pass full number of nodes to NUMA hash computation

Previously the numa hash code would be confused by holes in the node space
and stop early. This is the first part of the fix for the non boot issue
with empty nodes on Opterons.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Relax SRAT covers all memory check a bit
Andi Kleen [Thu, 16 Feb 2006 22:42:13 +0000 (23:42 +0100)]
[PATCH] x86_64: Relax SRAT covers all memory check a bit

Code was refusing good SRATs because about 12K got lost somewhere.
Allow less than 1MB of difference before rejecting it.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Resolve the RIP of an early exception using kallsyms
Andi Kleen [Thu, 16 Feb 2006 22:42:10 +0000 (23:42 +0100)]
[PATCH] x86_64: Resolve the RIP of an early exception using kallsyms

But do it after everything else to risk less from recursive
crashes.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Disable tsc when apicpmtimer is active
Andi Kleen [Thu, 16 Feb 2006 22:42:07 +0000 (23:42 +0100)]
[PATCH] x86_64: Disable tsc when apicpmtimer is active

Otherwise it has no effect anyways.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Don't enable ATI apicmaintimer workaround when the machine has C2...
Andi Kleen [Thu, 16 Feb 2006 22:42:04 +0000 (23:42 +0100)]
[PATCH] x86_64: Don't enable ATI apicmaintimer workaround when the machine has C2 or C3

Many laptops have problems with ticking the local APIC timer in C2/C3.
The code added earlier to use it by default on ATI didn't really work
for them. Don't enable it when the system supports C2/C3.

This doesn't fix the problem fully, but at least it's not worse than before.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Don't call do_exit with interrupts disabled after IRET exception
Andi Kleen [Thu, 16 Feb 2006 22:42:01 +0000 (23:42 +0100)]
[PATCH] x86_64: Don't call do_exit with interrupts disabled after IRET exception

This caused a sigreturn with bad argument on a preemptible kernel
to complain with

Debug: sleeping function called from invalid context at /home/lsrc/quilt/linux/include/linux/rwsem.h:43
in_atomic():0, irqs_disabled():1

Call Trace: {__might_sleep+190} {profile_task_exit+21}
       {__do_exit+34} {do_wait+0}

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Add boot option to disable randomized mappings and cleanup
Andi Kleen [Thu, 16 Feb 2006 22:41:58 +0000 (23:41 +0100)]
[PATCH] x86_64: Add boot option to disable randomized mappings and cleanup

AMD SimNow!'s JIT doesn't like them at all in the guest. For distribution
installation it's easiest if it's a boot time option.

Also I moved the variable to a more appropiate place and make
it independent from sysctl

And marked __read_mostly which it is.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: make touch_nmi_watchdog() not touch impossible cpus' private data
Jan Beulich [Thu, 16 Feb 2006 22:41:55 +0000 (23:41 +0100)]
[PATCH] x86_64: make touch_nmi_watchdog() not touch impossible cpus' private data

Along with that, also suppress the memory touching altogether when the
watchdog is not running, to eliminate needless crosstalk. Plus ad a call
to it to make things consistent (one could also consider removing the call
in enable_timer_nmi_watchdog()).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: Update defconfig
Andi Kleen [Thu, 16 Feb 2006 22:41:52 +0000 (23:41 +0100)]
[PATCH] x86_64: Update defconfig

... and enable 1394 by default.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] wireless/atmel: fix Open System authentication process bugs
Dan Williams [Sun, 5 Feb 2006 22:55:16 +0000 (17:55 -0500)]
[PATCH] wireless/atmel: fix Open System authentication process bugs

This patch fixes a number of bugs in the authentication process:

1) When falling back to Shared Key authentication mode from Open System,
a missing 'return' would cause the auth request to be sent, but would
drop the card into Management Error state.  When falling back, the
driver should also indicate that it is switching to Shared Key mode by
setting exclude_unencrypted.

2) Initial authentication modes were apparently wrong in some cases,
causing the driver to attempt Shared Key authentication mode when in
fact the access point didn't support that mode or even had WEP disabled.
The driver should set the correct initial authentication mode based on
wep_is_on and exclude_unencrypted.

3) Authentication response packets from the access point in Open System
mode were getting ignored because the driver was expecting the sequence
number of a Shared Key mode response.  The patch separates the OS and SK
mode handling to provide the correct behavior.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] wireless/atmel: fix setting TX key only in ENCODEEXT
Dan Williams [Sun, 5 Feb 2006 22:52:21 +0000 (17:52 -0500)]
[PATCH] wireless/atmel: fix setting TX key only in ENCODEEXT

The previous patch that added ENCODEEXT and AUTH support to the atmel
driver contained a slight error which would cause just setting the TX
key index to also set the encryption key again.  This patch allows any
combination of setting the TX key index and setting an encryption key.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[ARM] 3339/1: ARM EABI: make unmuxed syscalls visible
Nicolas Pitre [Thu, 16 Feb 2006 22:36:15 +0000 (22:36 +0000)]
[ARM] 3339/1: ARM EABI: make unmuxed syscalls visible

Patch from Nicolas Pitre

With EABI the multiplex sys_ipc and sys_socketcall syscalls are
unavailable and their support code even removed from the compiled
kernel, and the new unmuxed syscalls must be used instead.

Make those syscall numbers visible.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3338/1: old ABI compat: sys_socketcall
Nicolas Pitre [Thu, 16 Feb 2006 22:36:13 +0000 (22:36 +0000)]
[ARM] 3338/1: old ABI compat: sys_socketcall

Patch from Nicolas Pitre

Commit 99595d0237926b5aba1fe4c844a011a1ba1ee1f8 forgot to intercept
sys_socketcall as well.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[ARM] 3337/1: Fix NSLU2 flash support according to window size configuration patch
Martin Michlmayr [Thu, 16 Feb 2006 22:36:12 +0000 (22:36 +0000)]
[ARM] 3337/1: Fix NSLU2 flash support according to window size configuration patch

Patch from Martin Michlmayr

ARM patch 3226/1 (IXP4xx runtime expansion bus window size configuration)
forgot to update mach-ixp4xx/nslu2-setup.c which leads to the following
compilation error.  Update NSLU2 flash support following patch 3226/1.

  CC      arch/arm/mach-ixp4xx/nslu2-setup.o
arch/arm/mach-ixp4xx/nslu2-setup.c:30: error: \91NSLU2_FLASH_BASE\92 undeclared here (not in a function)
arch/arm/mach-ixp4xx/nslu2-setup.c:31: error: \91NSLU2_FLASH_SIZE\92 undeclared here (not in a function)
make[1]: *** [arch/arm/mach-ixp4xx/nslu2-setup.o] Error 1
make: *** [arch/arm/mach-ixp4xx] Error 2

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
---

 nslu2-setup.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[IA64] Count disabled cpus as potential hot-pluggable CPUs
Ashok Raj [Thu, 16 Feb 2006 22:01:48 +0000 (14:01 -0800)]
[IA64] Count disabled cpus as potential hot-pluggable CPUs

Minor updates to earlier patch.
- Added to documentation to add ia64 as well.
- Minor clarification on how to use disabled cpus
- used plain max instead of max_t per Andew Morton.

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoMerge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Linus Torvalds [Thu, 16 Feb 2006 22:04:08 +0000 (14:04 -0800)]
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

18 years agosis190: early setting of the pci driver private data
Francois Romieu [Thu, 16 Feb 2006 21:17:00 +0000 (22:17 +0100)]
sis190: early setting of the pci driver private data

Below this point, the error path will proceed through
sis190_release_board(). It will happily oops if
pci_set_drvdata() has not been issued.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Thu, 16 Feb 2006 20:47:44 +0000 (12:47 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

18 years ago[PATCH] ocfs2: detach from heartbeat events before freeing mle
Kurt Hackel [Tue, 14 Feb 2006 19:45:21 +0000 (11:45 -0800)]
[PATCH] ocfs2: detach from heartbeat events before freeing mle

Signed-off-by: Kurt Hackel <Kurt.Hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[PATCH] ocfs2: only checkpoint journal when asked to
Mark Fasheh [Thu, 9 Feb 2006 21:23:39 +0000 (13:23 -0800)]
[PATCH] ocfs2: only checkpoint journal when asked to

Disable automatic checkpointing of the journal - this is a relic from older
ocfs2 days. Worth quite a bit of performance on longer running single node
tests.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[PATCH] ocfs2: manually grant remote recovery lock
Kurt Hackel [Thu, 19 Jan 2006 01:07:47 +0000 (17:07 -0800)]
[PATCH] ocfs2: manually grant remote recovery lock

* fix a hang in recovery that occurred in dlmlock_remote.  the $RECOVERY
  lock was never moved to the granted queue even after getting DLM_NORMAL
  back from the master node.

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[PATCH] ocfs2: add dlm_wait_for_node_death
Kurt Hackel [Thu, 19 Jan 2006 01:05:38 +0000 (17:05 -0800)]
[PATCH] ocfs2: add dlm_wait_for_node_death

* add dlm_wait_for_node_death function to be used after receiving a network
  error.  this will wait for the given timeout to allow the heartbeat
  callbacks to update the domain map.  without this, some paths may spin
  and consume enough cpu that the heartbeat gets starved and never updates.

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[PATCH] ocfs2: fix release of ast never reserved
Kurt Hackel [Thu, 19 Jan 2006 01:02:56 +0000 (17:02 -0800)]
[PATCH] ocfs2: fix release of ast never reserved

* fix a bug in dlm_convert_lock_handler where dlm_lockres_release_ast was
  being called even if no ast was ever reserved

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[PATCH] ocfs2: recheck recovery state after getting lock
Kurt Hackel [Thu, 19 Jan 2006 01:01:25 +0000 (17:01 -0800)]
[PATCH] ocfs2: recheck recovery state after getting lock

* after successfully taking the $RECOVERY lock in EX mode, recheck to make
  sure that recovery has not already begun or completed on another node

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
18 years ago[IA64] Missing check for TIF_WORK if trace/audit enabled
Jack Steiner [Thu, 16 Feb 2006 01:46:50 +0000 (19:46 -0600)]
[IA64] Missing check for TIF_WORK if trace/audit enabled

It appears that if auditing is enabled, the kernel fails to
check for pending signals before returning to user mode.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Acked-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[MMC] mmci: allow small data transfers
Russell King [Thu, 16 Feb 2006 16:48:31 +0000 (16:48 +0000)]
[MMC] mmci: allow small data transfers

If a data transfer is small (less than a FIFO size) we would
hang waiting for the data to be read due to the PIO interrupt
not occuring.  We allowed for this in our PIO interrupt handler,
but not when setting up a data transfer.

Apply the "fix" when setting up a data transfer as well.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[PATCH] Fix over-zealous tag clearing in radix_tree_delete
NeilBrown [Thu, 16 Feb 2006 03:43:01 +0000 (14:43 +1100)]
[PATCH] Fix over-zealous tag clearing in radix_tree_delete

If a tag is set for a node being deleted from a radix_tree, then that
tag gets cleared from the parent of the node, even if it is set for some
siblings of the node begin deleted.

This patch changes the logic to include a test for any_tag_set similar
to the logic a little futher down.  Care is taken to ensure that
'nr_cleared_tags' remains equals to the number of entries in the 'tags'
array which are set to '0' (which means that this tag is not set in the
tree below pathp->node, and should be cleared at pathp->node and
possibly above.

[ Nick says: "Linus FYI, I was able to modify the radix tree test
  harness to catch the bug and can no longer trigger it after the fix.
  Resulting code passes all other harness tests as well of course." ]

Signed-off-by: Neil Brown <neilb@suse.de>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[ARM] Fix SMP initialisation oops
Russell King [Thu, 16 Feb 2006 11:08:09 +0000 (11:08 +0000)]
[ARM] Fix SMP initialisation oops

A change to the SMP initialisation caused the following oops:

 CPU1: Booted secondary processor
 CPU1: D VIPT write-back cache
 CPU1: I cache: 32768 bytes, associativity 4, 32 byte lines, 256 sets
 CPU1: D cache: 32768 bytes, associativity 4, 32 byte lines, 256 sets
 <7>Calibrating delay loop... 83.14 BogoMIPS (lpj=415744)
 <1>Unable to handle kernel NULL pointer dereference at virtual address 0000001c
 ...
 PC is at enqueue_task+0x1c/0x64
 LR is at activate_task+0xcc/0xe4

SMP initialisation now requires cpu_possible_map to be initialised in
setup_arch().  Move this from smp_prepare_cpus() to smp_init_cpus()
and call it from our setup_arch() if CONFIG_SMP is enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Thu, 16 Feb 2006 04:00:48 +0000 (20:00 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 16 Feb 2006 03:56:33 +0000 (19:56 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years ago[PATCH] mmconfig: add kernel parameter documentation
Bjorn Helgaas [Wed, 15 Feb 2006 23:17:43 +0000 (15:17 -0800)]
[PATCH] mmconfig: add kernel parameter documentation

Mention the "pci=nommconf" option in kernel-parameters.txt.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] swsusp: nuke noisy message
Andrew Morton [Wed, 15 Feb 2006 23:17:42 +0000 (15:17 -0800)]
[PATCH] swsusp: nuke noisy message

I get about 88 squillion of these when suspending an old ad450nx server.

Cc: Pavel Roskin <proski@gnu.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86_64: early initialization of cpu_to_node
Daniel Yeisley [Wed, 15 Feb 2006 23:17:41 +0000 (15:17 -0800)]
[PATCH] x86_64: early initialization of cpu_to_node

The early initialization of cpu_to_node code as it is now only updates the
cpu_to_node array, and does not update cpu_pda()->nodemember.  This will
cause numa_node_id() to return 0 on systems where CPU 0 is not on Node 0.
This leads to a kernel panic in slab.c.

I've tested the patch below on a 16 processor x86_64 ES7000-600 server, and
no longer see the panic I saw with the original 2.6.16-rc3.

Signed-off-by: Dan Yeisley <dan.yeisley@unisys.com>
Acked-by: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] hrtimer: fix multiple macro argument expansion
Roman Zippel [Wed, 15 Feb 2006 23:17:40 +0000 (15:17 -0800)]
[PATCH] hrtimer: fix multiple macro argument expansion

For two macros the arguments were expanded twice, change them to inline
functions to avoid it.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] add asm-generic/mman.h
Michael S. Tsirkin [Wed, 15 Feb 2006 23:17:39 +0000 (15:17 -0800)]
[PATCH] add asm-generic/mman.h

Make new MADV_REMOVE, MADV_DONTFORK, MADV_DOFORK consistent across all
arches.  The idea is to make it possible to use them portably even before
distros include them in libc headers.

Move common flags to asm-generic/mman.h

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] cpuset: oops in exit on null cpuset fix
Paul Jackson [Wed, 15 Feb 2006 23:17:38 +0000 (15:17 -0800)]
[PATCH] cpuset: oops in exit on null cpuset fix

Fix a latent bug in cpuset_exit() handling.  If a task tried to allocate
memory after calling cpuset_exit(), it oops'd in
cpuset_update_task_memory_state() on a NULL cpuset pointer.

So set the exiting tasks cpuset to the root cpuset instead of to NULL.

A distro kernel hit this with an added kernel package that had just such a
hook (allocating memory) in the exit code path.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>