Commit 364c8558 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Get rid of a bunch of sparse warnings again. 



Also removes a bunch of ^L in drivers/s390/cio/cmf.c

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f5360106

arch/s390/kernel/audit.c

+1 −6
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/types.h>

#include <linux/audit.h>

#include <asm/unistd.h>

#include "audit.h"



static unsigned dir_class[] = {

#include <asm-generic/audit_dir_write.h>
@@ -40,7 +41,6 @@ int audit_classify_arch(int arch) 
int audit_classify_syscall(int abi, unsigned syscall)

{

#ifdef CONFIG_COMPAT

	extern int s390_classify_syscall(unsigned);

	if (abi == AUDIT_ARCH_S390)

		return s390_classify_syscall(syscall);

#endif
@@ -61,11 +61,6 @@ int audit_classify_syscall(int abi, unsigned syscall) 
static int __init audit_classes_init(void)

{

#ifdef CONFIG_COMPAT

	extern __u32 s390_dir_class[];

	extern __u32 s390_write_class[];

	extern __u32 s390_read_class[];

	extern __u32 s390_chattr_class[];

	extern __u32 s390_signal_class[];

	audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);

	audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);

arch/s390/kernel/audit.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef __ARCH_S390_KERNEL_AUDIT_H

#define __ARCH_S390_KERNEL_AUDIT_H



#include <linux/types.h>



#ifdef CONFIG_COMPAT

extern int s390_classify_syscall(unsigned);

extern __u32 s390_dir_class[];

extern __u32 s390_write_class[];

extern __u32 s390_read_class[];

extern __u32 s390_chattr_class[];

extern __u32 s390_signal_class[];

#endif /* CONFIG_COMPAT */



#endif /* __ARCH_S390_KERNEL_AUDIT_H */

arch/s390/kernel/compat_audit.c

+1 −0
Original line number Diff line number Diff line 
#undef __s390x__

#include <asm/unistd.h>

#include "audit.h"



unsigned s390_dir_class[] = {

#include <asm-generic/audit_dir_write.h>

drivers/s390/char/con3270.c

+1 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/ebcdic.h>



#include "raw3270.h"

#include "tty3270.h"

#include "ctrlchar.h"



#define CON3270_OUTPUT_BUFFER_SIZE 1024
@@ -507,8 +508,6 @@ con3270_write(struct console *co, const char *str, unsigned int count) 
	spin_unlock_irqrestore(&cp->view.lock,flags);

}



extern struct tty_driver *tty3270_driver;



static struct tty_driver *

con3270_device(struct console *c, int *index)

{

drivers/s390/char/sclp.c

+2 −3
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static volatile enum sclp_mask_state_t { 
#define SCLP_RETRY_INTERVAL	30



static void sclp_process_queue(void);

static void __sclp_make_read_req(void);

static int sclp_init_mask(int calculate);

static int sclp_init(void);
@@ -115,7 +116,6 @@ sclp_service_call(sclp_cmdw_t command, void *sccb) 
	return 0;

}



static inline void __sclp_make_read_req(void);



static void

__sclp_queue_read_req(void)
@@ -318,8 +318,7 @@ sclp_read_cb(struct sclp_req *req, void *data) 
}



/* Prepare read event data request. Called while sclp_lock is locked. */

static inline void

__sclp_make_read_req(void)

static void __sclp_make_read_req(void)

{

	struct sccb_header *sccb;