From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2012 02:03:30 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers
X-Git-Tag: v3.3-rc1~56
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=dca88ad6915b65f6e037f8c3e632fcd92a70bd88;p=~andy%2Flinux

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
---

dca88ad6915b65f6e037f8c3e632fcd92a70bd88
diff --cc arch/arm/include/asm/swab.h
index 32ee164a2f6,e82adf64d1d..b859d82e30c
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@@ -22,9 -22,10 +22,10 @@@
  #  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__ __u16 __arch_swab16(__u16 x)
 +static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
  {
  	__asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x));
  	return x;
diff --cc arch/mips/include/asm/types.h
index 43bf70ebd3a,9b96461bc1e..1228b25b290
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@@ -15,12 -15,22 +15,16 @@@
   * We don't use int-l64.h for the kernel anymore but still use it for
   * userspace to avoid code changes.
   */
- #if (_MIPS_SZLONG == 64) && !defined(__KERNEL__)
- # include <asm-generic/int-l64.h>
- #else
+ #ifdef __KERNEL__
  # include <asm-generic/int-ll64.h>
+ #else
+ # if _MIPS_SZLONG == 64
+ #  include <asm-generic/int-l64.h>
+ # else
+ #  include <asm-generic/int-ll64.h>
+ # endif
  #endif
  
 -#ifndef __ASSEMBLY__
 -
 -typedef unsigned short umode_t;
 -
 -#endif /* __ASSEMBLY__ */
 -
  /*
   * These aren't exported outside the kernel to avoid name space clashes
   */