linux.git/arch/cris/include/asm, branch v2.6.35

Merge branch 'for-linus' of git://www.jni.nu/cris

2010-06-01T15:51:25+00:00

* 'for-linus' of git://www.jni.nu/cris:
  CRIS: Don't use mask_irq as symbol name
  CRIS: Simplify param.h by simply including 
  CRISv10: Whitespace fixes for hw_settings.S
  CRISv10: Trivial fixes.
  CRISv32: Fix RS485 port 4 CD Kconfig item.
  CRISv32: Remove duplicated Kconfig items.
  cris: push down BKL into some device drivers

cris: use asm-generic/scatterlist.h

2010-05-27T16:12:55+00:00

Signed-off-by: FUJITA Tomonori 
Cc: Mikael Starvik 
Cc: Jesper Nilsson 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

CRIS: Simplify param.h by simply including

2010-05-25T14:50:04+00:00

Signed-off-by: Robert P. J. Day 
Signed-off-by: Jesper Nilsson

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-05-20T16:20:59+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...

atomic_t: Cast to volatile when accessing atomic variables

2010-05-17T14:57:27+00:00

In preparation for removing volatile from the atomic_t definition, this
patch adds a volatile cast to all the atomic read functions.

Signed-off-by: Anton Blanchard 
Signed-off-by: Linus Torvalds

add descriptive comment for TIF_MEMDIE task flag declaration.

2010-05-14T09:13:27+00:00

Signed-off-by: Andreas Dilger 
Acked-by: KOSAKI Motohiro 
Signed-off-by: Jiri Kosina

pci-dma: add linux/pci-dma.h to linux/pci.h

2010-03-12T23:52:42+00:00

All the architectures properly set NEED_DMA_MAP_STATE now so we can safely
add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h
inclusion in arch's asm/pci.h

Signed-off-by: FUJITA Tomonori 
Acked-by: Arnd Bergmann 
Cc: Jesse Barnes 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

pci-dma: cris: use include/linux/pci-dma.h

2010-03-12T23:52:41+00:00

Signed-off-by: FUJITA Tomonori 
Acked-by: Mikael Starvik 
Cc: Jesse Barnes 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Add generic sys_ipc wrapper

2010-03-12T23:52:32+00:00

Add a generic implementation of the ipc demultiplexer syscall.  Except for
s390 and sparc64 all implementations of the sys_ipc are nearly identical.

There are slight differences in the types of the parameters, where mips
and powerpc as the only 64-bit architectures with sys_ipc use unsigned
long for the "third" argument as it gets casted to a pointer later, while
it traditionally is an "int" like most other paramters.  frv goes even
further and uses unsigned long for all parameters execept for "ptr" which
is a pointer type everywhere.  The change from int to unsigned long for
"third" and back to "int" for the others on frv should be fine due to the
in-register calling conventions for syscalls (we already had a similar
issue with the generic sys_ptrace), but I'd prefer to have the arch
maintainers looks over this in details.

Except for that h8300, m68k and m68knommu lack an impplementation of the
semtimedop sub call which this patch adds, and various architectures have
gets used - at least on i386 it seems superflous as the compat code on
x86-64 and ia64 doesn't even bother to implement it.

[akpm@linux-foundation.org: add sys_ipc to sys_ni.c]
Signed-off-by: Christoph Hellwig 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mundt 
Cc: Jeff Dike 
Cc: Hirokazu Takata 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Reviewed-by: H. Peter Anvin 
Cc: Al Viro 
Cc: Arnd Bergmann 
Cc: Heiko Carstens 
Cc: Martin Schwidefsky 
Cc: "Luck, Tony" 
Cc: James Morris 
Cc: Andreas Schwab 
Acked-by: Jesper Nilsson 
Acked-by: Russell King 
Acked-by: David Howells 
Acked-by: Kyle McMartin 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Add generic sys_old_mmap()

2010-03-12T23:52:32+00:00

Add a generic implementation of the old mmap() syscall, which expects its
argument in a memory block and switch all architectures over to use it.

Signed-off-by: Christoph Hellwig 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mundt 
Cc: Jeff Dike 
Cc: Hirokazu Takata 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Reviewed-by: H. Peter Anvin 
Cc: Al Viro 
Cc: Arnd Bergmann 
Cc: Heiko Carstens 
Cc: Martin Schwidefsky 
Cc: "Luck, Tony" 
Cc: James Morris 
Cc: Andreas Schwab 
Acked-by: Jesper Nilsson 
Acked-by: Russell King 
Acked-by: Greg Ungerer 
Acked-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds