summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-29 18:10:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-29 18:10:36 -0800
commit6e3eed9850064e38a98851ff91534bb32438b292 (patch)
treef7311219b84f7073255c6f8255946c6fbe693e52 /Documentation
parentceb5eb0cb3fe61d488aa76aba748409775a56daa (diff)
parent05dfdbbd678ea2b642db73f48b75667a23d15484 (diff)
downloadlinux-6e3eed9850064e38a98851ff91534bb32438b292.tar.gz
linux-6e3eed9850064e38a98851ff91534bb32438b292.tar.bz2
linux-6e3eed9850064e38a98851ff91534bb32438b292.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: Fix a memory leak with the lg object during launcher close lguest: disable the FORTIFY for lguest. lguest: typos fix
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/lguest/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile
index 725eef81cd48..1f4f9e888bd1 100644
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
@@ -1,5 +1,5 @@
# This creates the demonstration utility "lguest" which runs a Linux guest.
-CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE
LDLIBS:=-lz
all: lguest