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
This commit is contained in:
Коммит
cee4cca740
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* 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
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/ctype.h>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#define __ACPI_PROCESSOR_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/config.h>
|
||||
|
||||
#include <asm/acpi.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_BITOPS_H
|
||||
#define _ALPHA_BITOPS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/compiler.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_CACHEFLUSH_H
|
||||
#define _ALPHA_CACHEFLUSH_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
/* Caches aren't brain-dead on the Alpha. */
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
/* Define to experiment with fitting everything into one 512MB HAE window. */
|
||||
#define CIA_ONE_HAE_WINDOW 1
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
#include <asm/compiler.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ALPHA_T2__H__
|
||||
#define __ALPHA_T2__H__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/compiler.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_DMA_MAPPING_H
|
||||
#define _ALPHA_DMA_MAPPING_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#ifndef _ASM_DMA_H
|
||||
#define _ASM_DMA_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef __ASM_ALPHA_FLOPPY_H
|
||||
#define __ASM_ALPHA_FLOPPY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define fd_inb(port) inb_p(port)
|
||||
#define fd_outb(value,port) outb_p(value,port)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_HARDIRQ_H
|
||||
#define _ALPHA_HARDIRQ_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/threads.h>
|
||||
#include <linux/cache.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_HW_IRQ_H
|
||||
#define _ALPHA_HW_IRQ_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define IDE_ARCH_OBSOLETE_DEFAULTS
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <asm/compiler.h>
|
||||
#include <asm/system.h>
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/config.h>
|
||||
|
||||
#if defined(CONFIG_ALPHA_GENERIC)
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
/* Dummy header just to define km_type. */
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_DEBUG_HIGHMEM
|
||||
# define D(n) __KM_FENCE_##n ,
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ALPHA_MACHVEC_H
|
||||
#define __ALPHA_MACHVEC_H 1
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
* Copyright (C) 1996, Linus Torvalds
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm/compiler.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef _ASM_MMZONE_H_
|
||||
#define _ASM_MMZONE_H_
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
struct bootmem_data_t; /* stupid forward decl. */
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_PAGE_H
|
||||
#define _ALPHA_PAGE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/pal.h>
|
||||
|
||||
/* PAGE_SHIFT determines the page size */
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
hardware ignores reprogramming. We also need userland buy-in to the
|
||||
change in HZ, since this is visible in the wait4 resources etc. */
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifndef HZ
|
||||
# ifndef CONFIG_ALPHA_RAWHIDE
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_PGALLOC_H
|
||||
#define _ALPHA_PGALLOC_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/mmzone.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* This hopefully works with any standard Alpha page-size, as defined
|
||||
* in <asm/page.h> (currently 8192).
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
#include <linux/mmzone.h>
|
||||
|
||||
#include <asm/page.h>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
* include/asm-alpha/serial.h
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* This assumes you have a 1.8432 MHz clock for your UART.
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ASM_SMP_H
|
||||
#define __ASM_SMP_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/threads.h>
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/bitops.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_SPINLOCK_H
|
||||
#define _ALPHA_SPINLOCK_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/system.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <asm/current.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ALPHA_SYSTEM_H
|
||||
#define __ALPHA_SYSTEM_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/pal.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/barrier.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ALPHA_TLBFLUSH_H
|
||||
#define _ALPHA_TLBFLUSH_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/mm.h>
|
||||
#include <asm/compiler.h>
|
||||
|
||||
|
|
|
@ -383,6 +383,8 @@
|
|||
#define __NR_inotify_add_watch 445
|
||||
#define __NR_inotify_rm_watch 446
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#define NR_SYSCALLS 447
|
||||
|
||||
#if defined(__GNUC__)
|
||||
|
@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\
|
|||
_syscall_return(type); \
|
||||
}
|
||||
|
||||
#endif /* __LIBRARY__ && __GNUC__ */
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#define __ARCH_WANT_IPC_PARSE_VERSION
|
||||
#define __ARCH_WANT_OLD_READDIR
|
||||
#define __ARCH_WANT_STAT64
|
||||
|
@ -578,7 +579,6 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\
|
|||
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
|
||||
#define __ARCH_WANT_SYS_OLDUMOUNT
|
||||
#define __ARCH_WANT_SYS_SIGPENDING
|
||||
#endif
|
||||
|
||||
#ifdef __KERNEL_SYSCALLS__
|
||||
|
||||
|
@ -661,4 +661,5 @@ asmlinkage long sys_rt_sigaction(int sig,
|
|||
|
||||
#define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _ALPHA_UNISTD_H */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef ARM_ASM_SA1100_APM_H
|
||||
#define ARM_ASM_SA1100_APM_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/apm_bios.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#ifndef __ASM_ARCH_MEMORY_H
|
||||
#define __ASM_ARCH_MEMORY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define PHYS_OFFSET UL(0xf0000000)
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
#include <linux/config.h>
|
||||
#define acornfb_valid_pixrate(var) (var->pixclock >= 39325 && var->pixclock <= 40119)
|
||||
|
||||
static inline void
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#ifndef __ASM_ARCH_HARDWARE_H
|
||||
#define __ASM_ARCH_HARDWARE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define CLPS7111_VIRT_BASE 0xff000000
|
||||
#define CLPS7111_BASE CLPS7111_VIRT_BASE
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#ifndef __ASM_ARCH_MEMORY_H
|
||||
#define __ASM_ARCH_MEMORY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* Physical DRAM offset.
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
#include <asm/arch/io.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/hardware/clps7111.h>
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#ifndef __ASM_ARCH_HARDWARE_H
|
||||
#define __ASM_ARCH_HARDWARE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/arch/memory.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_FOOTBRIDGE
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#ifndef __ASM_ARCH_MEMORY_H
|
||||
#define __ASM_ARCH_MEMORY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#if defined(CONFIG_FOOTBRIDGE_ADDIN)
|
||||
/*
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_FOOTBRIDGE
|
||||
#define VMALLOC_END (PAGE_OFFSET + 0x30000000)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef ASMARM_ARCH_SMP_H
|
||||
#define ASMARM_ARCH_SMP_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/io.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef __ASM_ARCH_MEMORY_H
|
||||
#define __ASM_ARCH_MEMORY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/hardware.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
*
|
||||
* IOP3xx architecture timex specifications
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
#include <asm/hardware.h>
|
||||
|
||||
#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/*
|
||||
* linux/include/asm-arm/arch-iop3xx/uncompress.h
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <linux/serial_reg.h>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#ifndef __ASM_ARCH_DMA_H
|
||||
#define __ASM_ARCH_DMA_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/pci.h>
|
||||
#include <asm/page.h>
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#ifndef __ASM_ARCH_CONSTANTS_H
|
||||
#define __ASM_ARCH_CONSTANTS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/* Addressing constants */
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#ifndef __ASM_ARCH_IRQS_H
|
||||
#define __ASM_ARCH_IRQS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define FIQ_START 80
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/arch/constants.h>
|
||||
|
||||
#ifndef __ASM_ARCH_REGISTERS_H
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef _OMAP_BOARD_H
|
||||
#define _OMAP_BOARD_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
/* Different peripheral ids */
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
#define __ASM_ARCH_OMAP_HARDWARE_H
|
||||
|
||||
#include <asm/sizes.h>
|
||||
#include <linux/config.h>
|
||||
#ifndef __ASSEMBLER__
|
||||
#include <asm/types.h>
|
||||
#include <asm/arch/cpu.h>
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
*/
|
||||
#ifndef __ASM_ARCH_SYSTEM_H
|
||||
#define __ASM_ARCH_SYSTEM_H
|
||||
#include <linux/config.h>
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
* kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/serial_reg.h>
|
||||
#include <asm/arch/serial.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
* Changes for 2.6 kernel.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* Note: this file must be safe to include in assembly files
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_PXA27x
|
||||
#define PXA_IRQ_SKIP 0
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef __PXA_REGS_H
|
||||
#define __PXA_REGS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* PXA Chip selects
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#if defined(CONFIG_PXA25x)
|
||||
/* PXA250/210 timer base */
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef ASMARM_ARCH_SMP_H
|
||||
#define ASMARM_ARCH_SMP_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#include <asm/hardware/gic.h>
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#ifndef __ASM_ARCH_DMA_H
|
||||
#define __ASM_ARCH_DMA_H __FILE__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/sysdev.h>
|
||||
#include "hardware.h"
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
||||
#define __ASM_ARCH_UNCOMPRESS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/* defines for UART registers */
|
||||
#include "asm/arch/regs-serial.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#ifndef __ASM_ARCH_ASSABET_H
|
||||
#define __ASM_ARCH_ASSABET_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/* System Configuration Register flags */
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef _INCLUDE_CERF_H_
|
||||
#define _INCLUDE_CERF_H_
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define CERF_ETH_IO 0xf0000000
|
||||
#define CERF_ETH_IRQ IRQ_GPIO26
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef __ASM_ARCH_COLLIE_H
|
||||
#define __ASM_ARCH_COLLIE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define COLLIE_SCP_CHARGE_ON SCOOP_GPCR_PA11
|
||||
#define COLLIE_SCP_DIAG_BOOT1 SCOOP_GPCR_PA12
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef __ASM_ARCH_DMA_H
|
||||
#define __ASM_ARCH_DMA_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include "hardware.h"
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#ifndef __ASM_ARCH_HARDWARE_H
|
||||
#define __ASM_ARCH_HARDWARE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define UNCACHEABLE_ADDR 0xfa050000
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
* architectures.
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
*
|
||||
* 2001/11/14 RMK Cleaned up and standardised a lot of the IRQs.
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
|
||||
#define IRQ_GPIO0 0
|
||||
#define IRQ_GPIO1 1
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#ifndef __ASM_ARCH_MEMORY_H
|
||||
#define __ASM_ARCH_MEMORY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <asm/sizes.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
*
|
||||
* Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
#include <asm/hardware.h>
|
||||
|
||||
static inline void arch_idle(void)
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#ifndef __ASM_ARM_ATOMIC_H
|
||||
#define __ASM_ARM_ATOMIC_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
typedef struct { volatile int counter; } atomic_t;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#define _ASMARM_BUG_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/stddef.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef _ASMARM_CACHEFLUSH_H
|
||||
#define _ASMARM_CACHEFLUSH_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef __ASM_ARM_CPU_H
|
||||
#define __ASM_ARM_CPU_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/percpu.h>
|
||||
|
||||
struct cpuinfo_arm {
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/mm.h> /* need struct page */
|
||||
|
||||
#include <asm/scatterlist.h>
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
typedef unsigned int dmach_t;
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/scatterlist.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ASMARM_ELF_H
|
||||
#define __ASMARM_ELF_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* ELF register definitions..
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#ifndef __ASM_ARM_FPSTATE_H
|
||||
#define __ASM_ARM_FPSTATE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
*/
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef __STDC__
|
||||
#define ____glue(name,fn) name##fn
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ASM_HARDIRQ_H
|
||||
#define __ASM_HARDIRQ_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/cache.h>
|
||||
#include <linux/threads.h>
|
||||
#include <asm/irq.h>
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#define DC21285_PCI_IO 0x7c000000
|
||||
#define DC21285_PCI_MEM 0x80000000
|
||||
|
||||
#include <linux/config.h>
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <asm/hardware.h>
|
||||
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef __ASMARM_HARDWARE_IOMD_H
|
||||
#define __ASMARM_HARDWARE_IOMD_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef ASM_ARM_LEDS_H
|
||||
#define ASM_ARM_LEDS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
typedef enum {
|
||||
led_idle_start,
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
*
|
||||
* Low level machine dependent UART functions.
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
|
||||
struct uart_port;
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
*
|
||||
* Low level machine dependent UART functions.
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
|
||||
struct uart_port;
|
||||
struct uart_info;
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#define UL(x) (x)
|
||||
#endif
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <asm/arch/memory.h>
|
||||
#include <asm/sizes.h>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef _ASMARM_PAGE_H
|
||||
#define _ASMARM_PAGE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/* PAGE_SHIFT determines the page size */
|
||||
#define PAGE_SHIFT 12
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#define ASMARM_PCI_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/config.h>
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#include <asm/hardware.h> /* for PCIBIOS_MIN_* */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* Work out if we need multiple CPU support
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef __ASM_ARM_PTRACE_H
|
||||
#define __ASM_ARM_PTRACE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define PTRACE_GETREGS 12
|
||||
#define PTRACE_SETREGS 13
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef __ASM_ARM_SMP_H
|
||||
#define __ASM_ARM_SMP_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/threads.h>
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/thread_info.h>
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#define CPU_ARCH_UNKNOWN 0
|
||||
#define CPU_ARCH_ARMv3 1
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#ifndef _ASMARM_TLBFLUSH_H
|
||||
#define _ASMARM_TLBFLUSH_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifndef CONFIG_MMU
|
||||
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
#ifndef __ASM_ARM_UNISTD_H
|
||||
#define __ASM_ARM_UNISTD_H
|
||||
|
||||
#include <linux/linkage.h>
|
||||
|
||||
#define __NR_OABI_SYSCALL_BASE 0x900000
|
||||
|
||||
#if defined(__thumb__) || defined(__ARM_EABI__)
|
||||
|
@ -378,6 +376,9 @@
|
|||
#undef __NR_ipc
|
||||
#endif
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/linkage.h>
|
||||
|
||||
#define __sys2(x) #x
|
||||
#define __sys1(x) __sys2(x)
|
||||
|
||||
|
@ -526,7 +527,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
|
|||
__syscall_return(type,__res); \
|
||||
}
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#define __ARCH_WANT_IPC_PARSE_VERSION
|
||||
#define __ARCH_WANT_STAT64
|
||||
#define __ARCH_WANT_SYS_GETHOSTNAME
|
||||
|
@ -547,7 +547,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
|
|||
#define __ARCH_WANT_OLD_READDIR
|
||||
#define __ARCH_WANT_SYS_SOCKETCALL
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __KERNEL_SYSCALLS__
|
||||
|
||||
|
@ -571,7 +570,7 @@ asmlinkage long sys_rt_sigaction(int sig,
|
|||
struct sigaction __user *oact,
|
||||
size_t sigsetsize);
|
||||
|
||||
#endif
|
||||
#endif /* __KERNEL_SYSCALLS__ */
|
||||
|
||||
/*
|
||||
* "Conditional" syscalls
|
||||
|
@ -581,4 +580,5 @@ asmlinkage long sys_rt_sigaction(int sig,
|
|||
*/
|
||||
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* __ASM_ARM_UNISTD_H */
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#ifndef __ASM_ARM_ATOMIC_H
|
||||
#define __ASM_ARM_ATOMIC_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
#error SMP is NOT supported
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ASMARM_BUG_H
|
||||
#define _ASMARM_BUG_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef CONFIG_BUG
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
typedef unsigned int dmach_t;
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/memory.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef __ASM_HARDIRQ_H
|
||||
#define __ASM_HARDIRQ_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/cache.h>
|
||||
#include <linux/threads.h>
|
||||
#include <asm/irq.h>
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#ifndef __ASM_HARDWARE_H
|
||||
#define __ASM_HARDWARE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <asm/memory.h>
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#ifndef ASM_ARM_LEDS_H
|
||||
#define ASM_ARM_LEDS_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
typedef enum {
|
||||
led_idle_start,
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#ifndef __ASM_ARM_MACH_TYPE_H
|
||||
#define __ASM_ARM_MACH_TYPE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
extern unsigned int __machine_arch_type;
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#ifndef _ASMARM_PAGE_H
|
||||
#define _ASMARM_PAGE_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#ifndef __ASSEMBLY__
|
||||
|
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче