| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 28 Jul 2011 16:51:27 +0100 From: David Howells <dhowells@...hat.com> To: torvalds@...l.org Cc: linux-kernel@...r.kernel.org, linux-kbuild@...r.kernel.org, David Howells <dhowells@...hat.com> Subject: [PATCH 13/40] UAPI: Remove the inclusion of linux/types.h from x86's asm/page.h [ver #3] Remove the inclusion of linux/types.h from x86's asm/page.h as it's included via asm/page_types.h. Make asm/page_types.h's inclusion dependent on not being in assembly. Signed-off-by: David Howells <dhowells@...hat.com> --- arch/x86/include/asm/page.h | 2 -- arch/x86/include/asm/page_types.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 8ca8283..d4ee8d8 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -1,8 +1,6 @@ #ifndef _ASM_X86_PAGE_H #define _ASM_X86_PAGE_H -#include <linux/types.h> - #ifdef __KERNEL__ #include <asm/page_types.h> diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index bce688d..eeff662 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -2,7 +2,10 @@ #define _ASM_X86_PAGE_DEFS_H #include <linux/const.h> + +#ifndef __ASSEMBLY__ #include <linux/types.h> +#endif /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists