23 Oct, 2010
18 commits
-
Ttyprintk is a pseudo TTY driver, which allows users to make printk
messages, via output to ttyprintk device. It is possible to store
"console" messages inline with kernel messages for better analyses of
the boot process, for example.Signed-off-by: Samo Pogacnik
Acked-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
The commit 4547be7 rewrites suspend and resume functions. According
to this rewrite, when a serial port is a printk console device and
can suspend(without set no_console_suspend flag), it will definitely
call set_termios function during its resume, but parameter termios
isn't initialized, this will pass an unpredictable config to the
serial port. If this serial port is not a userspace opened tty device
, a suspend and resume action will make this serial port unusable.
I.E. ttyS0 is a printk console device, ttyS1 or keyboard+display is
userspace tty device, a suspend/resume action will make ttyS0
unusable.If a serial port is both a printk console device and an opened tty
device, this issue can be overcome because it will call set_termios
again with the correct parameter in the uart_change_speed function.Refer to the deleted content of commit 4547be7, revert parts relate
to restore settings into parameter termios. It is safe because if
a serial port is a printk console only device, the only meaningful
field in termios is c_cflag and its old config is saved in
uport->cons->cflag, if this port is also an opened tty device,
it will clear uport->cons->cflag in the uart_open and the old config
is saved in tty->termios.Signed-off-by: Jason Wang
Acked-by: Stanislav Brabec
Signed-off-by: Greg Kroah-Hartman -
The commit 4547be7 rewrites suspend and resume functions, this
introduces a problem on the OMAP3EVM platoform. when the kernel boots
with no_console_suspend and we suspend the kernel, then resume it,
the serial console will be not usable. This problem should be common
for all platforms.
The cause for this problem is that when enter suspend, if we choose
no_console_suspend, the console_stop will be skiped. But in resume
function, the console port will be set to uninitialized state by
calling set_termios function and the console_start is called without
checking whether the no_console_suspend is set, Now fix it.Signed-off-by: Jason Wang
Acked-by: Stanislav Brabec
Signed-off-by: Greg Kroah-Hartman -
This patch converts s390 to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- S390 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCGRS485 and TIOCGRS485, which are unused
by any driver available on this architecture
- The generic version adds support for termioxCc: Martin Schwidefsky
Cc: Heiko Carstens
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts mn10300 to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- The generic version provides TIOCGRS485 and TIOCSRS485 but they
are unused by any driver available for this architecture.
- The generic version adds support for termioxCc: David Howells
Cc: Koichi Yasutake
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts m68k to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- m68k defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCSRS485 and TIOCGRS485m which are unused
by any driver available on this architecture.
- The generic version adds support for termioxCc: Geert Uytterhoeven
Cc: Roman Zippel
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts m32r to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- The generic version adds TIOCGRS485 and TIOCGRS485, which are unused by
any driver available on this architecture.
- The generic version adds support for termioxCc: Hirokazu Takata
Cc: Greg Kroah-Hartman
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts ia64 to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- The generic version adds TIOCSRS485 and TIOCGRS485, which are unused
by any driver available on this architecture.
- The generic version adds support for termioxCc: Tony Luck
Cc: Fenghua Yu
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts h8300 to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- H8300 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCSRS485 and TIOGSRS485, but are unused
by any driver available on this architecture.
- The generic version adds support for termioxCc: Yoshinori Sato
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts frv to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- FRV defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- FRV defines TIOCTTYGSTRUCT, kept in arch-specific version
- The generic version provides TIOCGRS485 and TIOCSRS485 but they
are unused by any driver available for this architecture.
- The generic version adds support for termioxCc: David Howells
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts cris to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485,
kept in arch-specific portion
- CRIS defines a different value for TIOCSRS485, kept via ifndef in generic
- The generic version adds support for termioxCc: Mikael Starvik
Cc: Jesper Nilsson
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts avr32 to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- The generic version adds support for termiox
Acked-by: Haavard Skinnemoen
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch converts arm to use asm-generic/ioctls.h instead of its
own version.The differences between the arch-specific version and the generic
version are as follows:- ARM defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds support for termioxReviewed-by: Russell King
Signed-off-by: Jeff Mahoney
Signed-off-by: Greg Kroah-Hartman -
This patch removes __GFP_NOFAIL use from tty_add_file() and adds proper error
handling to the call-sites of the function.Cc: Andrew Morton
Cc: Alan Cox
Cc: Arnd Bergmann
Signed-off-by: Pekka Enberg
Acked-by: David Rientjes
Signed-off-by: Greg Kroah-Hartman -
CONSOLE_POLL support for uartlite enables
KGDB debugging over serial line.Signed-off-by: Michal Simek
Signed-off-by: Jason Wessel
Acked-by: Peter Korsgaard
Signed-off-by: Greg Kroah-Hartman -
snprintf() returns the number of bytes which would have been written so
it can be larger than the size of the buffer. In this case it's fine,
but people copy and paste this code so I've fixed it.Signed-off-by: Dan Carpenter
Acked-by: Feng Tang
Signed-off-by: Greg Kroah-Hartman -
Make serport serio device to be a child of corresponding tty device
instead of just hanging at /sys/devices/serioX.Signed-off-by: Dmitry Eremin-Solenikov
Acked-by: Dmitry Torokhov
Signed-off-by: Greg Kroah-Hartman -
Some device drivers (mostly tty line disciplines) would like to have way
know a struct device instance corresponding to passed tty_struct. Add
a struct device pointer to struct tty_struct and populate it during
initialize_tty_struct().Signed-off-by: Dmitry Eremin-Solenikov
Acked-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
21 Oct, 2010
5 commits
-
* '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. -
If the host is slow in reading data or doesn't read data at all,
blocking write calls not only blocked the program that called write()
but the entire guest itself.To overcome this, let's not block till the host signals it has given
back the virtio ring element we passed it. Instead, send the buffer to
the host and return to userspace. This operation then becomes similar
to how non-blocking writes work, so let's use the existing code for this
path as well.This code change also ensures blocking write calls do get blocked if
there's not enough room in the virtio ring as well as they don't return
-EAGAIN to userspace.Signed-off-by: Amit Shah
Acked-by: Hans de Goede
CC: stable@kernel.org
Signed-off-by: Rusty Russell
Signed-off-by: Linus Torvalds -
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper -
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Fix fs/gs reload oops with invalid ldt
20 Oct, 2010
7 commits
-
[Ralf: Michel's original patch only fixed N32; I replicated the same fix
for O32.]Signed-off-by: Michel Thebeau
Cc: paul.gortmaker@windriver.com
Cc: bruce.ashfield@windriver.com
Signed-off-by: Ralf Baechle -
IOC3 is also being used on SGI MIPS systems but this particular driver is
only being used on IA64 systems so linux-mips made no sense as a list. Pat
also thinks linux-serial@vger.kernel.org is the better list.Signed-off-by: Ralf Baechle
-
In this code, 0 is returned on memory allocation failure, even though other
failures return -ENOMEM or other similar values.A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)//
@@
expression ret;
expression x,e1,e2,e3;
@@ret = 0
... when != ret = e1
*x = \(kmalloc\|kcalloc\|kzalloc\)(...)
... when != ret = e2
if (x == NULL) { ... when != ret = e3
return ret;
}
//Signed-off-by: Julia Lawall
To: Pat Gefre
Cc: kernel-janitors@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1704/
Signed-off-by: Ralf Baechle -
The platform specific files should be included via the platform-y
variable.Signed-off-by: David Daney
Cc: Lars-Peter Clausen
Patchwork: https://patchwork.linux-mips.org/patch/1719/
Signed-off-by: Ralf Baechle -
When running make clean, Kbuild doesn't process the .config file, so nothing
generates a platform-y variable. We can get it to descend into the platform
directories by setting $(obj-).The dec Platform file was unconditionally setting platform-, obliterating
its previous contents and preventing some directories from being cleaned.
This is change to an append operation '+=' to allow cavium-octeon to be
cleaned.Signed-off-by: David Daney
Cc: Sam Ravnborg
Patchwork: https://patchwork.linux-mips.org/patch/1718/
Signed-off-by: Ralf Baechle -
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: avivo cursor workaround applies to evergreen as well -
kvm reloads the host's fs and gs blindly, however the underlying segment
descriptors may be invalid due to the user modifying the ldt after loading
them.Fix by using the safe accessors (loadsegment() and load_gs_index()) instead
of home grown unsafe versions.This is CVE-2010-3698.
KVM-Stable-Tag.
Signed-off-by: Avi Kivity
Signed-off-by: Marcelo Tosatti
19 Oct, 2010
6 commits
-
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Enable ISA_DMA_API config to fix build failure
MIPS: 32-bit: Fix build failure in asm/fcntl.h
MIPS: Remove all generated vmlinuz* files on "make clean"
MIPS: do_sigaltstack() expects userland pointers
MIPS: Fix error values in case of bad_stack
MIPS: Sanitize restart logics
MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
MIPS: Don't block signals if we'd failed to setup a sigframe -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: evdev - fix EVIOCSABS regression
Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: fix TI TSB82AA2 regression since 2.6.35 -
This patch reverts the driver to enabling/disabling the NFC interrupt
mask rather than enabling/disabling the system interrupt. This cleans
up the driver so that it doesn't rely on interrupts being disabled
within the interrupt handler.For i.MX21 we keep the current behaviour, that is calling
enable_irq/disable_irq_nosync to enable/disable interrupts. This patch
is based on earlier work by John Ogness.Signed-off-by: Sascha Hauer
Acked-by: John Ogness
Tested-by: John Ogness
Signed-off-by: David Woodhouse
Signed-off-by: Linus Torvalds -
* 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux:
i2c-imx: do not allow interruptions when waiting for I2C to complete
i2c-davinci: Fix TX setup for more SoCs -
* fixes:
v4l1: fix 32-bit compat microcode loading translation
De-pessimize rds_page_copy_user
18 Oct, 2010
4 commits
-
Add ISA_DMA_API config item and select it when GENERIC_ISA_DMA enabled.
This fixes build failure on allmodconfig like following:CC sound/isa/es18xx.o
sound/isa/es18xx.c: In function 'snd_es18xx_playback1_prepare':
sound/isa/es18xx.c:501:9: error: implicit declaration of function 'snd_dma_program'
sound/isa/es18xx.c: In function 'snd_es18xx_playback_pointer':
sound/isa/es18xx.c:818:3: error: implicit declaration of function 'snd_dma_pointer'
make[3]: *** [sound/isa/es18xx.o] Error 1
make[2]: *** [sound/isa/es18xx.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2Signed-off-by: Namhyung Kim
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1717/
Signed-off-by: Ralf Baechle -
CC security/integrity/ima/ima_fs.o
In file included from linux/include/linux/fcntl.h:4:0,
from linux/security/integrity/ima/ima_fs.c:18:
linux/arch/mips/include/asm/fcntl.h:63:2: error: expected specifier-qualifier-list before 'off_t'
make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
make[2]: *** [security/integrity/ima/ima_fs.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2Signed-off-by: Namhyung Kim
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1715/
Signed-off-by: Ralf Baechle -
[Ralf: I changed the patch to explicitly list all files to be deleted out
of paranoia.]Signed-off-by: Wu Zhangjin
Patchwork: http://patchwork.linux-mips.org/patch/1590/
Signed-off-by: Ralf Baechle -
o32 compat does the right thing, native and n32 compat do not...
Signed-off-by: Al Viro
Cc: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1700/
Signed-off-by: Ralf Baechle
