mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller: "The most important change is that we reduce L1_CACHE_BYTES to 16 bytes, for which a trivial patch for XPS in the network layer was needed. Then we wire up the sys_membarrier and userfaultfd syscalls and added two other small cleanups" * 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Change L1_CACHE_BYTES to 16 net/xps: Fix calculation of initial number of xps queues parisc: reduce syslog debug output parisc: serial/mux: Convert to uart_console_device instead of open-coded parisc: Wire up userfaultfd syscall parisc: allocate sys_membarrier system call number
This commit is contained in:
commit
14c7909290
6 changed files with 20 additions and 29 deletions
|
|
@ -412,19 +412,14 @@ static int mux_console_setup(struct console *co, char *options)
|
|||
return 0;
|
||||
}
|
||||
|
||||
struct tty_driver *mux_console_device(struct console *co, int *index)
|
||||
{
|
||||
*index = co->index;
|
||||
return mux_driver.tty_driver;
|
||||
}
|
||||
|
||||
static struct console mux_console = {
|
||||
.name = "ttyB",
|
||||
.write = mux_console_write,
|
||||
.device = mux_console_device,
|
||||
.device = uart_console_device,
|
||||
.setup = mux_console_setup,
|
||||
.flags = CON_ENABLED | CON_PRINTBUFFER,
|
||||
.index = 0,
|
||||
.data = &mux_driver,
|
||||
};
|
||||
|
||||
#define MUX_CONSOLE &mux_console
|
||||
|
|
|
|||
Loading…
Reference in a new issue