Merge tag 'disintegrate-s390-20121009' of (ab08ff34) · Commits · e / devices / android_kernel_xiaomi_markw

arch/s390/include/asm/Kbuild

+0 −14

Original line number	Diff line number	Diff line
		include include/asm-generic/Kbuild.asm

		header-y += chpid.h
		header-y += chsc.h
		header-y += cmb.h
		header-y += dasd.h
		header-y += debug.h
		header-y += kvm_virtio.h
		header-y += monwriter.h
		header-y += qeth.h
		header-y += schid.h
		header-y += tape390.h
		header-y += ucontext.h
		header-y += vtoc.h
		header-y += zcrypt.h

		generic-y += clkdev.h

arch/s390/include/asm/chpid.h

+1 −16

Original line number	Diff line number	Diff line
		@@ -2,23 +2,10 @@
		* Copyright IBM Corp. 2007, 2012
		* Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
		*/

		#ifndef _ASM_S390_CHPID_H
		#define _ASM_S390_CHPID_H

		#include <linux/string.h>
		#include <linux/types.h>

		#define __MAX_CHPID 255

		struct chp_id {
		__u8 reserved1;
		__u8 cssid;
		__u8 reserved2;
		__u8 id;
		} __attribute__((packed));

		#ifdef __KERNEL__
		#include <uapi/asm/chpid.h>
		#include <asm/cio.h>

		static inline void chp_id_init(struct chp_id *chpid)
		@@ -49,6 +36,4 @@ static inline int chp_id_is_valid(struct chp_id *chpid)

		#define chp_id_for_each(c) \
		for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c))
		#endif /* __KERNEL */

		#endif /* _ASM_S390_CHPID_H */

arch/s390/include/asm/cmb.h

+1 −50

Original line number	Diff line number	Diff line
		#ifndef S390_CMB_H
		#define S390_CMB_H

		#include <linux/types.h>
		#include <uapi/asm/cmb.h>

		/**
		* struct cmbdata - channel measurement block data for user space
		* @size: size of the stored data
		* @elapsed_time: time since last sampling
		* @ssch_rsch_count: number of ssch and rsch
		* @sample_count: number of samples
		* @device_connect_time: time of device connect
		* @function_pending_time: time of function pending
		* @device_disconnect_time: time of device disconnect
		* @control_unit_queuing_time: time of control unit queuing
		* @device_active_only_time: time of device active only
		* @device_busy_time: time of device busy (ext. format)
		* @initial_command_response_time: initial command response time (ext. format)
		*
		* All values are stored as 64 bit for simplicity, especially
		* in 32 bit emulation mode. All time values are normalized to
		* nanoseconds.
		* Currently, two formats are known, which differ by the size of
		* this structure, i.e. the last two members are only set when
		* the extended channel measurement facility (first shipped in
		* z990 machines) is activated.
		* Potentially, more fields could be added, which would result in a
		* new ioctl number.
		*/
		struct cmbdata {
		__u64 size;
		__u64 elapsed_time;
		/* basic and exended format: */
		__u64 ssch_rsch_count;
		__u64 sample_count;
		__u64 device_connect_time;
		__u64 function_pending_time;
		__u64 device_disconnect_time;
		__u64 control_unit_queuing_time;
		__u64 device_active_only_time;
		/* extended format only: */
		__u64 device_busy_time;
		__u64 initial_command_response_time;
		};

		/* enable channel measurement */
		#define BIODASDCMFENABLE _IO(DASD_IOCTL_LETTER, 32)
		/* enable channel measurement */
		#define BIODASDCMFDISABLE _IO(DASD_IOCTL_LETTER, 33)
		/* read channel measurement data */
		#define BIODASDREADALLCMB _IOWR(DASD_IOCTL_LETTER, 33, struct cmbdata)

		#ifdef __KERNEL__
		struct ccw_device;
		extern int enable_cmf(struct ccw_device *cdev);
		extern int disable_cmf(struct ccw_device *cdev);
		extern u64 cmf_read(struct ccw_device *cdev, int index);
		extern int cmf_readall(struct ccw_device cdev, struct cmbdata data);

		#endif /* __KERNEL__ */
		#endif /* S390_CMB_H */

arch/s390/include/asm/debug.h

+1 −27

Original line number	Diff line number	Diff line
		@@ -3,39 +3,14 @@
		*
		* Copyright IBM Corp. 1999, 2000
		*/

		#ifndef DEBUG_H
		#define DEBUG_H

		#include <linux/fs.h>

		/* Note:
		* struct __debug_entry must be defined outside of #ifdef __KERNEL__
		* in order to allow a user program to analyze the 'raw'-view.
		*/

		struct __debug_entry{
		union {
		struct {
		unsigned long long clock:52;
		unsigned long long exception:1;
		unsigned long long level:3;
		unsigned long long cpuid:8;
		} fields;

		unsigned long long stck;
		} id;
		void* caller;
		} __attribute__((packed));


		#define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */

		#ifdef __KERNEL__
		#include <linux/string.h>
		#include <linux/spinlock.h>
		#include <linux/kernel.h>
		#include <linux/time.h>
		#include <uapi/asm/debug.h>

		#define DEBUG_MAX_LEVEL 6 /* debug levels range from 0 to 6 */
		#define DEBUG_OFF_LEVEL -1 /* level where debug is switched off */
		@@ -254,5 +229,4 @@ int debug_unregister_view(debug_info_t* id, struct debug_view* view);
		#define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
		#endif /* DASD_DEBUG */

		#endif /* __KERNEL__ */
		#endif /* DEBUG_H */

arch/s390/include/asm/kvm_para.h

+6 −8

Original line number	Diff line number	Diff line
		@@ -9,12 +9,6 @@
		*
		* Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
		*/

		#ifndef __S390_KVM_PARA_H
		#define __S390_KVM_PARA_H

		#ifdef __KERNEL__

		/*
		* Hypercalls for KVM on s390. The calling convention is similar to the
		* s390 ABI, so we use R2-R6 for parameters 1-5. In addition we use R1
		@@ -29,6 +23,12 @@
		*
		* This work is licensed under the terms of the GNU GPL, version 2.
		*/
		#ifndef __S390_KVM_PARA_H
		#define __S390_KVM_PARA_H

		#include <uapi/asm/kvm_para.h>



		static inline long kvm_hypercall0(unsigned long nr)
		{
		@@ -154,6 +154,4 @@ static inline bool kvm_check_and_clear_guest_paused(void)
		return false;
		}

		#endif

		#endif /* __S390_KVM_PARA_H */