• Michal Marek's avatar
    Makefile: include arch/*/include/generated/uapi before .../generated · 90ac086b
    Michal Marek authored
    The introduction of the uapi directories in v3.7-rc1 moved some of the
    generated headers from arch/*/include/generated to the uapi directory,
    keeping the #include directives intact.
    This creates a problem when bisecting, because the unversioned files are
    not cleaned automatically by git and the compiler might include stale
    headers as a result.  Instead of cleaning them in the Makefiles, promote
    arch/*/include/generated/uapi in the search path.  Under normal
    circumstances, there is no overlap between this uapi subdirectory and
    its parent, so the include choices remain the same.  We keep
    arch/*/include/generated/uapi in the USERINCLUDE variable so that it is
    usable standalone.
    Note that we cannot completely swap the order of the uapi and
    kernel-only directories, since the headers in include/uapi/asm-generic
    are meant to be wrapped by their include/asm-generic counterparts when
    building kernel code.
    Reported-by: default avatar"Nicholas A. Bellinger" <nab@linux-iscsi.org>
    Reported-by: default avatarDavid Drysdale <dmd@lurklurk.org>
    Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Makefile 53.1 KB