From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 27 Sep 2006 15:49:07 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.19-rc1~902
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b98adfccdf5f8dd34ae56a2d5adbe2c030bd4674;hp=-c

Merge /pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (108 commits)
  sh: Fix occasional flush_cache_4096() stack corruption.
  sh: Calculate shm alignment at runtime.
  sh: dma-mapping compile fixes.
  sh: Initial vsyscall page support.
  sh: Clean up PAGE_SIZE definition for assembly use.
  sh: Selective flush_cache_mm() flushing.
  sh: More intelligent entry_mask/way_size calculation.
  sh: Support for L2 cache on newer SH-4A CPUs.
  sh: Update kexec support for API changes.
  sh: Optimized readsl()/writesl() support.
  sh: Report movli.l/movco.l capabilities.
  sh: CPU flags in AT_HWCAP in ELF auxvt.
  sh: Add support for 4K stacks.
  sh: Enable /proc/kcore support.
  sh: stack debugging support.
  sh: select CONFIG_EMBEDDED.
  sh: machvec rework.
  sh: Solution Engine SH7343 board support.
  sh: SH7710VoIPGW board support.
  sh: Enable verbose BUG() support.
  ...
---

b98adfccdf5f8dd34ae56a2d5adbe2c030bd4674
diff --combined drivers/char/Kconfig
index 6a3d3af45c59,7f0d323b4725..1b21c3a911d9
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -439,14 -439,6 +439,14 @@@ config SGI_MBC
           If you have an SGI Altix with an attached SABrick
           say Y or M here, otherwise say N.
  
 +config MSPEC
 +	tristate "Memory special operations driver"
 +	depends on IA64
 +	help
 +	  If you have an ia64 and you want to enable memory special
 +	  operations support (formerly known as fetchop), say Y here,
 +	  otherwise say N.
 +
  source "drivers/serial/Kconfig"
  
  config UNIX98_PTYS
@@@ -747,7 -739,7 +747,7 @@@ config NVRA
  
  config RTC
  	tristate "Enhanced Real Time Clock Support"
- 	depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
+ 	depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH
  	---help---
  	  If you say Y here and create a character special file /dev/rtc with
  	  major number 10 and minor number 135 using mknod ("man mknod"), you
diff --combined include/asm-sh/unistd.h
index da127d7901af,080e5729f17d..5d5e9f94def5
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@@ -292,28 -292,48 +292,51 @@@
  #define __NR_mq_getsetattr      (__NR_mq_open+5)
  #define __NR_kexec_load		283
  #define __NR_waitid		284
- #define __NR_add_key		285
- #define __NR_request_key	286
- #define __NR_keyctl		287
- #define __NR_ioprio_set		288
- #define __NR_ioprio_get		289
- #define __NR_inotify_init	290
- #define __NR_inotify_add_watch	291
- #define __NR_inotify_rm_watch	292
+ /* #define __NR_sys_setaltroot	285 */
+ #define __NR_add_key		286
+ #define __NR_request_key	287
+ #define __NR_keyctl		288
+ #define __NR_ioprio_set		289
+ #define __NR_ioprio_get		290
+ #define __NR_inotify_init	291
+ #define __NR_inotify_add_watch	292
+ #define __NR_inotify_rm_watch	293
+ #define __NR_migrate_pages	294
+ #define __NR_openat		295
+ #define __NR_mkdirat		296
+ #define __NR_mknodat		297
+ #define __NR_fchownat		298
+ #define __NR_futimesat		299
+ #define __NR_newfstatat		300
+ #define __NR_unlinkat		301
+ #define __NR_renameat		302
+ #define __NR_linkat		303
+ #define __NR_symlinkat		304
+ #define __NR_readlinkat		305
+ #define __NR_fchmodat		306
+ #define __NR_faccessat		307
+ #define __NR_pselect6		308
+ #define __NR_ppoll		309
+ #define __NR_unshare		310
+ #define __NR_set_robust_list	311
+ #define __NR_get_robust_list	312
+ #define __NR_splice		313
+ #define __NR_sync_file_range	314
+ #define __NR_tee		315
+ #define __NR_vmsplice		316
  
- 
- #define NR_syscalls 293
+ #define NR_syscalls 317
  
  #ifdef __KERNEL__
  
 -/* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */
 +#include <linux/err.h>
 +
 +/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
 + * see <asm-sh/errno.h> */
  
  #define __syscall_return(type, res) \
  do { \
 -	if ((unsigned long)(res) >= (unsigned long)(-124)) { \
 +	if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
  	/* Avoid using "res" which is declared to be in register r0; \
  	   errno might expand to a function call and clobber it.  */ \
  		int __err = -(res); \
@@@ -447,6 -467,7 +470,7 @@@ __syscall_return(type,__sc0); 
  #define __ARCH_WANT_SYS_SIGPENDING
  #define __ARCH_WANT_SYS_SIGPROCMASK
  #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
  
  #ifdef __KERNEL_SYSCALLS__