GitHub/MotorolaMobilityLLC/kernel-slsi.git
17 years ago[MIPS] Fix invalid semicolon after if statement
Ilpo Järvinen [Wed, 15 Aug 2007 22:03:01 +0000 (01:03 +0300)]
[MIPS] Fix invalid semicolon after if statement

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update Cobalt defconfig
Yoichi Yuasa [Tue, 7 Aug 2007 14:20:21 +0000 (23:20 +0900)]
[MIPS] Update Cobalt defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update workpad_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:34:52 +0000 (20:34 +0900)]
[MIPS] Update workpad_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update tb0287_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:33:54 +0000 (20:33 +0900)]
[MIPS] Update tb0287_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update tb0226_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:32:47 +0000 (20:32 +0900)]
[MIPS] Update tb0226_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update tb0219_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:31:35 +0000 (20:31 +0900)]
[MIPS] Update tb0219_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update mpc30x_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:30:21 +0000 (20:30 +0900)]
[MIPS] Update mpc30x_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update e55_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:29:02 +0000 (20:29 +0900)]
[MIPS] Update e55_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update capcella_defconfig
Yoichi Yuasa [Tue, 14 Aug 2007 11:27:47 +0000 (20:27 +0900)]
[MIPS] Update capcella_defconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] IP22: Fix modpost warning.
Ralf Baechle [Mon, 13 Aug 2007 11:47:17 +0000 (12:47 +0100)]
[MIPS] IP22: Fix modpost warning.

  MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0xc70): Section mismatch: reference to .init.text:add_memory_region (between 'probe_memory' and 'enable_local0_irq')

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Gcc 3.3 build fixes.
Ralf Baechle [Mon, 13 Aug 2007 11:44:41 +0000 (12:44 +0100)]
[MIPS] Gcc 3.3 build fixes.

Work around gcc 3.3's unability to evaluate that certain expressions indeed
are constant.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] MT: Use kallsyms in CPU state dump
Ralf Baechle [Fri, 10 Aug 2007 17:30:57 +0000 (18:30 +0100)]
[MIPS] MT: Use kallsyms in CPU state dump

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] MIPSsim: Delete old file that survived moving around in the tree.
Ralf Baechle [Tue, 7 Aug 2007 17:40:06 +0000 (18:40 +0100)]
[MIPS] MIPSsim: Delete old file that survived moving around in the tree.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] unwind_stack should return a value ...
Ralf Baechle [Tue, 7 Aug 2007 16:30:58 +0000 (17:30 +0100)]
[MIPS] unwind_stack should return a value ...

And gcc 3.4 doesn't even warn out this, grrr.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SMTC: Fix crash on bootup with idebus= command line argument.
Ralf Baechle [Tue, 7 Aug 2007 16:18:28 +0000 (17:18 +0100)]
[MIPS] SMTC: Fix crash on bootup with idebus= command line argument.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Fix build error if CONFIG_KALLSYMS is undefined.
Ralf Baechle [Tue, 7 Aug 2007 14:02:55 +0000 (15:02 +0100)]
[MIPS] Fix build error if CONFIG_KALLSYMS is undefined.

  CC      arch/mips/kernel/traps.o
arch/mips/kernel/traps.c: In function 'show_backtrace':
arch/mips/kernel/traps.c:110: warning: unused variable 'ra'

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Excite: disable 64-bit kernel support.
Ralf Baechle [Tue, 7 Aug 2007 13:55:47 +0000 (14:55 +0100)]
[MIPS] Excite: disable 64-bit kernel support.

  CC      arch/mips/basler/excite/excite_prom.o
arch/mips/basler/excite/excite_prom.c:136:3: #error 64 bit support not implemented

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Kconfig: Fix configuration warning by hardwiring HOTPLUG_CPU to n.
Ralf Baechle [Tue, 7 Aug 2007 13:52:17 +0000 (14:52 +0100)]
[MIPS] Kconfig: Fix configuration warning by hardwiring HOTPLUG_CPU to n.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update a few defconfigs.
Ralf Baechle [Tue, 7 Aug 2007 12:05:27 +0000 (13:05 +0100)]
[MIPS] Update a few defconfigs.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SMTC: Move MIPS_CPU_IPI_IRQ definition into header.
Ralf Baechle [Mon, 6 Aug 2007 15:35:23 +0000 (16:35 +0100)]
[MIPS] SMTC: Move MIPS_CPU_IPI_IRQ definition into header.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Malta: Include <linux/irq.h for cp0_compare_irq / cp0_perfcount_irq.
Ralf Baechle [Mon, 6 Aug 2007 15:32:20 +0000 (16:32 +0100)]
[MIPS] Malta: Include <linux/irq.h for cp0_compare_irq / cp0_perfcount_irq.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SMP: Scatter __cpuinit over the code as needed.
Ralf Baechle [Mon, 6 Aug 2007 13:02:12 +0000 (14:02 +0100)]
[MIPS] SMP: Scatter __cpuinit over the code as needed.

MIPS doesn't do CPU hotplugging yet but since many of the functions don't
even have an __init let's fix this right.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SEAD: Don't mark as experimental.
Ralf Baechle [Mon, 6 Aug 2007 09:02:07 +0000 (10:02 +0100)]
[MIPS] SEAD: Don't mark as experimental.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] remove unused marvell.h
Yoichi Yuasa [Sat, 4 Aug 2007 14:35:47 +0000 (23:35 +0900)]
[MIPS] remove unused marvell.h

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] remove unused gt64240.h
Yoichi Yuasa [Sat, 4 Aug 2007 14:34:17 +0000 (23:34 +0900)]
[MIPS] remove unused gt64240.h

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SNI: remove unused pcimt_scache.c
Yoichi Yuasa [Sat, 4 Aug 2007 14:26:53 +0000 (23:26 +0900)]
[MIPS] SNI: remove unused pcimt_scache.c

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SNI: Remove unneeded sni_machine_halt
Yoichi Yuasa [Sat, 4 Aug 2007 14:24:51 +0000 (23:24 +0900)]
[MIPS] SNI: Remove unneeded sni_machine_halt

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Remove dead code from irq_txx9.c
Atsushi Nemoto [Fri, 3 Aug 2007 14:33:38 +0000 (23:33 +0900)]
[MIPS] Remove dead code from irq_txx9.c

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Do not discard extra debugging sections.
Daniel Jacobowitz [Fri, 3 Aug 2007 15:43:01 +0000 (11:43 -0400)]
[MIPS] Do not discard extra debugging sections.

Leaving these sections is useful to some tools that look at the image, and
none of them are loaded into memory.  The .mdebug.abi64 section, in
particular, lets GDB recognize vmlinux.32 as an N64 program instead of
guessing that it is O32.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Update defconfigs for TX39/TX49
Atsushi Nemoto [Thu, 2 Aug 2007 14:36:26 +0000 (23:36 +0900)]
[MIPS] Update defconfigs for TX39/TX49

Update defconfigs, disabling CONFIG_EXPERIMENTAL.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Use -Werror on TX39/TX49 boards
Atsushi Nemoto [Thu, 2 Aug 2007 14:36:17 +0000 (23:36 +0900)]
[MIPS] Use -Werror on TX39/TX49 boards

Now these directories can be built cleanly.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Drop unneeded config options for RBTX4938
Atsushi Nemoto [Thu, 2 Aug 2007 14:36:11 +0000 (23:36 +0900)]
[MIPS] Drop unneeded config options for RBTX4938

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Cleanup TX39/TX49 irq code
Atsushi Nemoto [Thu, 2 Aug 2007 14:36:02 +0000 (23:36 +0900)]
[MIPS] Cleanup TX39/TX49 irq code

Cleanup jmr3927, tx4927 and tx4938 irq codes, using common IRQ_CPU,
I8259 and IRQ_TXX9 irq routines.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] The irq_chip for TX39/TX49 SoCs
Atsushi Nemoto [Thu, 2 Aug 2007 14:35:53 +0000 (23:35 +0900)]
[MIPS] The irq_chip for TX39/TX49 SoCs

Add generic irq_chip for TX39/TX49 SoCs.  This can be replace
jmr3927_irq_irc, tx4927_irq_pic_type and tx4938_irq_pic_type.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART
Ralf Baechle [Thu, 2 Aug 2007 11:08:32 +0000 (12:08 +0100)]
[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART

This is needed since the Sibyte serial driver was exchanged.

Issue report by Imre Kaloz <kaloz@openwrt.org>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Fix au1xxx_gpio_direction_* return value
Yoichi Yuasa [Thu, 2 Aug 2007 03:48:00 +0000 (12:48 +0900)]
[MIPS] Fix au1xxx_gpio_direction_* return value

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Remove unused pnx8550 Kconfig
Yoichi Yuasa [Thu, 2 Aug 2007 03:44:44 +0000 (12:44 +0900)]
[MIPS] Remove unused pnx8550 Kconfig

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Kconfig: Enable 64BIT_PHYS_ADDR only through select.
Ralf Baechle [Wed, 1 Aug 2007 23:36:08 +0000 (00:36 +0100)]
[MIPS] Kconfig: Enable 64BIT_PHYS_ADDR only through select.

The user should not have to have any clue about this setting.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] SMTC: Fix secondary VPE interrupt mask initialization.
Ralf Baechle [Wed, 1 Aug 2007 18:42:37 +0000 (19:42 +0100)]
[MIPS] SMTC: Fix secondary VPE interrupt mask initialization.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Compute PGD_ORDER from the select page size.
Ralf Baechle [Wed, 1 Aug 2007 14:46:18 +0000 (15:46 +0100)]
[MIPS] Compute PGD_ORDER from the select page size.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Extract {PGD,PMD,PTE}_ORDER into asm-offset.h
Ralf Baechle [Wed, 1 Aug 2007 14:27:36 +0000 (15:27 +0100)]
[MIPS] Extract {PGD,PMD,PTE}_ORDER into asm-offset.h

For debugging purposes only.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Fix computation of {PGD,PMD,PTE}_T_LOG2.
Ralf Baechle [Wed, 1 Aug 2007 14:25:28 +0000 (15:25 +0100)]
[MIPS] Fix computation of {PGD,PMD,PTE}_T_LOG2.

For the generation of asm-offset.h to work these need to be evaulatable
by gcc as a constant expression.  This issue did exist for a while but
didn't bite because they're only in asm-offset.h for debugging purposes.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years ago[MIPS] Fix computation of PGDIR_SHIFT for 16K pagesize on 32-bit kernels.
Ralf Baechle [Tue, 31 Jul 2007 20:47:03 +0000 (21:47 +0100)]
[MIPS] Fix computation of PGDIR_SHIFT for 16K pagesize on 32-bit kernels.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
17 years agosched: s/sched_latency/sched_min_granularity
Ingo Molnar [Sat, 25 Aug 2007 20:17:19 +0000 (22:17 +0200)]
sched: s/sched_latency/sched_min_granularity

runtime limit and wakeup granularity used to be a function of
granularity and that was incorrect changed to sched_latency.

Fix this to make wakeup granularity a function of min-granularity,
and the runtime limit equal to latency.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
Linus Torvalds [Sat, 25 Aug 2007 18:25:29 +0000 (11:25 -0700)]
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: cleanup, sched_granularity -> sched_min_granularity
  sched: adaptive scheduler granularity
  sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls

17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
Linus Torvalds [Sat, 25 Aug 2007 18:24:53 +0000 (11:24 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: Add ref-counting for sbp2 orbs (fix command abortion)
  firewire: fix unloading of fw-ohci while devices are attached
  ieee1394: sbp2: fix sbp2_remove_device for error cases

17 years agosched: cleanup, sched_granularity -> sched_min_granularity
Ingo Molnar [Sat, 25 Aug 2007 16:41:53 +0000 (18:41 +0200)]
sched: cleanup, sched_granularity -> sched_min_granularity

due to adaptive granularity scheduling the role of sched_granularity
has changed to "minimum granularity", so rename the variable (and the
tunable) accordingly.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
17 years agosched: adaptive scheduler granularity
Peter Zijlstra [Sat, 25 Aug 2007 16:41:53 +0000 (18:41 +0200)]
sched: adaptive scheduler granularity

Instead of specifying the preemption granularity, specify the wanted
latency. By fixing the granlarity to a constany the wakeup latency
it a function of the number of running tasks on the rq.

Invert this relation.

sysctl_sched_granularity becomes a minimum for the dynamic granularity
computed from the new sysctl_sched_latency.

Then use this latency to do more intelligent granularity decisions: if
there are fewer tasks running then we can schedule coarser. This helps
performance while still always keeping the latency target.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agosched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls
Peter Zijlstra [Sat, 25 Aug 2007 16:41:52 +0000 (18:41 +0200)]
sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls

Make the lockdep sysctls not depend on CONFIG_SCHED_DEBUG.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agofirewire: Add ref-counting for sbp2 orbs (fix command abortion)
Kristian Høgsberg [Fri, 24 Aug 2007 22:59:58 +0000 (18:59 -0400)]
firewire: Add ref-counting for sbp2 orbs (fix command abortion)

This handles the case where we get the status write before getting the
complete_transaction callback ("status write for unknown orb").  In
this case, we just assume that the initial orb pointer transaction
succeeded and finish the orb.  To prevent the transaction callback
from touching freed memory, we ref-count the orb structures.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agofirewire: fix unloading of fw-ohci while devices are attached
Stefan Richter [Mon, 20 Aug 2007 23:05:14 +0000 (01:05 +0200)]
firewire: fix unloading of fw-ohci while devices are attached

Fix panic in run_timer_softirq right after "modprobe -r firewire-ohci"
if a FireWire disk was attached and firewire-sbp2 loaded.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: sbp2: fix sbp2_remove_device for error cases
Stefan Richter [Sat, 11 Aug 2007 09:51:16 +0000 (11:51 +0200)]
ieee1394: sbp2: fix sbp2_remove_device for error cases

Bug found by Olaf Hering <olh@suse.de>:
sbp2util_remove_command_orb_pool requires a valid lu->hi pointer.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoMerge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
Linus Torvalds [Sat, 25 Aug 2007 15:01:53 +0000 (08:01 -0700)]
Merge branch 'agp-patches' of git://git./linux/kernel/git/airlied/agp-2.6

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: balance ioremap checks
  agp: Add device id for P4M900 to via-agp module
  efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()

17 years agoMerge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
Linus Torvalds [Sat, 25 Aug 2007 15:01:06 +0000 (08:01 -0700)]
Merge branch 'drm-patches' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: ioremap return value checks
  drm/via: Fix dmablit when blit queue is full
  drm_rmmap_ioctl(): remove dead code

17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Sat, 25 Aug 2007 14:59:59 +0000 (07:59 -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:
  myri10ge: update driver version to 1.3.2-1.269
  myri10ge: use pcie_get/set_readrq
  ehea: fix queue destructor
  ehea: fix module parameter description
  ehea: fix interface to DLPAR tools
  sgiseeq: Fix return type of sgiseeq_remove
  sky2 1.17
  sky2: only bring up watchdog if link is active
  sky2: clear PCI power control reg at startup
  DM9000: fix interface hang under load
  phy layer: fix genphy_setup_forced (don't reset)
  Don't use GFP_DMA for zone allocation.
  fix realtek phy id in forcedeth

17 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Sat, 25 Aug 2007 14:54:38 +0000 (07:54 -0700)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (30 commits)
  ACPI: work around duplicate name "VID" problem on T61
  acpiphp_ibm: add missing '\n' to error message
  ACPI: add dump_stack() to trace acpi_format_exception programming errors
  make drivers/acpi/scan.c:create_modalias() static
  ACPI: Fix a warning of discarding qualifiers from pointer target type
  ACPI: "ACPI handle has no context!" should be KERN_DEBUG
  ACPI video hotkey: export missing ACPI video hotkey events via input layer
  ACPI: Validate XSDT, use RSDT if XSDT fails
  ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such
  ACPI: fix ia64 allnoconfig build
  PNP: remove null pointer checks
  PNP: remove MODULE infrastructure
  ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG
  PNPACPI: remove unnecessary casts of "void *"
  PNPACPI: simplify irq_flags()
  PNP: fix up after Lindent
  ACPI: enable GPEs before calling _WAK on resume
  asus-laptop: Fix rmmod of asus_laptop
  sony-laptop: call sonypi_compat_init earlier
  sony-laptop: enable Vaio FZ events
  ...

17 years agodrm: ioremap return value checks
Scott Thompson [Sat, 25 Aug 2007 08:17:49 +0000 (18:17 +1000)]
drm: ioremap return value checks

Signed-off-by: Scott Thompson <postfail <at> hushmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
17 years agoagp: balance ioremap checks
Scott Thompson [Sat, 25 Aug 2007 08:14:00 +0000 (18:14 +1000)]
agp: balance ioremap checks

patchset against 2.6.23-rc3.
corrects missing ioremap return checks and balancing on iounmap calls, integrated changes per list
recommendations on the original set of patches..

Signed-off-by: Scott Thompson <postfail <at> hushmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
17 years agoagp: Add device id for P4M900 to via-agp module
Xavier Bachelot [Sat, 25 Aug 2007 08:10:52 +0000 (18:10 +1000)]
agp: Add device id for P4M900 to via-agp module

Signed-off-by: Dave Airlie <airlied@linux.ie>
17 years agomyri10ge: update driver version to 1.3.2-1.269
Brice Goglin [Fri, 24 Aug 2007 06:57:54 +0000 (08:57 +0200)]
myri10ge: update driver version to 1.3.2-1.269

Update myri10ge driver version to 1.3.2-1.269.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agomyri10ge: use pcie_get/set_readrq
Brice Goglin [Fri, 24 Aug 2007 06:57:17 +0000 (08:57 +0200)]
myri10ge: use pcie_get/set_readrq

Based on a patch from Peter Oruba, convert myri10ge to use pcie_get_readrq()
and pcie_set_readrq() instead of our own PCI calls and arithmetics.

These driver changes incorporate the proposed PCI-X / PCI-Express read byte
count interface.  Reading and setting those values doesn't take place
"manually", instead wrapping functions are called to allow quirks for some
PCI bridges.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off by: Peter Oruba <peter.oruba@amd.com>
Based on work by Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoehea: fix queue destructor
Jan-Bernd Themann [Wed, 22 Aug 2007 14:21:28 +0000 (16:21 +0200)]
ehea: fix queue destructor

Includes hcp_epas_dtor in eq/cq/qp destructors to unmap
HW register.

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoehea: fix module parameter description
Jan-Bernd Themann [Wed, 22 Aug 2007 14:21:24 +0000 (16:21 +0200)]
ehea: fix module parameter description

Update the module parameter description of "use_mcs" to
show correct default value

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoehea: fix interface to DLPAR tools
Jan-Bernd Themann [Wed, 22 Aug 2007 14:20:58 +0000 (16:20 +0200)]
ehea: fix interface to DLPAR tools

Userspace DLPAR tool expects decimal numbers to be written to
and read from sysfs entries.

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosgiseeq: Fix return type of sgiseeq_remove
Ralf Baechle [Wed, 22 Aug 2007 15:03:52 +0000 (16:03 +0100)]
sgiseeq: Fix return type of sgiseeq_remove

The driver remove method needs to return an int not void.  This was just
never noticed because usually this driver is not being built as a module.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosky2 1.17
Stephen Hemminger [Tue, 21 Aug 2007 21:34:04 +0000 (14:34 -0700)]
sky2 1.17

Mark new version to track if current driver is in use.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosky2: only bring up watchdog if link is active
Stephen Hemminger [Tue, 21 Aug 2007 21:34:03 +0000 (14:34 -0700)]
sky2: only bring up watchdog if link is active

This fixes the extra timer overhead that people were whining about
as a 2.6.23 regression.

Running the watchdog timer all the time is unneeded. Change it
to run only if link is up, and reduce frequency to save power.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosky2: clear PCI power control reg at startup
Stephen Hemminger [Tue, 21 Aug 2007 21:34:02 +0000 (14:34 -0700)]
sky2: clear PCI power control reg at startup

Make sure PCI register for PHY power gets cleared on boot, and make
sure to avoid any PCI posting problems.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoDM9000: fix interface hang under load
Florian Westphal [Mon, 20 Aug 2007 23:33:42 +0000 (01:33 +0200)]
DM9000: fix interface hang under load

When transferring data at full speed, the DM9000 network interface
sometimes stops sending/receiving data. Worse, ksoftirqd consumes
100% cpu and the net tx watchdog never triggers.
Fix by spin_lock_irqsave() in dm9000_start_xmit() to prevent the
interrupt handler from interfering.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agophy layer: fix genphy_setup_forced (don't reset)
Domen Puncer [Fri, 17 Aug 2007 06:54:45 +0000 (08:54 +0200)]
phy layer: fix genphy_setup_forced (don't reset)

Writing BMCR_RESET bit will reset MII_BMCR to default values. This is
clearly not what we want.

Signed-off-by: Domen Puncer <domen.puncer@telargo.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoDon't use GFP_DMA for zone allocation.
Ralf Baechle [Wed, 15 Aug 2007 11:53:16 +0000 (12:53 +0100)]
Don't use GFP_DMA for zone allocation.

IP32 doesn't even have a ZONE_DMA so no point in using GFP_DMA in any
IP32-specific device driver.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agofix realtek phy id in forcedeth
Willy Tarreau [Thu, 23 Aug 2007 19:35:41 +0000 (21:35 +0200)]
fix realtek phy id in forcedeth

As noticed by Chuck Ebbert, commit c5e3ae8823693b260ce1f217adca8add1bc0b3de
introduced a copy-paste typo, as realtek phy is 0x732 and not 0x1c1. Obvious
fix below suggested by Ayaz Abdulla.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Cc: Ayaz Abdulla <aabdulla@nvidia.com>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoPull bugzilla-8798 into release branch
Len Brown [Sat, 25 Aug 2007 06:24:03 +0000 (02:24 -0400)]
Pull bugzilla-8798 into release branch

17 years agoACPI: work around duplicate name "VID" problem on T61
Zhang Rui [Sat, 25 Aug 2007 06:23:31 +0000 (02:23 -0400)]
ACPI: work around duplicate name "VID" problem on T61

This can only fix the problem that more than one video bus device
have the same AML name "VID".
ie. the proc I/F for the second "VID" video bus device is located under
/proc/acpi/video/VID1/...

As this is really rare and the ACPI proc I/F is a legacy feature that
we are planning to remove.
We won't provide a generic solution for this problem.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoPull events into release branch
Len Brown [Sat, 25 Aug 2007 05:44:01 +0000 (01:44 -0400)]
Pull events into release branch

Conflicts:

drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoPull misc into release branch
Len Brown [Sat, 25 Aug 2007 05:40:27 +0000 (01:40 -0400)]
Pull misc into release branch

17 years agoacpiphp_ibm: add missing '\n' to error message
Jeremy Fitzhardinge [Sat, 25 Aug 2007 05:31:45 +0000 (01:31 -0400)]
acpiphp_ibm: add missing '\n' to error message

Add missing \n to error in ibm_find_acpi_device.

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Adrian Bunk <trivial@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoACPI: add dump_stack() to trace acpi_format_exception programming errors
Andrew Morton [Sat, 25 Aug 2007 05:28:20 +0000 (01:28 -0400)]
ACPI: add dump_stack() to trace acpi_format_exception programming errors

Dump the stack so we can find the secretive caller to acpi_format_exception().

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agomake drivers/acpi/scan.c:create_modalias() static
Adrian Bunk [Tue, 14 Aug 2007 21:22:35 +0000 (23:22 +0200)]
make drivers/acpi/scan.c:create_modalias() static

This patch makes the needlessly global create_modalias() static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoACPI: Fix a warning of discarding qualifiers from pointer target type
Al Viro [Tue, 21 Aug 2007 15:18:20 +0000 (16:18 +0100)]
ACPI: Fix a warning of discarding qualifiers from pointer target type

drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' discards qualifiers from pointer target type

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoACPI: "ACPI handle has no context!" should be KERN_DEBUG
Shaohua Li [Thu, 23 Aug 2007 07:01:13 +0000 (15:01 +0800)]
ACPI: "ACPI handle has no context!" should be KERN_DEBUG

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoPull suspend into release branch
Len Brown [Sat, 25 Aug 2007 05:36:18 +0000 (01:36 -0400)]
Pull suspend into release branch

17 years agoPull video into release branch
Len Brown [Sat, 25 Aug 2007 02:26:27 +0000 (22:26 -0400)]
Pull video into release branch

17 years agoPull thermal into release branch
Len Brown [Sat, 25 Aug 2007 02:26:19 +0000 (22:26 -0400)]
Pull thermal into release branch

17 years agoACPI video hotkey: export missing ACPI video hotkey events via input layer
Luming Yu [Mon, 20 Aug 2007 10:23:53 +0000 (18:23 +0800)]
ACPI video hotkey: export missing ACPI video hotkey events via input layer

Signed-off-by: Yu Luming <luming.yu@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoPull sony into release branch
Len Brown [Sat, 25 Aug 2007 02:20:31 +0000 (22:20 -0400)]
Pull sony into release branch

17 years agoPull pnp into release branch
Len Brown [Sat, 25 Aug 2007 02:20:22 +0000 (22:20 -0400)]
Pull pnp into release branch

17 years agoPull ec into release branch
Len Brown [Sat, 25 Aug 2007 02:19:44 +0000 (22:19 -0400)]
Pull ec into release branch

17 years agoPull bugzilla-8630 into release branch
Len Brown [Sat, 25 Aug 2007 02:19:20 +0000 (22:19 -0400)]
Pull bugzilla-8630 into release branch

17 years agoPull bugzilla-1641 into release branch
Len Brown [Sat, 25 Aug 2007 02:19:05 +0000 (22:19 -0400)]
Pull bugzilla-1641 into release branch

17 years agoPull battery into release branch
Len Brown [Sat, 25 Aug 2007 02:18:51 +0000 (22:18 -0400)]
Pull battery into release branch

17 years agoPull asus into release branch
Len Brown [Sat, 25 Aug 2007 02:18:44 +0000 (22:18 -0400)]
Pull asus into release branch

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
Linus Torvalds [Fri, 24 Aug 2007 23:11:13 +0000 (16:11 -0700)]
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: fix startup penalty calculation
  sched: simplify bonus calculation #2
  sched: simplify bonus calculation #1
  sched: tidy up and simplify the bonus balance
  sched: optimize task_tick_rt() a bit
  sched: simplify can_migrate_task()
  sched: remove HZ dependency from the granularity default
  sched: CONFIG_SCHED_GROUP_FAIR=y fixlet

17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
Linus Torvalds [Fri, 24 Aug 2007 23:10:56 +0000 (16:10 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Make sure AH=00h when setting a video mode
  [x86 setup] Volatilize asm() statements

17 years agoDM_MULTIPATH_RDAC: "scsi_normalize_sense" undefined
Randy Dunlap [Fri, 24 Aug 2007 22:35:15 +0000 (15:35 -0700)]
DM_MULTIPATH_RDAC: "scsi_normalize_sense" undefined

DM_MULTIPATH_RDAC uses SCSI API(s) and is for a SCSI device,
so add SCSI to its depends on to prevent build errors.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
[ Tested and Verified by Chandra Seetharaman ]
Acked-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoACPI: Validate XSDT, use RSDT if XSDT fails
Zhao Yakui [Fri, 24 Aug 2007 08:18:16 +0000 (16:18 +0800)]
ACPI: Validate XSDT, use RSDT if XSDT fails

ACPI 1.0 used an RSDT with 32-bit physical addresses.
ACPI 2.0 adds an XSDT with 32-bit physical addresses.
An ACPI 2.0 aware OS is supposed to use the XSDT
(when present) instead of the RSDT.

However, several systems have failed because the XSDT
contains NULL entries -- while it is missing pointers
to needed tables, such as SSDTs.

When we find an XSDT with NULL entries, discard it
and use the ACPI 1.0 RSDT instead.

http://bugzilla.kernel.org/show_bug.cgi?id=8630

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agoACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such
Pavel Machek [Fri, 24 Aug 2007 09:45:50 +0000 (11:45 +0200)]
ACPI: /proc/acpi/thermal_zone trip points are now read-only, mark them as such

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
17 years agosched: fix startup penalty calculation
Ingo Molnar [Fri, 24 Aug 2007 18:39:10 +0000 (20:39 +0200)]
sched: fix startup penalty calculation

fix task startup penalty miscalculation: sysctl_sched_granularity is
unsigned int and wait_runtime is long so we first have to convert it
to long before turning it negative ...

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agosched: simplify bonus calculation #2
Peter Zijlstra [Fri, 24 Aug 2007 18:39:10 +0000 (20:39 +0200)]
sched: simplify bonus calculation #2

current code:

 delta = calc_delta_mine(delta_exec, curr->load.weight, lw);
 delta = min((u64)delta, cfs_rq->sleeper_bonus);

Notice that this calc_delta_mine() line is exactly delta_mine, which
gives:

 delta = min((u64)delta_mine, cfs_rq->sleeper_bonus);

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agosched: simplify bonus calculation #1
Peter Zijlstra [Fri, 24 Aug 2007 18:39:10 +0000 (20:39 +0200)]
sched: simplify bonus calculation #1

current code:

 delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec);
 delta = calc_delta_mine(delta, curr->load.weight, lw);
 delta = min((u64)delta, cfs_rq->sleeper_bonus);

drop the first min(), because we clip against sleeper_bonus in the 3rd line
again. That gives:

 delta = calc_delta_mine(delta_exec, curr->load.weight, lw);
 delta = min((u64)delta, cfs_rq->sleeper_bonus);

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>