From b45d8cb054d7677d75176ae22a584fd84e4650e9 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 22 Oct 2007 10:56:24 +1000 Subject: Make lguest_launcher.h types userspace-friendly lguest_launcher.h uses "u32" not "__u32", which sets a bad example. Fix that, and include . This means we need to use -I on the Launcher build line so types.h is found. Signed-off-by: Rusty Russell --- Documentation/lguest/Makefile | 2 +- Documentation/lguest/lguest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/lguest') diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile index c0b7a4556390..526c15fd83af 100644 --- a/Documentation/lguest/Makefile +++ b/Documentation/lguest/Makefile @@ -11,7 +11,7 @@ endif include $(KBUILD_OUTPUT)/.config LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000) -CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -Wl,-T,lguest.lds +CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -Wl,-T,lguest.lds LDLIBS:=-lz # Removing this works for some versions of ld.so (eg. Ubuntu Feisty) and # not others (eg. FC7). diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index 276f2f651286..fa838e2eb656 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c @@ -45,8 +45,8 @@ typedef unsigned long long u64; typedef uint32_t u32; typedef uint16_t u16; typedef uint8_t u8; -#include "../../include/linux/lguest_launcher.h" -#include "../../include/asm-x86/e820.h" +#include "linux/lguest_launcher.h" +#include "asm-x86/e820.h" /*:*/ #define PAGE_PRESENT 0x7 /* Present, RW, Execute */ -- cgit v1.2.3