![Linus Torvalds](/assets/img/avatar_default.png)
* 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
49 lines
1.3 KiB
C
49 lines
1.3 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) 2005 Ilya A. Volynets-Evenbakh
|
|
* Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
|
|
*/
|
|
#ifndef __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H
|
|
#define __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H
|
|
|
|
|
|
/*
|
|
* R5000 has an interesting "restriction": ll(d)/sc(d)
|
|
* instructions to XKPHYS region simply do uncached bus
|
|
* requests. This breaks all the atomic bitops functions.
|
|
* so, for 64bit IP32 kernel we just don't use ll/sc.
|
|
* This does not affect luserland.
|
|
*/
|
|
#if (defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_NEVADA)) && defined(CONFIG_64BIT)
|
|
#define cpu_has_llsc 0
|
|
#else
|
|
#define cpu_has_llsc 1
|
|
#endif
|
|
|
|
/* Settings which are common for all ip32 CPUs */
|
|
#define cpu_has_tlb 1
|
|
#define cpu_has_4kex 1
|
|
#define cpu_has_fpu 1
|
|
#define cpu_has_32fpr 1
|
|
#define cpu_has_counter 1
|
|
#define cpu_has_mips16 0
|
|
#define cpu_has_vce 0
|
|
#define cpu_has_cache_cdex_s 0
|
|
#define cpu_has_mcheck 0
|
|
#define cpu_has_ejtag 0
|
|
#define cpu_has_vtag_icache 0
|
|
#define cpu_has_ic_fills_f_dc 0
|
|
#define cpu_has_dsp 0
|
|
#define cpu_has_4k_cache 1
|
|
|
|
|
|
#define cpu_has_mips32r1 0
|
|
#define cpu_has_mips32r2 0
|
|
#define cpu_has_mips64r1 0
|
|
#define cpu_has_mips64r2 0
|
|
|
|
#endif /* __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H */
|