 cee4cca740
			
		
	
	
	cee4cca740
	
	
	
		
			
			* 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
		
			
				
	
	
		
			72 lines
		
	
	
	
		
			2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
	
		
			2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * This file is subject to the terms and conditions of the GNU General Public
 | |
|  * License.  See the file "COPYING" in the main directory of this archive
 | |
|  * for more details.
 | |
|  *
 | |
|  * Copyright (C) 2003, 2004 Chris Dearman
 | |
|  * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
 | |
|  */
 | |
| #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H
 | |
| #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H
 | |
| 
 | |
| 
 | |
| /*
 | |
|  * CPU feature overrides for MIPS boards
 | |
|  */
 | |
| #ifdef CONFIG_CPU_MIPS32
 | |
| #define cpu_has_tlb		1
 | |
| #define cpu_has_4kex		1
 | |
| #define cpu_has_4k_cache	1
 | |
| /* #define cpu_has_fpu		? */
 | |
| /* #define cpu_has_32fpr	? */
 | |
| #define cpu_has_counter		1
 | |
| /* #define cpu_has_watch	? */
 | |
| #define cpu_has_divec		1
 | |
| #define cpu_has_vce		0
 | |
| /* #define cpu_has_cache_cdex_p	? */
 | |
| /* #define cpu_has_cache_cdex_s	? */
 | |
| /* #define cpu_has_prefetch	? */
 | |
| #define cpu_has_mcheck		1
 | |
| /* #define cpu_has_ejtag	? */
 | |
| #ifdef CONFIG_CPU_HAS_LLSC
 | |
| #define cpu_has_llsc		1
 | |
| #else
 | |
| #define cpu_has_llsc		0
 | |
| #endif
 | |
| /* #define cpu_has_vtag_icache	? */
 | |
| /* #define cpu_has_dc_aliases	? */
 | |
| /* #define cpu_has_ic_fills_f_dc ? */
 | |
| #define cpu_has_nofpuex		0
 | |
| /* #define cpu_has_64bits	? */
 | |
| /* #define cpu_has_64bit_zero_reg ? */
 | |
| /* #define cpu_has_subset_pcaches ? */
 | |
| #define cpu_icache_snoops_remote_store 1
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_CPU_MIPS64
 | |
| #define cpu_has_tlb		1
 | |
| #define cpu_has_4kex		1
 | |
| #define cpu_has_4k_cache	1
 | |
| /* #define cpu_has_fpu		? */
 | |
| /* #define cpu_has_32fpr	? */
 | |
| #define cpu_has_counter		1
 | |
| /* #define cpu_has_watch	? */
 | |
| #define cpu_has_divec		1
 | |
| #define cpu_has_vce		0
 | |
| /* #define cpu_has_cache_cdex_p	? */
 | |
| /* #define cpu_has_cache_cdex_s	? */
 | |
| /* #define cpu_has_prefetch	? */
 | |
| #define cpu_has_mcheck		1
 | |
| /* #define cpu_has_ejtag	? */
 | |
| #define cpu_has_llsc		1
 | |
| /* #define cpu_has_vtag_icache	? */
 | |
| /* #define cpu_has_dc_aliases	? */
 | |
| /* #define cpu_has_ic_fills_f_dc ? */
 | |
| #define cpu_has_nofpuex		0
 | |
| /* #define cpu_has_64bits	? */
 | |
| /* #define cpu_has_64bit_zero_reg ? */
 | |
| /* #define cpu_has_subset_pcaches ? */
 | |
| #define cpu_icache_snoops_remote_store 1
 | |
| #endif
 | |
| 
 | |
| #endif /* __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H */
 |