2006-11-01 05:43:05

by Chris Wright

[permalink] [raw]
Subject: [PATCH 42/61] uml: make Uml compile on FC6 kernel headers

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Ulrich Drepper <[email protected]>

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 <[email protected]>
Cc: Jeff Dike <[email protected]>
Cc: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Chris Wright <[email protected]>

---
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"

--