Commit b378a982 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390: include linux/io.h instead of asm/io.h 



Include linux/io.h instead of asm/io.h everywhere. linux/io.h includes
asm/io.h, so this shouldn't cause any problems. Instead this might help for
some randconfig build errors which were reported due to some undefined io
related functions.

Also move the changed include so it stays grouped together with other
includes from the same directory.

For ctcm_mpc.c also remove not needed comments (actually questions).

Acked-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent b8af5999

arch/s390/appldata/appldata_base.c

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/workqueue.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <asm/appldata.h>

#include <asm/vtimer.h>

#include <linux/uaccess.h>

#include <asm/io.h>

#include <asm/smp.h>



#include "appldata.h"

arch/s390/appldata/appldata_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/pagemap.h>

#include <linux/swap.h>

#include <linux/slab.h>

#include <asm/io.h>

#include <linux/io.h>



#include "appldata.h"

arch/s390/include/asm/appldata.h

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#ifndef _ASM_S390_APPLDATA_H

#define _ASM_S390_APPLDATA_H



#include <linux/io.h>

#include <asm/diag.h>

#include <asm/io.h>



#define APPLDATA_START_INTERVAL_REC	0x80

#define APPLDATA_STOP_REC		0x81

arch/s390/include/asm/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ASM_S390_DMA_H

#define _ASM_S390_DMA_H



#include <asm/io.h>

#include <linux/io.h>



/*

 * MAX_DMA_ADDRESS is ambiguous because on s390 its completely unrelated

arch/s390/kernel/cpcmd.c

+1 −1
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/mm.h>

#include <linux/io.h>

#include <asm/diag.h>

#include <asm/ebcdic.h>

#include <asm/cpcmd.h>

#include <asm/io.h>



static DEFINE_SPINLOCK(cpcmd_lock);

static char cpcmd_buf[241];