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

[S390] Get rid of cpuid.h header file. 



Merge cpuid.h header file into cpu.h.
While at it convert from typedef to struct declaration and also
convert cio code to use proper lowcore structure instead of casts.

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

arch/s390/include/asm/cpu.h

+20 −0
Original line number Diff line number Diff line 
/*

 *    Copyright IBM Corp. 2000,2009

 *    Author(s): Hartmut Penner <hp@de.ibm.com>,

 *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,

 *		 Christian Ehrhardt <ehrhardt@de.ibm.com>,

 */



#ifndef _ASM_S390_CPU_H

#define _ASM_S390_CPU_H



#define MAX_CPU_ADDRESS 255



#ifndef __ASSEMBLY__



#include <linux/types.h>



struct cpuid

{

	unsigned int version :	8;

	unsigned int ident   : 24;

	unsigned int machine : 16;

	unsigned int unused  : 16;

} __packed;



#endif /* __ASSEMBLY__ */

#endif /* _ASM_S390_CPU_H */

arch/s390/include/asm/cpuid.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 *    Copyright IBM Corp. 2000,2009

 *    Author(s): Hartmut Penner <hp@de.ibm.com>,

 *		 Martin Schwidefsky <schwidefsky@de.ibm.com>

 *		 Christian Ehrhardt <ehrhardt@de.ibm.com>

 */



#ifndef _ASM_S390_CPUID_H_

#define _ASM_S390_CPUID_H_



/*

 *  CPU type and hardware bug flags. Kept separately for each CPU.

 *  Members of this structure are referenced in head.S, so think twice

 *  before touching them. [mj]

 */



typedef struct

{

	unsigned int version :	8;

	unsigned int ident   : 24;

	unsigned int machine : 16;

	unsigned int unused  : 16;

} __attribute__ ((packed)) cpuid_t;



#endif /* _ASM_S390_CPUID_H_ */

arch/s390/include/asm/kvm_host.h

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/interrupt.h>

#include <linux/kvm_host.h>

#include <asm/debug.h>

#include <asm/cpuid.h>

#include <asm/cpu.h>



#define KVM_MAX_VCPUS 64

#define KVM_MEMORY_SLOTS 32
@@ -217,7 +217,7 @@ struct kvm_vcpu_arch { 
	struct hrtimer    ckc_timer;

	struct tasklet_struct tasklet;

	union  {

		cpuid_t	  cpu_id;

		struct cpuid	cpu_id;

		u64		stidp_data;

	};

};

arch/s390/include/asm/lowcore.h

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 


#ifndef __ASSEMBLY__



#include <asm/cpuid.h>

#include <asm/cpu.h>

#include <asm/ptrace.h>

#include <linux/types.h>
@@ -275,7 +275,7 @@ struct _lowcore 
	__u32	user_exec_asce;			/* 0x02ac */



	/* SMP info area */

	cpuid_t	cpu_id;				/* 0x02b0 */

	struct cpuid cpu_id;			/* 0x02b0 */

	__u32	cpu_nr;				/* 0x02b8 */

	__u32	softirq_pending;		/* 0x02bc */

	__u32	percpu_offset;			/* 0x02c0 */
@@ -380,7 +380,7 @@ struct _lowcore 
	__u64	user_exec_asce;			/* 0x0318 */



	/* SMP info area */

	cpuid_t	cpu_id;				/* 0x0320 */

	struct cpuid cpu_id;			/* 0x0320 */

	__u32	cpu_nr;				/* 0x0328 */

	__u32	softirq_pending;		/* 0x032c */

	__u64	percpu_offset;			/* 0x0330 */

arch/s390/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define __ASM_S390_PROCESSOR_H



#include <linux/linkage.h>

#include <asm/cpuid.h>

#include <asm/cpu.h>

#include <asm/page.h>

#include <asm/ptrace.h>

#include <asm/setup.h>
@@ -26,7 +26,7 @@ 
 */

#define current_text_addr() ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; })



static inline void get_cpu_id(cpuid_t *ptr)

static inline void get_cpu_id(struct cpuid *ptr)

{

	asm volatile("stidp 0(%1)" : "=m" (*ptr) : "a" (ptr));

}