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

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers 

* 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
  UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
  UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
  UAPI: Make linux/patchkey.h easier to parse
  UAPI: Fix nested __KERNEL__ guards in video/edid.h
  UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
  UAPI: Guard linux/cuda.h
  UAPI: Guard linux/pmu.h
  UAPI: Guard linux/isdn_divertif.h
  UAPI: Guard linux/sound.h
  UAPI: Rearrange definition of HZ in asm-generic/param.h
  UAPI: Make FRV use asm-generic/param.h
  UAPI: Make M32R use asm-generic/param.h
  UAPI: Make MN10300 use asm-generic/param.h
  UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
  UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
  UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
parents fed47485 1632b9e2

arch/arm/include/asm/hwcap.h

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
#define HWCAP_IDIVT	(1 << 18)

#define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)

#if defined(__KERNEL__)

#if !defined(__ASSEMBLY__)

/*

 * This yields a mask that user programs can use to figure out what

 * instruction set this cpu supports.
@@ -33,5 +34,6 @@ 
#define ELF_HWCAP	(elf_hwcap)

extern unsigned int elf_hwcap;

#endif

#endif



#endif

arch/arm/include/asm/swab.h

+5 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#  define __SWAB_64_THRU_32__

#endif



#if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6

#if defined(__KERNEL__)

#if __LINUX_ARM_ARCH__ >= 6



static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)

{
@@ -39,8 +40,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) 
}

#define __arch_swab32 __arch_swab32



#else

#endif

#endif



#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6

static inline __attribute_const__ __u32 __arch_swab32(__u32 x)

{

	__u32 t;

arch/arm/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -427,7 +427,8 @@ 
/*

 * The following syscalls are obsolete and no longer available for EABI.

 */

#if defined(__ARM_EABI__) && !defined(__KERNEL__)

#if !defined(__KERNEL__)

#if defined(__ARM_EABI__)

#undef __NR_time

#undef __NR_umount

#undef __NR_stime
@@ -441,6 +442,7 @@ 
#undef __NR_syscall

#undef __NR_ipc

#endif

#endif



#ifdef __KERNEL__

arch/frv/include/asm/param.h

+1 −15
Original line number Diff line number Diff line 
#ifndef _ASM_PARAM_H

#define _ASM_PARAM_H



#ifdef __KERNEL__

#define HZ		CONFIG_HZ	/* Internal kernel timer frequency */

#define USER_HZ		100		/* .. some user interfaces are in "ticks" */

#define CLOCKS_PER_SEC	(USER_HZ)	/* like times() */

#endif



#ifndef HZ

#define HZ 100

#endif



#define EXEC_PAGESIZE	16384



#ifndef NOGROUP

#define NOGROUP		(-1)

#endif



#define MAXHOSTNAMELEN		64	/* max length of hostname */

#include <asm-generic/param.h>



#endif /* _ASM_PARAM_H */

arch/ia64/include/asm/intrinsics.h

+13 −8
Original line number Diff line number Diff line
@@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); 
#endif



#ifndef __ASSEMBLY__

#if defined(CONFIG_PARAVIRT) && defined(__KERNEL__)



#define IA64_INTRINSIC_API(name)	ia64_native_ ## name

#define IA64_INTRINSIC_MACRO(name)	ia64_native_ ## name



#if defined(__KERNEL__)

#if defined(CONFIG_PARAVIRT)

# undef IA64_INTRINSIC_API

# undef IA64_INTRINSIC_MACRO

# ifdef ASM_SUPPORTED

#  define IA64_INTRINSIC_API(name)	paravirt_ ## name

# else

#  define IA64_INTRINSIC_API(name)	pv_cpu_ops.name

# endif

#define IA64_INTRINSIC_MACRO(name)	paravirt_ ## name

#else

#define IA64_INTRINSIC_API(name)	ia64_native_ ## name

#define IA64_INTRINSIC_MACRO(name)	ia64_native_ ## name

#endif

#endif



/************************************************/

CRA Git | Maintained and supported by SUSTech CRA and CCSE