blob: 7c6f9589ed5a952f4d0cec8b6dbc60a5abc3322e [file] [log] [blame]
From stable-bounces@linux.kernel.org Tue Oct 17 12:49:35 2006
From: Ulrich Drepper <drepper@redhat.com>
To: stable@kernel.org
Date: Tue, 17 Oct 2006 17:01:13 +0200
Message-Id: <11610972733507-git-send-email-blaisorblade@yahoo.it>
Cc: Andrew Morton <akpm@osdl.org>, Jeff Dike <jdike@addtoit.com>, Ulrich Drepper <drepper@redhat.com>
Subject: uml: make Uml compile on FC6 kernel headers
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
From: Ulrich Drepper <drepper@redhat.com>
I need this patch to get a UML kernel to compile. This is with the kernel
headers in FC6 which are automatically generated from the kernel tree.
Some headers are missing but those files don't need them. At least it
appears so since the resulting kernel works fine.
Tested on x86-64.
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
arch/um/include/kern_util.h | 1 -
arch/um/sys-x86_64/stub_segv.c | 1 -
2 files changed, 2 deletions(-)
--- linux-2.6.18.1.orig/arch/um/include/kern_util.h
+++ linux-2.6.18.1/arch/um/include/kern_util.h
@@ -6,7 +6,6 @@
#ifndef __KERN_UTIL_H__
#define __KERN_UTIL_H__
-#include "linux/threads.h"
#include "sysdep/ptrace.h"
#include "sysdep/faultinfo.h"
--- linux-2.6.18.1.orig/arch/um/sys-x86_64/stub_segv.c
+++ linux-2.6.18.1/arch/um/sys-x86_64/stub_segv.c
@@ -5,7 +5,6 @@
#include <stddef.h>
#include <signal.h>
-#include <linux/compiler.h>
#include <asm/unistd.h>
#include "uml-config.h"
#include "sysdep/sigcontext.h"