Patch from Catalin Marinas

The CType field in the cache type CP15 register does not always
specify whether the cache is VIVT or VIPT. The dump_cpu_info()
function should use the cache_is_(vivt|vipt) macros instead.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Catalin Marinas

The CPU Id register changed with the ARM1176 processor and the
ARMv6 architecture description field can be either 7 or 0xF.
This patch also detects the first byte of the part number since
0xF in the description field will also be used for future ARM
architectures.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Deepak Saxena

Add support for Intel's new IXP46x CPU family.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Catalin Marinas

CONFIG_FPE_NWFPE was enabled and CONFIG_FPE_FASTFPE disabled in the
(integrator|versatile)_defconfig files because the latter is only
available as a separate patch.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Dave Jiang

Update all IOP def configs to utilize the MTD physmap driver instead of IOP specific MTD maps driver.

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Dave Jiang

remove iop331-mm.c in arch/arm/mach-iop3xx

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Catalin Marinas

The Versatile/AB platform is defined as a MACH (not ARCH) in the
arch/arm/tools/mach-types file.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Catalin Marinas

CONFIG_ARCH_VERSATILE=y was added to the versatile_defconfig file.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Unfortunately the restoring of SPE state was causing data corruption
since we were restoring based on the size of the altivec context and not
the SPE context.  Also, fixed setting of last_task_used_spe on
start_thread, flush_thread, and exit_thread. 
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

It's "const volatile __iomem *". The "const" was missing.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

When adding or deleting from the source list make sure to find matches
by comparing against the new source address, not the group address.
Also, check each addr in the list rather than just the first one.
And, finally, only delete from list when there's a match rather than
vice-versa.  Drop the effort to keep list sorted, since it's not done
on full-state api and can create an sl_addr entry that the delta api
won't be able to delete. Without these fixes sl_count can be corrupted
which can allow for kernel memory corruption.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

- undo the pfm_context_free() call in pfm_handle_work().
  The logic is different. In the case of a controlling
  task exiting while monitored in pfm_handle_work. The
  context is freed in pfm_close() and not pfm_handle_work().
signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Andrew took the patch that created this, and Linus applied
it to his BK tree.  Remove my copy so that we can merge.
Signed-off-by: Tony Luck <tony.luck@intel.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

- fix pfm_force_terminate() to really cleanup the state.
  There was a bug affecting sessions which use
  PFM_FL_OVFL_BLOCK flag. It could lead to an assertion
  failure in pfm_load_regs() in the case where the
  owner of the session died unexpectedly. The fix is to
  do the full unload operation.

- simplifies the debug output in pfm_flush_pmds()

- simplifies the debug output in pfm_overflow_handler()

- fix a minor typos in a comment in pfm_flush().
signed-off-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Fix ZBOOT_ROM options help texts to describe what's going on there
bettwe.

Make ZBOOT_ROM depend on ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS being
different values.  This allows all*config-created configurations
to work where ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS were both zero.

emard<at>softhome!net discovered an embarrasing bug in dvb_net.c where
the NET_REMOVE_IF ioctl will cause an Oops when called with an invalid
interface number. 
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The hisax driver looks at dev_avm->irq before calling pci_enable_device(),
which means it requests the wrong IRQ.  This patch fixes it.

Thanks to Thorsten Doil for reporting the problem and testing the fix.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Avoid documenting something which isn't there.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add some configuration information to Documentation/rocket.txt that was
included with the external driver package.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I recently learnt that limiting RAM with by using only "mem=xxxM" is no
good on machines equipped with PCI.  In my case (vanilla 2.6.9) the cardbus
bridge on my laptop got mapped to the unused RAM area which resulted in
wierd errors due to the collision.

The right solution is to use "mem=" together with "memmap=" to mark the
unused RAM area reserved.

Henceforth I force the kernel to use 2016MiB by passing "mem=2016M
memmap=32M#2016M" instead of just "mem=2016M".
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

- av7110: fixed av7110_before_after_tune()/av7110_fe_lock_fix(): firmware >=
  261d: wait for empty message queue, firmware <= 261c: wait 50ms

- av7110: add __user and __iomem annotations, remove some unnecessary cast
  (patch by C.Y.M)

- av7110: __av7110_send_fw_cmd(): added some sanity checks suggested by
  Werner Fin

- av7110: added support for full-featured DVB-C cards: 13c2:0000 Siemens
  DVB-C (full-length card) VES1820/Philips CD1516 and 13c2:0003 Haupauge DVB-C
  2.1 VES1820/ALPS TDBE2

- av7110: follow saa7146 changes, remove superflous casts, and other misc. 
  minor cleanups

- av7110: Fixed race condition between driver and av7110 while accessing the
  COMMAND register in DPRAM.  See
  http://www.linuxtv.org/mailinglists/vdr/2004/01-2004/msg00331.html

- budget: various cleanups by Adrian bunk 
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- dib3000: support for dynamically i2c addresses of the demod

- tda1004x: fixed firmware upload problems, forgot to include tune_settings
  for tda1004x, added setting to allow inversion of OCLK, set
  fesettings->min_delay_ms = 800 as suggested by Peter Siering

- stv0297: code cleanup

- mt312: added vp310 support

- mt352: decrease verbosity
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- dvb-core: remove unused frequency bending code, simplify internal frontend
  handling

- dvb-net: add ULE dvb-net support according to draft-ietf-ipdvb-ule-03
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- added new usb ids for some more clones
- added option to deliver the complete TS with USB2.0 devices
- added support for the dib3000mc/p frontend driver
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- B2C2: move generic b2c2 code a separate module, added basic b2c2-usb
  support

- [DVB] Skystar2: add mt312/vp310 support
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- saa7146: prefix IER_DISABLE and IER_ENABLE with SAA7146_, add
  SAA7146_ISR_CLEAR

- dvb-bt8xx/dst: fix typo

- cinergyT2: locking in SET_PARAMETERS and some VDR compatibility code for
  GET_EVENT (thanks to Stefan Lucke)
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes a problem where /dev/urandom can return duplicate values
when two processors read from it at the same time.  It relies on the fact
that we already are taking a lock in add_entropy_words(), and atomically
hashes in some freshly mixed in data into the returned randomness.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes types so that sparse has less stuff to complain about.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fixes typo in header, please apply,
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

This fixes memory leak when we are low on memory during suspend.  Ouch and
nr_needed_pages is only used twice, and only written :-(.  I guess that can
wait for 2.6.10.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This prevents oops when not enough memory is available during resume.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix the below:

drivers/atm/zatm.c:1608: error: invalid lvalue in assignment

drivers/atm/iphase.c:623: error: invalid storage class for function 'ia_pkt_tx'

drivers/cdrom/sbpcd.c: In function 'get_state_T':
drivers/cdrom/sbpcd.c:1168: error: invalid storage class for function 'cmd_out_T'
drivers/cdrom/sbpcd.c: In function 'cmd_out_T':
drivers/cdrom/sbpcd.c:1317: error: invalid storage class for function 'cc_DriveReset'

drivers/media/video/saa7134/saa7134-core.c:90: error: static declaration of 'saa7134_devcount' follows non-static declaration
drivers/media/video/saa7134/saa7134.h:479: error: previous declaration of 'saa7134_devcount' was here

drivers/net/acenic.c:488: error: invalid storage class for function 'ace_watchdog'
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As of 2.6.10-rc3, the following is needed to allow various userland
packages (sysvinit, dhcp, ppp, libcap, libpcap, lilo) to compile as parts
that userland needs (e.g.  for ioctls) is in files with stuff userland
isn't allowed to see.

This adds __KERNEL__ around <linux/ata.h> and some defines (<linux/ata.h>
isn't needed by userland, and is unhappy right now).  sysvinit and some
other packages need <linux/hdreg.h> for HDIO_DRIVE_CMD and other IOCTL
things.  In <linux/types.h> we were unsafely typedef'ing __le64/__be64 as
__u64 only exists when __GNUC__ && !__STRICT_ANSI__ (causing libcap to
fail, for example).  Finally, <asm/atomic.h> provides routines userland
simply cannot use on all arches, but <linux/filter.h> is needed by iputils
for example.  While not all arches put __KERNEL__ around their header, on
MIPS including this header currently blows up the build.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>