]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
  MAINTAINERS: Change list for ioc_serial to linux-serial.
  SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
  MIPS: jz4740: Fix Kbuild Platform file.
  MIPS: Repair Kbuild make clean breakage.

1  2 
MAINTAINERS
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S

diff --combined MAINTAINERS
index 7679bf32f7bbe382f5f30ed966732184873ce32b,1117403dba1617564bff48e83b6f83962b304489..f2a2b8e647c56ce87a6bf527a99296e67125fb56
@@@ -969,16 -969,6 +969,16 @@@ L:       linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    arch/arm/mach-s5p*/
  
 +ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/plat-s5p/dev-fimc*
 +F:    arch/arm/plat-samsung/include/plat/*fimc*
 +F:    drivers/media/video/s5p-fimc/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Paul Mundt <lethal@linux-sh.org>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -2545,7 -2535,7 +2545,7 @@@ S:      Supporte
  F:    drivers/scsi/gdt*
  
  GENERIC GPIO I2C DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
  S:    Supported
  F:    drivers/i2c/busses/i2c-gpio.c
  F:    include/linux/i2c-gpio.h
@@@ -3073,27 -3063,16 +3073,27 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ixp2000/
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
  M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  M:    Jesse Brandeburg <jesse.brandeburg@intel.com>
  M:    Bruce Allan <bruce.w.allan@intel.com>
 -M:    Alex Duyck <alexander.h.duyck@intel.com>
 +M:    Carolyn Wyborny <carolyn.wyborny@intel.com>
 +M:    Don Skidmore <donald.c.skidmore@intel.com>
 +M:    Greg Rose <gregory.v.rose@intel.com>
  M:    PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
 +M:    Alex Duyck <alexander.h.duyck@intel.com>
  M:    John Ronciak <john.ronciak@intel.com>
  L:    e1000-devel@lists.sourceforge.net
  W:    http://e1000.sourceforge.net/
  S:    Supported
 +F:    Documentation/networking/e100.txt
 +F:    Documentation/networking/e1000.txt
 +F:    Documentation/networking/e1000e.txt
 +F:    Documentation/networking/igb.txt
 +F:    Documentation/networking/igbvf.txt
 +F:    Documentation/networking/ixgb.txt
 +F:    Documentation/networking/ixgbe.txt
 +F:    Documentation/networking/ixgbevf.txt
  F:    drivers/net/e100.c
  F:    drivers/net/e1000/
  F:    drivers/net/e1000e/
@@@ -3101,7 -3080,6 +3101,7 @@@ F:      drivers/net/igb
  F:    drivers/net/igbvf/
  F:    drivers/net/ixgb/
  F:    drivers/net/ixgbe/
 +F:    drivers/net/ixgbevf/
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
  L:    linux-wireless@vger.kernel.org
@@@ -3162,7 -3140,7 +3162,7 @@@ F:      drivers/net/ioc3-eth.
  
  IOC3 SERIAL DRIVER
  M:    Pat Gefre <pfg@sgi.com>
- L:    linux-mips@linux-mips.org
+ L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/serial/ioc3_serial.c
  
@@@ -5030,12 -5008,6 +5030,12 @@@ F:    drivers/media/common/saa7146
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
 +SAMSUNG AUDIO (ASoC) DRIVERS
 +M:    Jassi Brar <jassi.brar@samsung.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/s3c24xx
 +
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
  M:    Kang Yong <kangyong@telegent.com>
@@@ -6478,10 -6450,8 +6478,10 @@@ F:    include/linux/wm97xx.
  WOLFSON MICROELECTRONICS DRIVERS
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  M:    Ian Lartey <ian@opensource.wolfsonmicro.com>
 +M:    Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
 +T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 -W:    http://opensource.wolfsonmicro.com/node/8
 +W:    http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    drivers/leds/leds-wm83*.c
index 38b226938db3f5342dd99745ac7d599a57d4ec86,79c27d1f5f9e09735d405b45d9ad84de1805db99..f08ece6d8acc7f3aa78ecbca23f801ae76727f6a
@@@ -65,9 -65,8 +65,9 @@@ NESTED(handle_sysn32, PT_SIZE, sp
        sd      t0, PT_R7(sp)           # set error flag
        beqz    t0, 1f
  
 +      ld      t1, PT_R2(sp)           # syscall number
        dnegu   v0                      # error
 -      sd      v0, PT_R0(sp)           # set flag for syscall restarting
 +      sd      t1, PT_R0(sp)           # save it for syscall restarting
  1:    sd      v0, PT_R2(sp)           # result
  
        local_irq_disable               # make sure need_resched and
@@@ -107,9 -106,8 +107,9 @@@ n32_syscall_trace_entry
        sd      t0, PT_R7(sp)           # set error flag
        beqz    t0, 1f
  
 +      ld      t1, PT_R2(sp)           # syscall number
        dnegu   v0                      # error
 -      sd      v0, PT_R0(sp)           # set flag for syscall restarting
 +      sd      t1, PT_R0(sp)           # save it for syscall restarting
  1:    sd      v0, PT_R2(sp)           # result
  
        j       syscall_exit
@@@ -322,10 -320,10 +322,10 @@@ EXPORT(sysn32_call_table
        PTR     sys_cacheflush
        PTR     sys_cachectl
        PTR     sys_sysmips
-       PTR     sys_io_setup                    /* 6200 */
+       PTR     compat_sys_io_setup                     /* 6200 */
        PTR     sys_io_destroy
-       PTR     sys_io_getevents
-       PTR     sys_io_submit
+       PTR     compat_sys_io_getevents
+       PTR     compat_sys_io_submit
        PTR     sys_io_cancel
        PTR     sys_exit_group                  /* 6205 */
        PTR     sys_lookup_dcookie
        PTR     sys_perf_event_open
        PTR     sys_accept4
        PTR     compat_sys_recvmmsg
 -      PTR     sys_getdents
 +      PTR     sys_getdents64
 +      PTR     sys_fanotify_init               /* 6300 */
 +      PTR     sys_fanotify_mark
 +      PTR     sys_prlimit64
        .size   sysn32_call_table,.-sysn32_call_table
index 42fe14b52a335ca55884dc9f5aa2bb15b32d20a8,c2aa30ad97027ac430b014207b00085fa10c27f3..78d768a3e19da78fc986e9170f73b240ee98c1c2
@@@ -93,9 -93,8 +93,9 @@@ NESTED(handle_sys, PT_SIZE, sp
        sd      t0, PT_R7(sp)           # set error flag
        beqz    t0, 1f
  
 +      ld      t1, PT_R2(sp)           # syscall number
        dnegu   v0                      # error
 -      sd      v0, PT_R0(sp)           # flag for syscall restarting
 +      sd      t1, PT_R0(sp)           # save it for syscall restarting
  1:    sd      v0, PT_R2(sp)           # result
  
  o32_syscall_exit:
@@@ -143,9 -142,8 +143,9 @@@ trace_a_syscall
        sd      t0, PT_R7(sp)           # set error flag
        beqz    t0, 1f
  
 +      ld      t1, PT_R2(sp)           # syscall number
        dnegu   v0                      # error
 -      sd      v0, PT_R0(sp)           # set flag for syscall restarting
 +      sd      t1, PT_R0(sp)           # save it for syscall restarting
  1:    sd      v0, PT_R2(sp)           # result
  
        j       syscall_exit
         * The stackpointer for a call with more than 4 arguments is bad.
         */
  bad_stack:
 -      dnegu   v0                      # error
 -      sd      v0, PT_R0(sp)
 +      li      v0, EFAULT
        sd      v0, PT_R2(sp)
        li      t0, 1                   # set error flag
        sd      t0, PT_R7(sp)
@@@ -445,10 -444,10 +445,10 @@@ sys_call_table
        PTR     compat_sys_futex
        PTR     compat_sys_sched_setaffinity
        PTR     compat_sys_sched_getaffinity    /* 4240 */
-       PTR     sys_io_setup
+       PTR     compat_sys_io_setup
        PTR     sys_io_destroy
-       PTR     sys_io_getevents
-       PTR     sys_io_submit
+       PTR     compat_sys_io_getevents
+       PTR     compat_sys_io_submit
        PTR     sys_io_cancel                   /* 4245 */
        PTR     sys_exit_group
        PTR     sys32_lookup_dcookie
        PTR     compat_sys_rt_tgsigqueueinfo
        PTR     sys_perf_event_open
        PTR     sys_accept4
 -      PTR     compat_sys_recvmmsg
 +      PTR     compat_sys_recvmmsg             /* 4335 */
 +      PTR     sys_fanotify_init
 +      PTR     sys_32_fanotify_mark
 +      PTR     sys_prlimit64
        .size   sys_call_table,.-sys_call_table