Atsushi Nemoto [Thu, 13 Jul 2006 14:01:50 +0000 (23:01 +0900)]
[MIPS] sparsemem: fix crash in show_mem
With sparsemem, pfn should be checked by pfn_valid() before pfn_to_page().
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:33 +0000 (17:33 +0900)]
[MIPS] vr41xx: Update workpad setup function
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:24 +0000 (17:33 +0900)]
[MIPS] vr41xx: Update e55 setup function
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:14 +0000 (17:33 +0900)]
[MIPS] vr41xx: Removed old v2.4 VRC4173 driver
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Thu, 13 Jul 2006 08:33:03 +0000 (17:33 +0900)]
[MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 10 Jul 2006 01:37:21 +0000 (02:37 +0100)]
[MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 10 Jul 2006 01:27:21 +0000 (02:27 +0100)]
[MIPS] Remove unused code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Julien BLACHE [Sat, 8 Jul 2006 22:21:24 +0000 (00:21 +0200)]
[MIPS] IP22 Fix brown paper bag in RTC code.
This patch fixes a typo in arch/mips/sgi-ip22/ip22-time.c, leading to the
incorrect year being set into the RTC chip.
Signed-off-by: Julien BLACHE <jb@jblache.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 9 Jul 2006 21:27:23 +0000 (22:27 +0100)]
[MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
By the time it's called from time_init interrupts are still disabled.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 9 Jul 2006 20:38:56 +0000 (21:38 +0100)]
[MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
Ralf Baechle [Sun, 9 Jul 2006 19:53:19 +0000 (20:53 +0100)]
[MIPS] Nuke redeclarations of board_time_init.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 9 Jul 2006 19:49:41 +0000 (20:49 +0100)]
[MIPS] Remove redeclarations of setup_irq().
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 9 Jul 2006 19:42:40 +0000 (20:42 +0100)]
[MIPS] Nuke redeclarations of board_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Sun, 9 Jul 2006 00:47:06 +0000 (01:47 +0100)]
[MIPS] Print out TLB handler assembly for debugging.
Small update, using pr_debug and pr_info.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sat, 8 Jul 2006 10:32:58 +0000 (11:32 +0100)]
[MIPS] SMTC: Reformat to Linux style.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sat, 8 Jul 2006 10:25:38 +0000 (11:25 +0100)]
[MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 7 Jul 2006 22:57:19 +0000 (23:57 +0100)]
[MIPS] IP27: Reformatting.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 7 Jul 2006 22:56:32 +0000 (23:56 +0100)]
[MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 7 Jul 2006 22:53:05 +0000 (23:53 +0100)]
[MIPS] IP27: irq_chip startup method returns unsigned int.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 7 Jul 2006 22:49:30 +0000 (23:49 +0100)]
[MIPS] IP27: struct irq_desc member handler was renamed to chip.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Fri, 7 Jul 2006 15:51:11 +0000 (00:51 +0900)]
[MIPS] Remove vmlinux.rm200 target from makefile.
Long ago in the dark ages this was used a MIPS a.out binary to be used
with Milo which is obsolete since years.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Fri, 7 Jul 2006 15:42:12 +0000 (00:42 +0900)]
[MIPS] vr41xx: Replace magic number for P4K bit with symbol.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Fri, 7 Jul 2006 15:42:01 +0000 (00:42 +0900)]
[MIPS] vr41xx: Changed workaround to recommended method
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Fri, 7 Jul 2006 09:38:51 +0000 (10:38 +0100)]
[MIPS] Oprofile: Fix build failure due to warning and -Werror.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 7 Jul 2006 13:07:18 +0000 (14:07 +0100)]
[MIPS] TRACE_IRQFLAGS_SUPPORT support.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Fri, 7 Jul 2006 05:26:41 +0000 (14:26 +0900)]
[MIPS] Fix rdhwr_op definition.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Thu, 6 Jul 2006 15:26:02 +0000 (00:26 +0900)]
[MIPS] Do not count pages in holes with sparsemem
With some memory model other than FLATMEM, the single node can
contains some holes so there might be many invalid pages. For
example, with two 256M memory and one 256M hole, some variables
(num_physpage, totalpages, nr_kernel_pages, nr_all_pages, etc.) will
indicate that there are 768MB on this system. This is not desired
because, for example, alloc_large_system_hash() allocates too many
entries.
Use free_area_init_node() with counted zholes_size[] instead of
free_area_init().
For num_physpages, use number of ram pages instead of max_low_pfn.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Tue, 4 Jul 2006 16:22:44 +0000 (01:22 +0900)]
[MIPS] Sparsemem fixes
1. MIPS should select SPARSEMEM_STATIC since allocating bootmem in
memory_present() will corrupt bootmap area.
2. pfn_valid() for SPARSEMEM is defined in linux/mmzone.h
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Wed, 5 Jul 2006 17:43:29 +0000 (18:43 +0100)]
[MIPS] IP32: Fix wreckage caused by recent SA_* constant replacement.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Tue, 4 Jul 2006 13:59:41 +0000 (22:59 +0900)]
[MIPS] VR41xx: Set VR41_CONF_BP only for PrId 0x0c80.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Tue, 4 Jul 2006 13:16:28 +0000 (22:16 +0900)]
[MIPS] MIPS MT: Fix build error.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Wed, 5 Jul 2006 13:32:51 +0000 (14:32 +0100)]
[MIPS] BCM1480: Fix fatal typo in the rewritten interrupt handler.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Wed, 5 Jul 2006 13:26:38 +0000 (14:26 +0100)]
[MIPS] Sibyte: Improve interrupt latency again for sb1250/bcm1480
this patch restores the behaviour of the old (assembly-written)
interrupt handler, the handler is left as soon as a single interrupt
cause is handled.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 6 Jul 2006 12:04:01 +0000 (13:04 +0100)]
[MIPS] Use the proper technical term for naming some of the cache macros.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 6 Jul 2006 08:47:52 +0000 (09:47 +0100)]
[MIPS] IP22: Remove SYS_SUPPORTS_SMP test code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Chris Dearman [Fri, 30 Jun 2006 22:35:28 +0000 (23:35 +0100)]
[MIPS] Panic on fp exception in kernel mode.
There should never be a FP exception in kernel mode.
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 3 Jul 2006 16:02:35 +0000 (17:02 +0100)]
[MIPS] Malta: Fix build of certain configs.
Domen Puncer [Mon, 3 Jul 2006 06:17:09 +0000 (08:17 +0200)]
[MIPS] au1xxx: Support both YAMON and U-Boot
Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Mon, 3 Jul 2006 12:30:01 +0000 (13:30 +0100)]
[MIPS] Save 2k text size in cpu-probe
The appended patch drops the inline for decode_configs, this saves about
2k of text size.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Mon, 3 Jul 2006 12:30:01 +0000 (13:30 +0100)]
[MIPS] Uses MIPS_CONF_AR instead of magic constants.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sun, 2 Jul 2006 15:09:47 +0000 (00:09 +0900)]
[MIPS] Make SPARSEMEM selectable on QEMU.
This might be helpfull to debug sparsemem on mips.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sun, 2 Jul 2006 15:09:47 +0000 (00:09 +0900)]
[MIPS] Make SPARSEMEM selectable on QEMU.
This might be helpfull to debug sparsemem on mips.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Sun, 2 Jul 2006 14:17:27 +0000 (23:17 +0900)]
[MIPS] Au1000: Remove au1000 code.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Yoichi Yuasa [Sun, 2 Jul 2006 14:13:34 +0000 (23:13 +0900)]
[MIPS] vr41xx: Removed unused definitions for NEC CMBVR4133.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 2 Jul 2006 15:31:14 +0000 (16:31 +0100)]
[MIPS] Wire up vmsplice(2) and move_pages(2).
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 2 Jul 2006 13:41:42 +0000 (14:41 +0100)]
[MIPS] Eleminate interrupt migration helper use.
> #define hw_interrupt_type irq_chip
> typedef struct irq_chip hw_irq_controller;
> #define no_irq_type no_irq_chip
> typedef struct irq_desc irq_desc_t;
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sat, 1 Jul 2006 21:07:23 +0000 (22:07 +0100)]
[MIPS] Don't include obsolete <linux/config.h>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Chris Dearman [Fri, 30 Jun 2006 11:32:37 +0000 (12:32 +0100)]
[MIPS] Default cpu_has_mipsmt to a runtime check
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Chris Dearman [Fri, 30 Jun 2006 11:32:37 +0000 (12:32 +0100)]
[MIPS] Use KERN_DEBUG to log the SDBBP messages
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Chris Dearman [Fri, 30 Jun 2006 13:19:45 +0000 (14:19 +0100)]
[MIPS] Less noise on multithreading exceptions.
Make the MT handler silent and output the MT exception type at debug
priority.
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 13 Jul 2006 20:25:57 +0000 (21:25 +0100)]
[MIPS] Update defconfigs to 2.6.18-rc1.
Ralf Baechle [Sun, 25 Jun 2006 15:42:21 +0000 (17:42 +0200)]
[MIPS] IP27: Don't destroy interrupt routing information on shutdown irq.
This fixes the "not syncing: Could not identify cpu/level ..." panic
when a PCI irq is requested the second time.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 22 Jun 2006 21:42:32 +0000 (22:42 +0100)]
[MIPS] Avoid interprocessor function calls.
On the 34K where multiple virtual processors are implemented in a single
core and share a single TLB, interprocessor function calls are not needed
to flush a cache, so avoid them.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Arjan van de Ven [Thu, 13 Jul 2006 12:46:03 +0000 (14:46 +0200)]
[PATCH] lockdep: annotate mm/slab.c
mm/slab.c uses nested locking when dealing with 'off-slab'
caches, in that case it allocates the slab header from the
(on-slab) kmalloc caches. Teach the lock validator about
this by putting all on-slab caches into a separate class.
this patch has no effect on non-lockdep kernels.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Thu, 13 Jul 2006 12:44:38 +0000 (14:44 +0200)]
[PATCH] lockdep: undo mm/slab.c annotation
undo existing mm/slab.c lock-validator annotations, in preparation
of a new, less intrusive annotation patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 13 Jul 2006 14:53:11 +0000 (07:53 -0700)]
Merge commit /linux/kernel/git/davem/sparc-2.6 of HEAD
* HEAD:
[SPARC]: Fix OF register translations under sub-PCI busses.
[SPARC64]: Refine Sabre wsync logic.
[SERIAL] sunsu: Handle keyboard and mouse ports directly.
[SPARC64]: Fix 2 bugs in sabre_irq_build()
[SPARC64]: Update defconfig.
[SPARC64]: Fix make headers_install
[SPARC64]: of_device_register() error checking fix
Greg Ungerer [Wed, 12 Jul 2006 23:32:41 +0000 (09:32 +1000)]
[PATCH] m68knommu: fix result type in get_user() macro
Keep the result holder variable the same type as the quantity we are
retreiving in the get_user() macro - don't go through a pointer version
of the user space address type.
Using the address type causes problems if the address type was const
(newer versions of gcc quite rightly error out for that condition).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Chuck Ebbert [Wed, 12 Jul 2006 20:41:15 +0000 (16:41 -0400)]
[PATCH] i386: system.h: remove extra semicolons and fix order
include/asm-i386/system.h has trailing semicolons in some of the
macros that cause legitimate code to fail compilation, so remove
them. Also remove extra blank lines within one group of macros.
And put stts() and clts() back together; they got separated somehow.
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David S. Miller [Thu, 13 Jul 2006 06:19:31 +0000 (23:19 -0700)]
[SPARC]: Fix OF register translations under sub-PCI busses.
There is an implicit assumption in the code that ranges will translate
to something that can fit in 2 32-bit cells, or a 64-bit value. For
certain kinds of things below PCI this isn't necessarily true.
Here is what the relevant OF device hierarchy looks like for one of
the serial controllers on an Ultra5:
Node 0xf005f1e0
ranges:
00000000.
00000000.
00000000.
000001fe.
01000000.
00000000.
01000000
01000000.
00000000.
00000000.
000001fe.
02000000.
00000000.
01000000
02000000.
00000000.
00000000.
000001ff.
00000000.
00000001.
00000000
03000000.
00000000.
00000000.
000001ff.
00000000.
00000001.
00000000
device_type: 'pci'
model: 'SUNW,sabre'
Node 0xf005f9d4
device_type: 'pci'
model: 'SUNW,simba'
Node 0xf0060d24
ranges:
00000010.
00000000 82010810.
00000000.
f0000000 01000000
00000014.
00000000 82010814.
00000000.
f1000000 00800000
name: 'ebus'
Node 0xf0062dac
reg:
00000014.
003083f8.
00000008 --> 0x1ff.
f13083f8
device_type: 'serial'
name: 'su'
So the correct translation here is:
1) Match "su" register to second ranges entry of 'ebus', which translates
into a PCI triplet "
82010814.
00000000.
f1000000" of size
00800000, which
gives us "
82010814.
00000000.
f13083f8".
2) Pass-through "SUNW,simba" since it lacks ranges property
3) Match "
82010814.
00000000.
f13083f8" to third ranges property of PCI
controller node 'SUNW,sabre', and we arrive at the final physical
MMIO address of "0x1fff13083f8".
Due to the 2-cell assumption, we couldn't translate to a PCI 3-cell
value, and we couldn't perform a pass-thru on it either.
It was easiest to just stop splitting the ranges application operation
between two methods, ->map and ->translate, and just let ->map do all
the work. That way it would work purely on 32-bit cell arrays instead
of having to "return" some value like a u64.
It's still not %100 correct because the out-of-range check is still
done using the 64 least significant bits of the range and address.
But it does work for all the cases I've thrown at it so far.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Thu, 13 Jul 2006 04:16:07 +0000 (21:16 -0700)]
[SPARC64]: Refine Sabre wsync logic.
It is only needed when there is a PCI-PCI bridge sitting
between the device and the PCI host controller which is
not a Simba APB bridge.
Add logic to handle two special cases:
1) device behind EBUS, which sits on PCI
2) PCI controller interrupts
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Thu, 13 Jul 2006 04:04:21 +0000 (21:04 -0700)]
[SERIAL] sunsu: Handle keyboard and mouse ports directly.
The sunsu_ports[] array exists merely to be able to easily
use an integer index to get at the proper serial console
port struct.
We size this only for real ports, not for the keyboard and
mouse, and thus keyboard and mouse port registration would
fail.
Fix this by dynamically allocating the port struct for the
keyboard and mouse, instead of using the sunsu_ports[]
array.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Wed, 12 Jul 2006 22:59:53 +0000 (15:59 -0700)]
[SPARC64]: Fix 2 bugs in sabre_irq_build()
When installing the IRQ pre-handler, we were not setting up the second
argument correctly. It should be a pointer to the sabre_irq_data, not
the config space PIO address.
Furthermore, we only need this pre-handler installed if the device
sits behind a PCI bridge that is not Sabre or Simba/APB.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Wed, 12 Jul 2006 21:01:26 +0000 (14:01 -0700)]
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
David Woodhouse [Wed, 12 Jul 2006 20:56:53 +0000 (13:56 -0700)]
[SPARC64]: Fix make headers_install
A minor typo in the include/asm-sparc64/Kbuild file prevents the make
headers_install from building a useful tree of kernel headers for
sparc64.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Tom "spot" Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Andrew Morton [Mon, 10 Jul 2006 22:28:54 +0000 (15:28 -0700)]
[SPARC64]: of_device_register() error checking fix
device_create_file() can fail. This causes the sparc64 compile to
fail when my fanatical __must_check patch is applied, due to -Werror.
[ Added necessary identical fix for sparc32. -DaveM]
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Thu, 13 Jul 2006 04:19:42 +0000 (21:19 -0700)]
Merge commit /linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[NET]: fix __sk_stream_mem_reclaim
[Bluetooth] Fix deadlock in the L2CAP layer
[Bluetooth] Let BT_HIDP depend on INPUT
[Bluetooth] Avoid NULL pointer dereference with tty->driver
[Bluetooth] Remaining transitions to use kzalloc()
[WAN]: converting generic HDLC to use netif_dormant*()
[IPV4]: Fix error handling for fib_insert_node call
[NETROM] lockdep: fix false positive
[ROSE] lockdep: fix false positive
[AX.25]: Optimize AX.25 socket list lock
[IPCOMP]: Fix truesize after decompression
[IPV6]: Use ipv6_addr_src_scope for link address sorting.
[TCP] tcp_highspeed: Fix AI updates.
[MAINTAINERS]: Add proper entry for TC classifier
[NETROM]: Drop lock before calling nr_destroy_socket
[NETROM]: Fix locking order when establishing a NETROM circuit.
[AX.25]: Fix locking of ax25 protocol function list.
[IPV6]: order addresses by scope
Linus Torvalds [Thu, 13 Jul 2006 04:19:23 +0000 (21:19 -0700)]
Merge commit /linux/kernel/git/gregkh/i2c-2.6 of HEAD
* HEAD:
[PATCH] hwmon: Documentation update for abituguru
[PATCH] hwmon: Fix for first generation Abit uGuru chips
[PATCH] hwmon: New maintainer for w83791d
[PATCH] pca9539: Honor the force parameter
[PATCH] i2c-algo-bit: Wipe out dead code
[PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
[PATCH] i2c: New mailing list
[PATCH] i2c-ite: Plan for removal
[PATCH] i2c-powermac: Fix master_xfer return value
[PATCH] scx200_acb: Fix the block transactions
[PATCH] scx200_acb: Fix the state machine
[PATCH] i2c-iop3xx: Avoid addressing self
[PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core
Linus Torvalds [Thu, 13 Jul 2006 04:19:06 +0000 (21:19 -0700)]
Merge commit /linux/kernel/git/gregkh/driver-2.6 of HEAD
* HEAD:
[PATCH] The scheduled unexport of insert_resource
[PATCH] remove kernel/power/pm.c:pm_unregister_all()
[PATCH] Driver core: bus.c cleanups
[PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
[PATCH] Driver core: fix driver-core kernel-doc
Linus Torvalds [Thu, 13 Jul 2006 04:17:41 +0000 (21:17 -0700)]
Merge commit /linux/kernel/git/gregkh/pci-2.6 of HEAD
* HEAD:
[PATCH] PCI: PCIE power management quirk
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
Linus Torvalds [Thu, 13 Jul 2006 04:16:52 +0000 (21:16 -0700)]
Merge commit /linux/kernel/git/gregkh/usb-2.6 of HEAD
* HEAD: (44 commits)
[PATCH] USB: move usb-serial.h to include/linux/usb/
[PATCH] USB: Anydata: Fixes wrong URB callback.
[PATCH] USB: gadget section fixups
[PATCH] USB: another unusual device
[PATCH] USB: Add one VID/PID to ftdi_sio
[PATCH] USB: unusual_devs entry for Sony DSC-H5
[PATCH] USB: unusual_devs entry for Nokia E61
[PATCH] USB: unusual_devs entry for Nokia N91
[PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
[PATCH] USB: Option driver: new product ID
[PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
[PATCH] USB: ipw.c driver fix
[PATCH] USB: remove devfs information from Kconfig
[PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
[PATCH] USB: ipaq.c timing parameters
[PATCH] USB: ipaq.c bugfixes
[PATCH] USB: ehci: fix bogus alteration of a local variable
[PATCH] USB: add driver for non-composite Sierra Wireless devices
[PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd
[PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci
...
Linus Torvalds [Thu, 13 Jul 2006 04:16:32 +0000 (21:16 -0700)]
Merge commit /linux/kernel/git/gregkh/w1-2.6 of HEAD
* HEAD:
[PATCH] w1: remove drivers/w1/w1.h
[PATCH] w1: fix idle check loop in ds2482
[PATCH] W1: remove w1 mail list from lm_sensors.
Linus Torvalds [Thu, 13 Jul 2006 04:04:16 +0000 (21:04 -0700)]
Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available"
This reverts commit
5040cb8b7e61b7a03e8837920b9eb2c839bb1947.
It breaks previously working ide-cs PIO configurations, causing problems
like
ide2: I/O resource 0xF883200E-0xF883200E not free.
ide2: ports already in use, skipping probe
rather than a working kernel.
Cc: Thomas Kleffel <tk@maintech.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Len Brown [Thu, 13 Jul 2006 02:46:42 +0000 (22:46 -0400)]
[PATCH] Revert "ACPI: execute Notify() handlers on new thread"
This effectively reverts commit
b8d35192c55fb055792ff0641408eaaec7c88988
by reverts acpi_os_queue_for_execution() to what it was before that,
except it changes the name to acpi_os_execute() to match ACPICA
20060512.
Signed-off-by: Len Brown <len.brown@intel.com>
[ The thread execution doesn't actually solve the bug it set out to
solve (see
http://bugzilla.kernel.org/show_bug.cgi?id=5534
for more details) because the new events can get caught behind the AML
semaphore or other serialization. And when that happens, the notify
threads keep on piling up until the system dies. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ian McDonald [Thu, 13 Jul 2006 00:58:53 +0000 (17:58 -0700)]
[NET]: fix __sk_stream_mem_reclaim
__sk_stream_mem_reclaim is only called by sk_stream_mem_reclaim.
As such the check on sk->sk_forward_alloc is not needed and can be
removed.
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Wed, 12 Jul 2006 23:32:16 +0000 (16:32 -0700)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] sky2: optimize receive restart
[PATCH] sky2: PHY power on delays
[PATCH] sky2: NAPI suspend/resume of dual port cards
[PATCH] sky2: sky2_reset section mismatch
[PATCH] sk98lin: fix truncated collision threshold mask
[PATCH] skge: fix truncated collision threshold mask
[PATCH] sky2: fix truncated collision threshold mask
[PATCH] myri10ge return value fix
[PATCH] Update smc91x driver with ARM Versatile board info
[PATCH] ixgb: fix tx unit hang - properly calculate desciptor count
[PATCH] smsc-ircc2: fix section reference mismatches
[PATCH] 8139cp.c printk fix
[PATCH] s2io driver irq fix
[PATCH] e1000: irq naming update
[PATCH] forcedeth: watermark fixup
[PATCH] forcedeth: deferral fixup
[PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context
[PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
Adrian Bunk [Fri, 30 Jun 2006 09:15:42 +0000 (02:15 -0700)]
[PATCH] The scheduled unexport of insert_resource
Implement the scheduled unexport of insert_resource.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Adrian Bunk [Fri, 30 Jun 2006 09:15:43 +0000 (02:15 -0700)]
[PATCH] remove kernel/power/pm.c:pm_unregister_all()
Remove the deprecated and no longer used pm_unregister_all().
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Adrian Bunk [Mon, 26 Jun 2006 20:26:56 +0000 (22:26 +0200)]
[PATCH] Driver core: bus.c cleanups
This patch contains the following cleanups:
- make the needlessly global bus_subsys static
- #if 0 the unused find_bus()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henrik Kretzschmar [Tue, 4 Jul 2006 22:53:19 +0000 (00:53 +0200)]
[PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
Corrects the kerneldocs for device_create() and device_destroy()
with an eye on coding style, grammar and readability.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Randy Dunlap [Thu, 22 Jun 2006 22:14:07 +0000 (15:14 -0700)]
[PATCH] Driver core: fix driver-core kernel-doc
Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'class'
Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'devt'
Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:626): No description found for parameter 'devt'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kristen Carlson Accardi [Wed, 12 Jul 2006 15:59:00 +0000 (08:59 -0700)]
[PATCH] PCI: PCIE power management quirk
When changing power states from D0->DX and then from DX->D0, some
Intel PCIE chipsets will cause a device reset to occur. This will
cause problems for any D State other than D3, since any state
information that the driver will expect to be present coming from
a D1 or D2 state will have been cleared. This patch addes a
flag to the pci_dev structure to indicate that devices should
not use states D1 or D2, and will set that flag for the affected
chipsets. This patch also modifies pci_set_power_state() so that
when a device driver tries to set the power state on
a device that is downstream from an affected chipset, or on one
of the affected devices it only allows state changes to or
from D0 & D3. In addition, this patch allows the delay time
between D3->D0 to be changed via a quirk. These chipsets also
need additional time to change states beyond the normal 10ms.
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Zhang, Yanmin [Wed, 12 Jul 2006 01:41:47 +0000 (09:41 +0800)]
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
Add new defines of PCI-Express AER registers and their bits into file
include/linux/pci_regs.h.
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Matthew Garrett [Fri, 30 Jun 2006 09:31:25 +0000 (02:31 -0700)]
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
Some VIA southbridges contain a flag in the ACPI register space that
indicates whether an abnormal poweroff has occured, presumably with the
intention that it can be cleared on clean shutdown. Some BIOSes check this
flag at resume time, and will re-POST the system rather than jump back to
the OS if it's set. Clearing it at boot time appears to be sufficient.
I'm not sure if drivers/pci/quirks.c is the right place to do it, but I'm
not sure where would be cleaner.
[akpm@osdl.org: cleanups, build fix]
Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Greg KH <greg@kroah.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Yu, Luming" <luming.yu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Adrian Bunk [Wed, 28 Jun 2006 16:54:33 +0000 (18:54 +0200)]
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
This patch adds a proper prototype for pcibios_sort() in
arch/i386/pci/pci.h.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Wed, 12 Jul 2006 04:22:58 +0000 (21:22 -0700)]
[PATCH] USB: move usb-serial.h to include/linux/usb/
USB serial outside of the kernel tree can not build properly due to
usb-serial.h being buried down in the source tree. This patch moves the
location of the file to include/linux/usb and fixes up all of the usb
serial drivers to handle the move properly.
Cc: Sergei Organov <osv@javad.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Luiz Fernando N. Capitulino [Tue, 11 Jul 2006 17:19:25 +0000 (14:19 -0300)]
[PATCH] USB: Anydata: Fixes wrong URB callback.
Anydata is using usb_serial_generic_write_bulk_callback() for its
read URB, but it should use usb_serial_generic_read_bulk_callback()
instead (it's a read URB, isn't it?).
Reported by Jon K Hellan <hellan@acm.org>.
Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
David Brownell [Thu, 6 Jul 2006 22:48:53 +0000 (15:48 -0700)]
[PATCH] USB: gadget section fixups
Recent section changes broke gadget builds on some platforms. This patch
is the best fix that's available until better section markings exist:
- There's a lot of cleanup code that gets used in both init and exit paths;
stop marking it as "__exit".
(Best fix for this would be an "__init_or_exit" section marking, putting
the cleanup in __init when __exit sections get discarded else in __exit.)
- Stop marking the use-once probe routines as "__init" since references
to those routines are not allowed from driver structures. They're now
marked "__devinit", which in practice is a net lose.
(Best fix for this is likely to separate such use-once probe routines
from the driver structure ... but in general, all busses that aren't
hotpluggable will be forced to waste memory for all probe-only code.)
In general these broken section rules waste an average of two to four kBytes
per driver of code bloat ... because none of the relevant code can ever be
reused after module initialization.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Phil Dibowitz [Tue, 4 Jul 2006 19:46:43 +0000 (12:46 -0700)]
[PATCH] USB: another unusual device
Please add the attached device to unusual_devs.h.
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Colin Leroy [Tue, 11 Jul 2006 09:36:43 +0000 (11:36 +0200)]
[PATCH] USB: Add one VID/PID to ftdi_sio
This patch adds the Testo USB interface to the list of devices
recognized by the ftdi_sio module. This device is based on a FT232BL
chip, and is used as an interface to get data from digital sensors
(thermometer, etc). See http://www.testo.com/
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Lars Jacob [Mon, 10 Jul 2006 15:53:58 +0000 (11:53 -0400)]
[PATCH] USB: unusual_devs entry for Sony DSC-H5
This patch (as749) extends the unusual_devs entry for the Sony DSC-T1 and
T5 to cover the H5 as well.
From: Lars Jacob <jacob.lars@googlemail.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern [Mon, 10 Jul 2006 15:51:12 +0000 (11:51 -0400)]
[PATCH] USB: unusual_devs entry for Nokia E61
This patch (as748) adds an unusual_devs entry for the Nokia E61 mobile
phone.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern [Fri, 7 Jul 2006 17:45:13 +0000 (13:45 -0400)]
[PATCH] USB: unusual_devs entry for Nokia N91
This patch (as745) adds an unusual_devs entry for the Nokia N91, just like
the entry for the N80 added a couple of weeks ago. Apparently Nokia isn't
using very good firmware these days...
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Streetman [Wed, 5 Jul 2006 23:17:27 +0000 (19:17 -0400)]
[PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
I just got a "ZyXEL Prestige USB Adapter" that is actually RTL8150
adapter. Here is the relevant /proc/bus/usb/devices output (after
adding the vendor/product IDs to the driver):
T: Bus=01 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#=119 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
P: Vendor=0586 ProdID=401a Rev= 1.00
S: Manufacturer=ZyXEL
S: Product=Prestige USB Adapter
S: SerialNumber=1027
C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=120mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=ff Driver=rtl8150
E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=1ms
This patch adds the ZyXEL vendor ID to the rtl8150.c driver. The
device has absolutely no identifying marks on the outside for model
type, just a serial number, and I can't find anything on ZyXEL's
website, so I called the product ID PRODUCT_ID_PRESTIGE to match the
product string.
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Acked-by: <petkan@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Matthias Urlichs [Thu, 6 Jul 2006 11:12:53 +0000 (13:12 +0200)]
[PATCH] USB: Option driver: new product ID
Yet another "same name, somewhat different hardware" product.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Navaho Gunleg [Fri, 30 Jun 2006 07:44:03 +0000 (09:44 +0200)]
[PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
This patch is to get the WiseGroup.,Ltd SmartJoy Dual Plus PS2-to-USB
Adapter [0x6677:0x8802] correctly detected. It sets the NOGET and
MULTI_INPUT quirks to make 2 joystick nodes appear in stead of only
one.
(As of yet, only confirmed working by myself.)
Signed-off-by: Navaho Gunleg <navahogunleg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bart Oldeman [Sun, 2 Jul 2006 03:07:10 +0000 (15:07 +1200)]
[PATCH] USB: ipw.c driver fix
The below patch fixes the ipw module in kernel 2.6.17 for me; without
this change it simply does not work at all (all but the first writes are
refused because write_urb_busy is always 1).
This problem was there in 2.6.15 as well, but at that point I used the
(updated) ipw.c, version 0.4, from
http://www.neology.co.za/products/opensource/ipwireless/ which no longer
compiles with 2.6.17. It can be made to after a few changes but
obviously it's easier if the built-in ipw driver works instead of having
to download one from the neology site.
From: Bart Oldeman <bartoldeman@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michal Piotrowski [Mon, 3 Jul 2006 12:20:39 +0000 (14:20 +0200)]
[PATCH] USB: remove devfs information from Kconfig
Devfs is gone. We can remove that information.
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Christoph Lameter [Fri, 30 Jun 2006 09:34:47 +0000 (02:34 -0700)]
[PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
Remove destructor and call kmem_cache_create with NULL for the destructor.
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Frank Gevaerts [Fri, 30 Jun 2006 09:34:45 +0000 (02:34 -0700)]
[PATCH] USB: ipaq.c timing parameters
Adds configurable waiting periods to the ipaq connection code. These are
not needed when the pocketpc device is running normally when plugged in,
but they need extra delays if they are physically connected while
rebooting.
There are two parameters :
* initial_wait : this is the delay before the driver attemts to start the
connection. This is needed because the pocktpc device takes much
longer to boot if the driver starts sending control packets too soon.
* connect_retries : this is the number of times the control urb is
retried before finally giving up. The patch also adds a 1 second delay
between retries.
I'm not sure if the cases where this patch is useful are general enough
to include this in the kernel.
Signed-off-by: Frank Gevaerts <frank.gevaerts@fks.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Frank Gevaerts [Fri, 30 Jun 2006 09:34:44 +0000 (02:34 -0700)]
[PATCH] USB: ipaq.c bugfixes
This patch fixes several problems in the ipaq.c driver with connecting
and disconnecting pocketpc devices:
* The read urb stayed active if the connect failed, causing nullpointer
dereferences later on.
* If a write failed, the driver continued as if nothing happened. Now it
handles that case the same way as other usb serial devices (fix by
Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>)
Signed-off-by: Frank Gevaerts <frank.gevaerts@fks.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>