mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"Bug fixes, small improvements and one notable change: the system call
table and the unistd.h header are now generated automatically with a
shell script from a text file"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/decompressor: discard __ksymtab and .eh_frame sections
s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
s390/tools: generate header files in arch/s390/include/generated/
s390/syscalls: use generated syscall_table.h and unistd.h header files
s390/syscalls: add Makefile to generate system call header files
s390/syscalls: add syscalltbl script
s390/syscalls: add system call table
s390/decompressor: swap .text and .rodata.compressed sections
s390/sclp: fix .data section specification
s390/ipl: avoid usage of __section(.data)
s390/head: replace hard coded values with constants
s390/disassembler: add generated gen_opcode_table tool to .gitignore
s390: remove bogus system call table entries
s390/kprobes: remove duplicate includes
s390/dasd: Remove dead return code checks
s390/dasd: Simplify code
s390/vdso: revise CFI annotations of vDSO functions
s390/kernel: emit CFI data in .debug_frame and discard .eh_frame sections
This commit is contained in:
commit
ca0c836d88
37 changed files with 856 additions and 863 deletions
|
|
@ -1393,10 +1393,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
|
|||
DBF_DEV_EVENT(DBF_ERR, device, "%s",
|
||||
"device gone, retry");
|
||||
break;
|
||||
case -EIO:
|
||||
DBF_DEV_EVENT(DBF_ERR, device, "%s",
|
||||
"I/O error, retry");
|
||||
break;
|
||||
case -EINVAL:
|
||||
/*
|
||||
* device not valid so no I/O could be running
|
||||
|
|
@ -1412,10 +1408,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
|
|||
/* fake rc to success */
|
||||
rc = 0;
|
||||
break;
|
||||
case -EBUSY:
|
||||
DBF_DEV_EVENT(DBF_ERR, device, "%s",
|
||||
"device busy, retry later");
|
||||
break;
|
||||
default:
|
||||
/* internal error 10 - unknown rc*/
|
||||
snprintf(errorstring, ERRORLENGTH, "10 %d", rc);
|
||||
|
|
@ -1489,10 +1481,6 @@ int dasd_start_IO(struct dasd_ccw_req *cqr)
|
|||
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
|
||||
"start_IO: device busy, retry later");
|
||||
break;
|
||||
case -ETIMEDOUT:
|
||||
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
|
||||
"start_IO: request timeout, retry later");
|
||||
break;
|
||||
case -EACCES:
|
||||
/* -EACCES indicates that the request used only a subset of the
|
||||
* available paths and all these paths are gone. If the lpm of
|
||||
|
|
|
|||
|
|
@ -5231,7 +5231,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m)
|
|||
struct dasd_ckd_path_group_entry *entry;
|
||||
struct dasd_ckd_host_information *info;
|
||||
char sysplex[9] = "";
|
||||
int rc, i, j;
|
||||
int rc, i;
|
||||
|
||||
access = kzalloc(sizeof(*access), GFP_NOIO);
|
||||
if (!access) {
|
||||
|
|
@ -5251,10 +5251,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m)
|
|||
entry = (struct dasd_ckd_path_group_entry *)
|
||||
(info->entry + i * info->entry_size);
|
||||
/* PGID */
|
||||
seq_puts(m, "pgid ");
|
||||
for (j = 0; j < 11; j++)
|
||||
seq_printf(m, "%02x", entry->pgid[j]);
|
||||
seq_putc(m, '\n');
|
||||
seq_printf(m, "pgid %*phN\n", 11, entry->pgid);
|
||||
/* FLAGS */
|
||||
seq_printf(m, "status_flags %02x\n", entry->status_flags);
|
||||
/* SYSPLEX NAME */
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
#include "sclp.h"
|
||||
#include "sclp_rw.h"
|
||||
|
||||
char sclp_early_sccb[PAGE_SIZE] __aligned(PAGE_SIZE) __section(data);
|
||||
int sclp_init_state __section(data) = sclp_init_state_uninitialized;
|
||||
char sclp_early_sccb[PAGE_SIZE] __aligned(PAGE_SIZE) __section(.data);
|
||||
int sclp_init_state __section(.data) = sclp_init_state_uninitialized;
|
||||
|
||||
void sclp_early_wait_irq(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue