Commit cee4cca7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/hdrcleanup-2.6 

* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h
parents 2edc322d 9348f0de

drivers/s390/crypto/z90crypt.h

+2 −183
Original line number Diff line number Diff line 
/*

 *  linux/drivers/s390/crypto/z90crypt.h

 *

 *  z90crypt 1.3.3

 *  z90crypt 1.3.3 (kernel-private header)

 *

 *  Copyright (C)  2001, 2005 IBM Corporation

 *  Author(s): Robert Burroughs (burrough@us.ibm.com)
@@ -27,188 +27,7 @@ 
#ifndef _Z90CRYPT_H_

#define _Z90CRYPT_H_



#include <linux/ioctl.h>



#define z90crypt_VERSION 1

#define z90crypt_RELEASE 3	// 2 = PCIXCC, 3 = rewrite for coding standards

#define z90crypt_VARIANT 3	// 3 = CEX2A support



/**

 * struct ica_rsa_modexpo

 *

 * Requirements:

 * - outputdatalength is at least as large as inputdatalength.

 * - All key parts are right justified in their fields, padded on

 *   the left with zeroes.

 * - length(b_key) = inputdatalength

 * - length(n_modulus) = inputdatalength

 */

struct ica_rsa_modexpo {

	char __user *	inputdata;

	unsigned int	inputdatalength;

	char __user *	outputdata;

	unsigned int	outputdatalength;

	char __user *	b_key;

	char __user *	n_modulus;

};



/**

 * struct ica_rsa_modexpo_crt

 *

 * Requirements:

 * - inputdatalength is even.

 * - outputdatalength is at least as large as inputdatalength.

 * - All key parts are right justified in their fields, padded on

 *   the left with zeroes.

 * - length(bp_key)	= inputdatalength/2 + 8

 * - length(bq_key)	= inputdatalength/2

 * - length(np_key)	= inputdatalength/2 + 8

 * - length(nq_key)	= inputdatalength/2

 * - length(u_mult_inv) = inputdatalength/2 + 8

 */

struct ica_rsa_modexpo_crt {

	char __user *	inputdata;

	unsigned int	inputdatalength;

	char __user *	outputdata;

	unsigned int	outputdatalength;

	char __user *	bp_key;

	char __user *	bq_key;

	char __user *	np_prime;

	char __user *	nq_prime;

	char __user *	u_mult_inv;

};



#define Z90_IOCTL_MAGIC 'z'  // NOTE:  Need to allocate from linux folks



/**

 * Interface notes:

 *

 * The ioctl()s which are implemented (along with relevant details)

 * are:

 *

 *   ICARSAMODEXPO

 *     Perform an RSA operation using a Modulus-Exponent pair

 *     This takes an ica_rsa_modexpo struct as its arg.

 *

 *     NOTE: please refer to the comments preceding this structure

 *           for the implementation details for the contents of the

 *           block

 *

 *   ICARSACRT

 *     Perform an RSA operation using a Chinese-Remainder Theorem key

 *     This takes an ica_rsa_modexpo_crt struct as its arg.

 *

 *     NOTE: please refer to the comments preceding this structure

 *           for the implementation details for the contents of the

 *           block

 *

 *   Z90STAT_TOTALCOUNT

 *     Return an integer count of all device types together.

 *

 *   Z90STAT_PCICACOUNT

 *     Return an integer count of all PCICAs.

 *

 *   Z90STAT_PCICCCOUNT

 *     Return an integer count of all PCICCs.

 *

 *   Z90STAT_PCIXCCMCL2COUNT

 *     Return an integer count of all MCL2 PCIXCCs.

 *

 *   Z90STAT_PCIXCCMCL3COUNT

 *     Return an integer count of all MCL3 PCIXCCs.

 *

 *   Z90STAT_CEX2CCOUNT

 *     Return an integer count of all CEX2Cs.

 *

 *   Z90STAT_CEX2ACOUNT

 *     Return an integer count of all CEX2As.

 *

 *   Z90STAT_REQUESTQ_COUNT

 *     Return an integer count of the number of entries waiting to be

 *     sent to a device.

 *

 *   Z90STAT_PENDINGQ_COUNT

 *     Return an integer count of the number of entries sent to a

 *     device awaiting the reply.

 *

 *   Z90STAT_TOTALOPEN_COUNT

 *     Return an integer count of the number of open file handles.

 *

 *   Z90STAT_DOMAIN_INDEX

 *     Return the integer value of the Cryptographic Domain.

 *

 *   Z90STAT_STATUS_MASK

 *     Return an 64 element array of unsigned chars for the status of

 *     all devices.

 *       0x01: PCICA

 *       0x02: PCICC

 *       0x03: PCIXCC_MCL2

 *       0x04: PCIXCC_MCL3

 *       0x05: CEX2C

 *       0x06: CEX2A

 *       0x0d: device is disabled via the proc filesystem

 *

 *   Z90STAT_QDEPTH_MASK

 *     Return an 64 element array of unsigned chars for the queue

 *     depth of all devices.

 *

 *   Z90STAT_PERDEV_REQCNT

 *     Return an 64 element array of unsigned integers for the number

 *     of successfully completed requests per device since the device

 *     was detected and made available.

 *

 *   ICAZ90STATUS (deprecated)

 *     Return some device driver status in a ica_z90_status struct

 *     This takes an ica_z90_status struct as its arg.

 *

 *     NOTE: this ioctl() is deprecated, and has been replaced with

 *           single ioctl()s for each type of status being requested

 *

 *   Z90STAT_PCIXCCCOUNT (deprecated)

 *     Return an integer count of all PCIXCCs (MCL2 + MCL3).

 *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from

 *     MCL2 PCIXCCs.

 *

 *   Z90QUIESCE (not recommended)

 *     Quiesce the driver.  This is intended to stop all new

 *     requests from being processed.  Its use is NOT recommended,

 *     except in circumstances where there is no other way to stop

 *     callers from accessing the driver.  Its original use was to

 *     allow the driver to be "drained" of work in preparation for

 *     a system shutdown.

 *

 *     NOTE: once issued, this ban on new work cannot be undone

 *           except by unloading and reloading the driver.

 */



/**

 * Supported ioctl calls

 */

#define ICARSAMODEXPO	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0)

#define ICARSACRT	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0)



/* DEPRECATED status calls (bound for removal at some point) */

#define ICAZ90STATUS	_IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status)

#define Z90STAT_PCIXCCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x43, int)



/* unrelated to ICA callers */

#define Z90QUIESCE	_IO(Z90_IOCTL_MAGIC, 0x11)



/* New status calls */

#define Z90STAT_TOTALCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x40, int)

#define Z90STAT_PCICACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x41, int)

#define Z90STAT_PCICCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x42, int)

#define Z90STAT_PCIXCCMCL2COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4b, int)

#define Z90STAT_PCIXCCMCL3COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4c, int)

#define Z90STAT_CEX2CCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4d, int)

#define Z90STAT_CEX2ACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4e, int)

#define Z90STAT_REQUESTQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x44, int)

#define Z90STAT_PENDINGQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x45, int)

#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int)

#define Z90STAT_DOMAIN_INDEX	_IOR(Z90_IOCTL_MAGIC, 0x47, int)

#define Z90STAT_STATUS_MASK	_IOR(Z90_IOCTL_MAGIC, 0x48, char[64])

#define Z90STAT_QDEPTH_MASK	_IOR(Z90_IOCTL_MAGIC, 0x49, char[64])

#define Z90STAT_PERDEV_REQCNT	_IOR(Z90_IOCTL_MAGIC, 0x4a, int[64])

#include <asm/z90crypt.h>



/**

 * local errno definitions

include/acpi/platform/aclinux.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 


#ifdef __KERNEL__



#include <linux/config.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/ctype.h>

include/acpi/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __ACPI_PROCESSOR_H



#include <linux/kernel.h>

#include <linux/config.h>



#include <asm/acpi.h>

include/asm-alpha/bitops.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_BITOPS_H

#define _ALPHA_BITOPS_H



#include <linux/config.h>

#include <asm/compiler.h>



/*

include/asm-alpha/cache.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#ifndef __ARCH_ALPHA_CACHE_H

#define __ARCH_ALPHA_CACHE_H



#include <linux/config.h>



/* Bytes per L1 (data) cache line. */

#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)

CRA Git | Maintained and supported by SUSTech CRA and CCSE