2006-01-27 18:51:23

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 1/1] UML - compilation fix when MODE_SKAS disabled

This is 2.6.16 material.

From: Pekka Enberg <[email protected]>

This patch fixes the following compilation error when CONFIG_SKAS is disabled:

CC arch/um/sys-i386/ldt.o
arch/um/sys-i386/ldt.c:19:21: proc_mm.h: No such file or directory
make[1]: *** [arch/um/sys-i386/ldt.o] Error 1

Signed-off-by: Pekka Enberg <[email protected]>
Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.15-mm/arch/um/sys-i386/ldt.c
===================================================================
--- linux-2.6.15-mm.orig/arch/um/sys-i386/ldt.c 2006-01-26 17:01:15.000000000 -0500
+++ linux-2.6.15-mm/arch/um/sys-i386/ldt.c 2006-01-26 19:48:23.000000000 -0500
@@ -16,7 +16,6 @@
#include "choose-mode.h"
#include "kern.h"
#include "mode_kern.h"
-#include "proc_mm.h"
#include "os.h"

extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
@@ -90,6 +89,7 @@ out:
#include "skas.h"
#include "skas_ptrace.h"
#include "asm/mmu_context.h"
+#include "proc_mm.h"

long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc,
void **addr, int done)