Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

This patch removes tesla driver from syslink tree.
As this dirver is currently dependended on dspbridge,
the right place for this driver for this is in the
tree that has dspbridge.
Signed-off-by: Hari Kanigeri <h-kanigeri@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Corrected the checkpatch warnings in ipc modules. Warnings related to
the volatile keyword still persist in gate_remote.c, messageq_transportshm.c
and listmp.h
Signed-off-by: Suman Anna <s-anna@ti.com>

Updated messageq and multiproc modules to be in sync with ipc-b33 tree.
No changes are required for messageq_transportshm, listmp, listmp_sharedmemory
modules also.

multiproc - changed the return type for multiproc_set_local_id
messageq - enhanced the functionality of messageq_put to deal with urgent messages
Signed-off-by: Suman Anna <s-anna@ti.com>

this patch implements the proc4430 translate address
function.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

procmgr: updated with a fix for a minor issue Updated with a fix for a minor issue with the procmgr_create the procmgr state table was not getting updated with the procmgr handle
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

IPC Added IOCTL I/F for NameServer Remote Notify modules This is to sync with the latest syslink drop(version 2.0)
Signed-off-by: Arun M G <arunmg@ti.com>

IPC_Fix_Nameserver_And_Multiproc This includes the fixes in nameserver and multiproc modules during testing.

The additional changes in ioctl file to make sysc with
the changes propossed by Suman (command changes, copy
commands at a common place etc)
Signed-off-by: Arun M G <arunmg@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>

fixed checkpatch warnngs in proc4430
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

ProcMgr: Resolved few bugs within the ioctl function. resolved few bugs observed within the ioctl function
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

This patch updates the DMM start address and size
information for DUCATI. The start address is provided
as 0x80000000 and the size as 0x6000000
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

this patch plugs the dmm module with Proc4430 driver
and procmgr module. This provides both Map and Unmap
functionality.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

removed bug that is not needed.
Signed-off-by: Hari Kanigeri <h-kangieri2@ti.com>

updated the callback functions signature in messageq_transportshm and
nameserver_remotenotify modules to align with the latest notify code.
Signed-off-by: Suman Anna <s-anna@ti.com>

This patch provides the preliminary framework for
IPC support to OMAP4 processor.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Arun M G <arunmg@ti.com>
Signed-off-by: Ramesh Gupta G <grgupta@ti.com>
Signed-off-by: Jayan John <x00jayan@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Arun Radhakrishnan <x0051460@ti.com>

This patch adds static mapping for Audio Back End
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

OMAP4: Adjust the vmalloc end
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Conflicts:

	arch/arm/configs/omap_4430sdp_defconfig

Resolved
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

This patch updates the platform dma.h with new dma request lines
for OMAP4 peripherals. Also additional hardware register of OMAP4
sDMA module are included.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

This reverts commit 9e9f46c4.

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 <torvalds@linux-foundation.org>

* git://git.infradead.org/battery-2.6:
  da9030_battery: Fix race between event handler and monitor
  Add MAX17040 Fuel Gauge driver
  w1: ds2760_battery: add support for sleep mode feature
  w1: ds2760: add support for EEPROM read and write
  ds2760_battery: cleanups in ds2760_battery_probe()

Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs-2.6,audit-current}

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  another race fix in jfs_check_acl()
  Get "no acls for this inode" right, fix shmem breakage
  inline functions left without protection of ifdef (acl)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  audit: inode watches depend on CONFIG_AUDIT not CONFIG_AUDIT_SYSCALL

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Even though one cannot make use of the audit watch code without
CONFIG_AUDIT_SYSCALL the spaghetti nature of the audit code means that
the audit rule filtering requires that it at least be compiled.

Thus build the audit_watch code when we build auditfilter like it was
before cfcad62c

Clearly this is a point of potential future cleanup..
Reported-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Fix the write access fault problem for real

commit 64d1304a (futex: setup writeable mapping for futex ops which
modify user space data) did address only half of the problem of write
access faults.

The patch was made on two wrong assumptions:

1) access_ok(VERIFY_WRITE,...) would actually check write access.

   On x86 it does _NOT_. It's a pure address range check.

2) a RW mapped region can not go away under us.

   That's wrong as well. Nobody can prevent another thread to call
   mprotect(PROT_READ) on that region where the futex resides. If that
   call hits between the get_user_pages_fast() verification and the
   actual write access in the atomic region we are toast again.

The solution is to not rely on access_ok and get_user() for any write
access related fault on private and shared futexes. Instead we need to
fault it in with verification of write access.

There is no generic non destructive write mechanism which would fault
the user page in trough a #PF, but as we already know that we will
fault we can as well call get_user_pages() directly and avoid the #PF
overhead.

If get_user_pages() returns -EFAULT we know that we can not fix it
anymore and need to bail out to user space.

Remove a bunch of confusing comments on this issue as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@kernel.org

SLUB uses higher order allocations by default but falls back to small
orders under memory pressure. Make sure the GFP mask used in the initial
allocation doesn't include __GFP_NOFAIL.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Traditionally, we never failed small orders (even regardless of any
__GFP_NOFAIL flags), and slab will allocate order-1 allocations even for
small allocations that could fit in a single page (in order to avoid
excessive fragmentation).

Maybe we should remove this warning entirely, but before making that
judgement, at least limit it to bigger allocations.
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

* '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 <linux/smp.h> into all smp_processor_id() users.
  MIPS: bug.h Build fix - include <linux/compiler.h>.

The existing code had the following race:

Thread-1                       Thread-2

inc/read in_use
                               inc/read in_use
inc tx_free_list[qos].len
                               inc tx_free_list[qos].len

The actual in_use value was incremented twice, but thread-1 is going
to free memory based on its stale value, and will free one too many
times.  The result is that memory is freed back to the kernel while
its packet is still in the transmit buffer.  If the memory is
overwritten before it is transmitted, the hardware will put a valid
checksum on it and send it out (just like it does with good packets).
If by chance the TCP flags are clobbered but not the addresses or
ports, the result can be a broken TCP stream.

The fix is to track the number of freed packets in a single location
(a Fetch-and-Add Unit register).  That way it can never get out of sync
with itself.

We try to free up to MAX_SKB_TO_FREE (currently 10) buffers at a time.
If fewer are available we adjust the free count with the difference.
The action of claiming buffers to free is atomic so two threads cannot
claim the same buffers.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Convert the driver to use net_device_ops as it is now mandatory.

Also compensate for the removal of struct sk_buff's dst field.

The changes are mostly mechanical, the content of ethernet-common.c
was moved to ethernet.c and ethernet-common.{c,h} are removed.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Thanks to Cavium Inc. for the code contribution and help.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>