Commit graph android_kernel_sony_sdm845/drivers
Message SHA1
[USB]: Make early handoff a final fixup instead of a header one.
At header fixup time, it is not yet legal to ioremap() PCI
device registers, yet that is what this quirk code needs to
do.

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

David S. Miller   commited 2005-11-04 11:17:24 -08:00
462aae65f6
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds   commited 2005-11-04 10:42:53 -08:00
c8ebce6eeb
[PATCH] ARM: Reverted 2918/1: [update] Base port of Comdial MP1000 platfrom
No longer maintained

Russell King   commited 2005-11-04 17:28:34 +00:00
d56c524afa
[PATCH] ARM: Reverted 2921/1: Support for the RTC / nvram on the Comdial MP1000
No longer maintained

Russell King   commited 2005-11-04 17:26:57 +00:00
866237eafc
[PATCH] ARM: Reverted 2919/1: CS8900A ethernet driver modifications for the Comdial MP1000
No longer maintained

Russell King   commited 2005-11-04 17:26:56 +00:00
e399822da0
[SERIAL] 8250_early.c passing 0 instead of NULL
Fix sparse warning about passing `0` to  simple_strtoul()

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

Ben Dooks   authored and   Russell King   commited 2005-11-03 21:07:37 +00:00
b2281abf11
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds   commited 2005-11-02 18:38:22 -08:00
cfa024f4e4
Merge git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds   commited 2005-11-02 08:06:02 -08:00
ec1890c5df
[ARM] AMBA CLCD driver can drive PL110 and PL111 primecells
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Russell King   commited 2005-11-02 14:40:35 +00:00
e831556fb6
[PATCH] blk: fix dangling pointer access in __elv_add_request
cfq's add_req_fn callback may invoke q->request_fn directly and
depending on low-level driver used and timing, a queued request may be
finished & deallocated before add_req_fn callback returns.  So,
__elv_add_request must not access rq after it's passed to add_req_fn
callback.

This patch moves rq_mergeable test above add_req_fn().  This may
result in q->last_merge pointing to REQ_NOMERGE request if add_req_fn
callback sets it but as RQ_NOMERGE is checked again when blk layer
actually tries to merge requests, this does not cause any problem.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tejun Heo   authored and   Linus Torvalds   commited 2005-11-01 21:58:06 -08:00
ca23509fba
[PATCH] ibmveth fix panic in initial replenish cycle
This patch fixes a panic in the current tree caused by a race condition between the initial replenish cycle and the rx processing of the first packets trying to replenish the buffers.

Signed-off-by: Santiago Leon <santil@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Santiago Leon   authored and   Linus Torvalds   commited 2005-11-01 21:56:40 -08:00
6c2af71f7f
[PATCH] missing platform_device.h includes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Al Viro   authored and   Linus Torvalds   commited 2005-11-01 21:50:01 -08:00
bbc5b21284
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Manual fixups for some clashes due to re-indenting.

Linus Torvalds   commited 2005-11-01 21:49:07 -08:00
d8762748ca
[PATCH] tlclk build fix
drivers/char/tlclk.c: In function `tlclk_init':
drivers/char/tlclk.c:775: warning: implicit declaration of function `platform_device_register_simple'

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

Andrew Morton   authored and   Linus Torvalds   commited 2005-11-01 21:44:46 -08:00
ce46337040
[PATCH] TPM compile fix
CC      drivers/char/tpm/tpm_nsc.o
drivers/char/tpm/tpm_nsc.c:277: error: `platform_bus_type' undeclared here (not in a function)
...
  CC      drivers/char/tpm/tpm_atmel.o
drivers/char/tpm/tpm_atmel.c:175: error: `platform_bus_type' undeclared here (not in a function)

Make sure to include proper headers.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Chris Wright   authored and   Linus Torvalds   commited 2005-11-01 21:44:45 -08:00
faba278fb0
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds   commited 2005-11-01 21:32:46 -08:00
ec33b30910
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds   commited 2005-11-01 21:32:14 -08:00
7f36b1e958
[ARM] 3079/1: Fix typo in i2c-iop3xx.c (invalid pointer passed to release_mem_region)
Patch from Dan Williams

* If request_irq fails then a call to release_mem_region will be made with an invalid pointer.
* Two formatting fixes

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Dan Williams   authored and   Russell King   commited 2005-11-01 22:31:12 +00:00
fbd9a6d7a9
[WATCHDOG] adds device_driver .owner field
Initialise the .owner field of the device driver
with the module that owns it, for easier tracking
of device driver ownership. (probably also better
for sysfs...)

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Wim Van Sebroeck   commited 2005-11-01 19:31:59 +01:00
de4ae58fc9
[WATCHDOG] pcwd_pci.c update comments
update copyright + update bells and whistles driver for v2.6

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Wim Van Sebroeck   commited 2005-11-01 19:31:48 +01:00
b3faed6373
[WATCHDOG] w83627hf_wdt trivial typo
The most trivial typo fix in the world.

Signed-off-by: Pozsar Balazs <pozsy@uhulinux.hu>
Signed-off-by: Pádraig Brady <P@draigBrady.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Pozsar Balazs   authored and   Wim Van Sebroeck   commited 2005-11-01 19:31:37 +01:00
d05101738a
[WATCHDOG] s3c2410 wdt - add .owner field
Initialise the .owner field of the device driver
with the module that owns it, for easier tracking
of device driver ownership.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Ben Dooks   authored and   Wim Van Sebroeck   commited 2005-11-01 19:31:19 +01:00
30da9404bc
[BLOCK] aoe: update for combined io statistics
Signed-off-by: Jens Axboe <axboe@suse.de>

Jens Axboe   commited 2005-11-01 09:54:23 +01:00
496456c24f
[BLOCK] Unify the seperate read/write io stat fields into arrays
Instead of having ->read_sectors and ->write_sectors, combine the two
into ->sectors[2] and similar for the other fields. This saves a branch
several places in the io path, since we don't have to care for what the
actual io direction is. On my x86-64 box, that's 200 bytes less text in
just the core (not counting the various drivers).

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

Jens Axboe   commited 2005-11-01 09:26:16 +01:00
a362357b6c
[BLOCK] Update read/write block io statistics at completion time
Right now we do it at queueing time, which works alright for reads
(since they are usually sync), but not for async writes since we can
queue io a lot faster than we can complete it. This makes the vmstat
output look extremely bursty.

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

Jens Axboe   commited 2005-11-01 08:35:42 +01:00
d72d904a53
Don't touch USB controller IO registers when they are disabled
The USB "handoff" code is an early PCI quirk to make sure we own the USB
controller (as opposed to the BIOS/SMM).  But if the controller isn't
even enabled yet, don't try to access it.

Acked-by: Paul Mackerras <paulus@samba.org> (who had an alternate patch)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds   commited 2005-10-31 21:12:40 -08:00
541ab4af11
[PATCH] revert ide-scsi highmem cleanup
Jeff Garzik <jgarzik@pobox.com> points out that this was wrong: we need to
disable local interrupts while holding KM_IRQ0 due to IRQ sharing.

And holding interrupts off during a big PIO opration is expensive, so we only
want to do that if we know the page was highmem.

So revert commit 17fd47ab4d

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

Andrew Morton   authored and   Linus Torvalds   commited 2005-10-31 14:22:04 -08:00
a717f77362
[PATCH] i386: CONFIG_PC removal
CONFIG_PC is left-over cruft after the introduction of CONFIG_X86_PC with
the subarch split.  Remove it, and fixup the remaining users to depend on
CONFIG_X86_PC instead.

Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Arthur Othieno   authored and   Linus Torvalds   commited 2005-10-31 09:20:54 -08:00
f2c84c0e84
[ARM] Convert EBSA110 network driver to a platform driver
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Russell King   commited 2005-10-31 17:14:57 +00:00
37bb30e86b
[PATCH] noop-iosched: avoid corrupted request merging
Tejun Heo notes:

   "I'm currently debugging this.  The problem is that we are using the
    generic dispatch queue directly in the noop sched and merging is NOT
    allowed on dispatch queues but generic handling of last_merge tries
    to merge requests.  I'm still trying to verify this, so I'll be back
    with results soon."

In the meantime, disable merging for noop by setting REQ_NOMERGE in
elevator_noop_add_request().

Eventually, we should add a noop_list and do the dispatching like in the
other io schedulers.  Merging is still beneficial for noop (and it has
always done it).

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jens Axboe   authored and   Linus Torvalds   commited 2005-10-31 07:46:28 -08:00
581c1b1439
[PATCH] Fix on-the-fly switch from cfq i/o scheduler
Don't clear ->elevator_data on exit, if we are switching queues we are
overwriting the data of the new io scheduler.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jens Axboe   authored and   Linus Torvalds   commited 2005-10-31 07:41:28 -08:00
4fc207419d
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Linus Torvalds   commited 2005-10-31 07:34:07 -08:00
c1d962035d
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary

Linus Torvalds   commited 2005-10-31 07:32:56 -08:00
4fd5f8267d
[SERIAL] Arrange better identification of ports
Folk seem to get confused when they see two or more ttyS0 ports
appearing at boot time.  One comes from the legacy table, and
one from PNP.

Hence, display the bus ID of the device which supplied the port.

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

Russell King   commited 2005-10-31 11:42:22 +00:00
0cf669d5c5
Input: adbhid - fix OOPS introduced by dynalloc conversion
The problem is that adbhid[]->input is NULL, so the kernel oopses with
a null pointer dereference as soon as a key is pressed.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Paul Mackerras   authored and   Dmitry Torokhov   commited 2005-10-31 01:30:32 -05:00
eb16292ba8
Input: lkkbd - fix debug message in lkkbd_interrupt()
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov   commited 2005-10-31 01:30:19 -05:00
76440d5e13
Input: pcspkr - fix setting name and phys for the device
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov   commited 2005-10-31 01:30:05 -05:00
1259f2b365
Input: fix input_dev registration message
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov   commited 2005-10-31 01:29:51 -05:00
995fc4df0b
Input: evdev - allow querying SW state from compat ioctl
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov   commited 2005-10-31 01:29:37 -05:00
7972720aaa
Input: evdev - allow querying EV_SW bits from compat_ioctl
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov   commited 2005-10-31 01:29:23 -05:00
e0be618d1e
[libata] locking rewrite (== fix)
A lot of power packed into a little patch.

This change eliminates the sharing between our controller-wide spinlock
and the SCSI core's Scsi_Host lock.  As the locking in libata was
already highly compartmentalized, always referencing our own lock, and
never scsi_host::host_lock.

As a side effect, this change eliminates a deadlock from calling
scsi_finish_command() while inside our spinlock.

Jeff Garzik   commited 2005-10-30 23:31:48 -05:00
005a5a06a6
[libata] ata_tf_to_host cleanups
Integrate ata_exec() and ata_tf_to_host() into their only caller,
ata_bus_edd().

Rename ata_tf_to_host_nolock() to ata_tf_to_host().

This makes locking a bit easier to review, and may help pave the way for
future changes.

Jeff Garzik   commited 2005-10-30 21:37:17 -05:00
e533825447
Merge ../linux-2.6 by hand
Paul Mackerras   commited 2005-10-31 13:37:12 +11:00
23fd07750a
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds   commited 2005-10-30 17:48:37 -08:00
ed28f96ac1
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds   commited 2005-10-30 17:48:00 -08:00
1480d0a31d
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds   commited 2005-10-30 17:47:00 -08:00
fc8e3d177f
[PATCH] fix missing includes
I recently picked up my older work to remove unnecessary #includes of
sched.h, starting from a patch by Dave Jones to not include sched.h
from module.h. This reduces the number of indirect includes of sched.h
by ~300. Another ~400 pointless direct includes can be removed after
this disentangling (patch to follow later).
However, quite a few indirect includes need to be fixed up for this.

In order to feed the patches through -mm with as little disturbance as
possible, I've split out the fixes I accumulated up to now (complete for
i386 and x86_64, more archs to follow later) and post them before the real
patch.  This way this large part of the patch is kept simple with only
adding #includes, and all hunks are independent of each other.  So if any
hunk rejects or gets in the way of other patches, just drop it.  My scripts
will pick it up again in the next round.

Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tim Schmielau   authored and   Linus Torvalds   commited 2005-10-30 17:37:32 -08:00
4e57b68178
[PATCH] hpet: hpet driver cleanups
- Use kzalloc() instead of kmalloc + memset.
- Clean/fix some printk's.
- Use NULL for pointers instead of 0.
- Combine hpet busy searching locations into a function call.

Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Randy Dunlap   authored and   Linus Torvalds   commited 2005-10-30 17:37:31 -08:00
3e6716e748
[PATCH] hpet: use HPET physical addresses for dup. detection
- Use HPET physical address to detect duplicates, not logical addresses.
  Using logical (mapped) addresses fails to detect duplicates
  because ioremap() returns a new mapped address each time.

- iounmap() regions when duplicate/busy areas are found.

Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Randy Dunlap   authored and   Linus Torvalds   commited 2005-10-30 17:37:31 -08:00
b6ab126211
[PATCH] hpet: allow HPET FIXED_MEM32 resource type
Allow the ACPI HPET description table to use a resource type of FIXED_MEM32
for the HPET reource.  Use the fixed resoure size of 1 KB for the HPET
resource as per the HPET spec.

Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Acked-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Randy Dunlap   authored and   Linus Torvalds   commited 2005-10-30 17:37:31 -08:00
757c472409