litmus-rt.git/arch, branch v2.6.31-rc1

Revert "PCI: use ACPI _CRS data by default"

2009-06-24T23:23:03+00:00

This reverts commit 9e9f46c44e487af0a82eb61b624553e2f7118f5b.

Quoting from the commit message:

 "At this point, it seems to solve more problems than it causes, so let's
  try using it by default.  It's an easy revert if it ends up causing
  trouble."

And guess what? The _CRS code causes trouble.

Signed-off-by: Linus Torvalds

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2009-06-24T17:47:38+00:00

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  Staging: octeon-ethernet: Fix race freeing transmit buffers.
  Staging: octeon-ethernet: Convert to use net_device_ops.
  MIPS: Cavium: Add CPU hotplugging code.
  MIPS: SMP: Allow suspend and hibernation if CPU hotplug is available
  MIPS: Add arch generic CPU hotplug
  DMA: txx9dmac: use dma_unmap_single if DMA_COMPL_{SRC,DEST}_UNMAP_SINGLE set
  MIPS: Sibyte: Fix build error if CONFIG_SERIAL_SB1250_DUART is undefined.
  MIPS: MIPSsim: Fix build error if MSC01E_INT_BASE is undefined.
  MIPS: Hibernation: Remove SMP TLB and cacheflushing code.
  MIPS: Build fix - include  into all smp_processor_id() users.
  MIPS: bug.h Build fix - include .

MIPS: Cavium: Add CPU hotplugging code.

2009-06-24T17:34:40+00:00

Thanks to Cavium Inc. for the code contribution and help.

Signed-off-by: Ralf Baechle

MIPS: SMP: Allow suspend and hibernation if CPU hotplug is available

2009-06-24T17:34:40+00:00

The SMP implementation of suspend and hibernate depends on CPU hotplugging.
In the past we didn't have CPU hotplug so suspend and hibernation were not
possible on SMP systems.

Signed-off-by: Ralf Baechle

MIPS: Add arch generic CPU hotplug

2009-06-24T17:34:40+00:00

Each platform has to add support for CPU hotplugging itself by providing
suitable definitions for the cpu_disable and cpu_die of the smp_ops
methods and setting SYS_SUPPORTS_HOTPLUG_CPU.  A platform should only set
SYS_SUPPORTS_HOTPLUG_CPU once all it's smp_ops definitions have the
necessary changes.  This patch contains the changes to the dummy smp_ops
definition for uni-processor systems.

Parts of the code contributed by Cavium Inc.

Signed-off-by: Ralf Baechle

MIPS: Sibyte: Fix build error if CONFIG_SERIAL_SB1250_DUART is undefined.

2009-06-24T17:34:39+00:00

This fixes kernel.org bugzilla 13596, see
http://bugzilla.kernel.org/show_bug.cgi?id=13596

Reported-by: dvice_null@yahoo.com

Signed-off-by: Ralf Baechle

MIPS: MIPSsim: Fix build error if MSC01E_INT_BASE is undefined.

2009-06-24T17:34:39+00:00

This fixes kernel.org bugzilla 13595, see
http://bugzilla.kernel.org/show_bug.cgi?id=13595

Reported-by: dvice_null@yahoo.com

Signed-off-by: Ralf Baechle

MIPS: Hibernation: Remove SMP TLB and cacheflushing code.

2009-06-24T17:34:39+00:00

We can't perform any flushes on SMP from swsusp_arch_resume because
interrupts are disabled.  A cross-CPU flush is unnecessary anyway
because all but the local CPU have already been disabled.  A local
flush is not needed either because we didn't change any mappings.  So
just delete the code.

Signed-off-by: Ralf Baechle

MIPS: Build fix - include into all smp_processor_id() users.

2009-06-24T17:34:39+00:00

Some of the were relying into smp.h being dragged in by another header
which of course is fragile.   uses smp_processor_id()
only in macros and including smp.h there leads to an include loop, so
don't change cpu-info.h.

Signed-off-by: Ralf Baechle

MIPS: bug.h Build fix - include .

2009-06-24T17:34:38+00:00

In the past this file somehow used to be dragged in.

Signed-off-by: Ralf Baechle