From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754279Ab3KYI5f (ORCPT ); Mon, 25 Nov 2013 03:57:35 -0500 Received: from gerard.telenet-ops.be ([195.130.132.48]:39876 "EHLO gerard.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719Ab3KYIzq (ORCPT ); Mon, 25 Nov 2013 03:55:46 -0500 From: Geert Uytterhoeven To: Arnd Bergmann , linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org Subject: [PATCH 22/24] s390: Separate kernel/userspace inclusion of Date: Mon, 25 Nov 2013 09:55:32 +0100 Message-Id: <1385369734-24893-23-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> References: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows to rename the kernelspace version later. Now arch/s390/include/asm/types.h includes the kernelspace version, while arch/s390/include/uapi/asm/types.h includes the userspace version. As arch/s390/include/uapi/asm/types.h is also included for kernelspace, its inclusion of needs to be protected by #ifndef __KERNEL__. Signed-off-by: Geert Uytterhoeven Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/types.h | 1 + arch/s390/include/uapi/asm/types.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index dccef3ca91fa..a5c7e829dbc3 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h @@ -6,6 +6,7 @@ #ifndef _S390_TYPES_H #define _S390_TYPES_H +#include #include /* diff --git a/arch/s390/include/uapi/asm/types.h b/arch/s390/include/uapi/asm/types.h index 038f2b9178a4..13b5ad14380d 100644 --- a/arch/s390/include/uapi/asm/types.h +++ b/arch/s390/include/uapi/asm/types.h @@ -7,7 +7,9 @@ #ifndef _UAPI_S390_TYPES_H #define _UAPI_S390_TYPES_H +#ifndef __KERNEL__ #include +#endif #ifndef __ASSEMBLY__ -- 1.7.9.5