From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Oct 2012 20:45:43 +0000 (-0700)
Subject: Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers
X-Git-Tag: firefly_0821_release~3680^2~1926
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9b2e077c42a97fcbdc0dd71edb1fc9d15c74ad29;p=firefly-linux-kernel-4.4.55.git

Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers

Pull preparatory patches for user API disintegration from David Howells:
 "The patches herein prepare for the extraction of the Userspace API
  bits from the various header files named in the Kbuild files.

  New subdirectories are created under either include/uapi/ or
  arch/x/include/uapi/ that correspond to the subdirectory containing
  that file under include/ or arch/x/include/.

  The new subdirs under the uapi/ directory are populated with Kbuild
  files that mostly do nothing at this time.  Further patches will
  disintegrate the headers in each original directory and fill in the
  Kbuild files as they do it.

  These patches also:

   (1) fix up #inclusions of "foo.h" rather than <foo.h>.

   (2) Remove some redundant #includes from the DRM code.

   (3) Make the kernel build infrastructure handle Kbuild files both in
       the old places and the new UAPI place that both specify headers
       to be exported.

   (4) Fix some kernel tools that #include kernel headers during their
       build.

  I have compile tested this with allyesconfig against x86_64,
  allmodconfig against i386 and a scattering of additional defconfigs of
  other arches.  Prepared for main script

  Signed-off-by: David Howells <dhowells@redhat.com>
  Acked-by: Arnd Bergmann <arnd@arndb.de>
  Acked-by: Thomas Gleixner <tglx@linutronix.de>
  Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
  Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
  Acked-by: Dave Jones <davej@redhat.com>
  Acked-by: H. Peter Anvin <hpa@zytor.com>"

* tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: Plumb the UAPI Kbuilds into the user header installation and checking
  UAPI: x86: Differentiate the generated UAPI and internal headers
  UAPI: Remove the objhdr-y export list
  UAPI: Move linux/version.h
  UAPI: Set up uapi/asm/Kbuild.asm
  UAPI: x86: Fix insn_sanity build failure after UAPI split
  UAPI: x86: Fix the test_get_len tool
  UAPI: (Scripted) Set up UAPI Kbuild files
  UAPI: Partition the header include path sets and add uapi/ header directories
  UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
  UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
  UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
  UAPI: Refer to the DRM UAPI headers with <...> and from certain headers only
---

9b2e077c42a97fcbdc0dd71edb1fc9d15c74ad29
diff --cc arch/x86/include/asm/xen/interface.h
index 555f94d3637b,80502a2bb789..1707cfa928fb
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@@ -121,13 -116,11 +121,13 @@@ struct arch_shared_info 
  #endif	/* !__ASSEMBLY__ */
  
  #ifdef CONFIG_X86_32
- #include "interface_32.h"
+ #include <asm/xen/interface_32.h>
  #else
- #include "interface_64.h"
+ #include <asm/xen/interface_64.h>
  #endif
  
 +#include <asm/pvclock-abi.h>
 +
  #ifndef __ASSEMBLY__
  /*
   * The following is all CPU context. Note that the fpu_ctxt block is filled