Re: [PATCH] x86/mm: fix regression with huge pages on PAE

From: Kirill A. Shutemov
Date: Tue Nov 10 2015 - 10:07:22 EST


On Tue, Nov 10, 2015 at 03:46:48PM +0100, Borislav Petkov wrote:
> On Tue, Nov 10, 2015 at 03:53:03PM +0200, Kirill A. Shutemov wrote:
> > Oh.. pmdval_t/pudval_t is 'unsinged long' on 64 bit. But realmode code
> > uses -m16 which makes 'unsigned long' 32-bit therefore truncation warning.
> >
> > These helpers not really used in realmode code.
>
> Hrrm, yeah, that's just the nasty include hell causing it. The diff
> below fixes it with my config but it'll probably need a more careful
> analysis and reshuffling of includes/defines.
>
> Certainly better to do that than accomodating realmode to not throw
> warnings with ifdeffery...

Yeah. Looks good to me.

> ---
> diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
> index 0033e96c3f09..9011a88353de 100644
> --- a/arch/x86/boot/boot.h
> +++ b/arch/x86/boot/boot.h
> @@ -23,7 +23,6 @@
> #include <stdarg.h>
> #include <linux/types.h>
> #include <linux/edd.h>
> -#include <asm/boot.h>
> #include <asm/setup.h>
> #include "bitops.h"
> #include "ctype.h"
> diff --git a/arch/x86/boot/video-mode.c b/arch/x86/boot/video-mode.c
> index aa8a96b052e3..896077ed3381 100644
> --- a/arch/x86/boot/video-mode.c
> +++ b/arch/x86/boot/video-mode.c
> @@ -19,6 +19,9 @@
> #include "video.h"
> #include "vesa.h"
>
> +#define NORMAL_VGA 0xffff /* 80x25 mode */
> +#define EXTENDED_VGA 0xfffe /* 80x50 mode */
> +
> /*
> * Common variables
> */
> diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
> index 05111bb8d018..a839448038b6 100644
> --- a/arch/x86/boot/video.c
> +++ b/arch/x86/boot/video.c
> @@ -17,6 +17,8 @@
> #include "video.h"
> #include "vesa.h"
>
> +#define ASK_VGA 0xfffd /* ask for it at bootup */
> +
> static u16 video_segment;
>
> static void store_cursor_position(void)
> diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
> index 48d34d28f5a6..cd0fc0cc78bc 100644
> --- a/arch/x86/include/asm/x86_init.h
> +++ b/arch/x86/include/asm/x86_init.h
> @@ -1,7 +1,6 @@
> #ifndef _ASM_X86_PLATFORM_H
> #define _ASM_X86_PLATFORM_H
>
> -#include <asm/pgtable_types.h>
> #include <asm/bootparam.h>
>
> struct mpc_bus;
>
> --
> Regards/Gruss,
> Boris.
>
> ECO tip #101: Trim your mails when you reply.

--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/