From patchwork Fri Dec 8 17:57:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jasmin J." X-Patchwork-Id: 45873 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eNMts-0008M7-Ti; Fri, 08 Dec 2017 17:57:29 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752641AbdLHR50 (ORCPT + 1 other); Fri, 8 Dec 2017 12:57:26 -0500 Received: from mail.anw.at ([195.234.101.228]:47424 "EHLO mail.anw.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbdLHR50 (ORCPT ); Fri, 8 Dec 2017 12:57:26 -0500 Received: from hoppel.217.196.72.190 (anwhome.anw.at [195.234.103.23]) by mail.anw.at (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id vB8HvOa2018333; Fri, 8 Dec 2017 18:57:24 +0100 From: "Jasmin J." To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, d.scheller@gmx.net, jasmin@anw.at Subject: [PATCH] build: Fixed include compiler-gcc.h directly error Date: Fri, 8 Dec 2017 18:57:19 +0100 Message-Id: <1512755839-6716-1-git-send-email-jasmin@anw.at> X-Mailer: git-send-email 2.7.4 X-Antivirus: checked in 0.014sec at mail.anw.at ([195.234.102.72]) by smf-clamd v1.2.1 - http://smfs.sf.net/ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Jasmin Jessich The type definitions have been splitting from compiler.h into compiler_types.h. This requires to check for the new and the old include guard in compiler-gcc.h. Signed-off-by: Jasmin Jessich --- backports/backports.txt | 3 +++ backports/v4.14_compiler_h.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 backports/v4.14_compiler_h.patch diff --git a/backports/backports.txt b/backports/backports.txt index 618c4e8..78dfb9c 100644 --- a/backports/backports.txt +++ b/backports/backports.txt @@ -26,6 +26,9 @@ add pr_fmt.patch add debug.patch add drx39xxj.patch +[4.14.255] +add v4.14_compiler_h.patch + [4.12.255] add v4.12_revert_solo6x10_copykerneluser.patch diff --git a/backports/v4.14_compiler_h.patch b/backports/v4.14_compiler_h.patch new file mode 100644 index 0000000..3faa85f --- /dev/null +++ b/backports/v4.14_compiler_h.patch @@ -0,0 +1,11 @@ +diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h +index 2272ded..744334e 100644 +--- a/include/linux/compiler-gcc.h ++++ b/include/linux/compiler-gcc.h +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef __LINUX_COMPILER_TYPES_H ++#if (!defined(__LINUX_COMPILER_TYPES_H) && !defined (__LINUX_COMPILER_H)) + #error "Please don't include directly, include instead." + #endif +