From 61dfd289460e086908a7b00c621235d9a17b0fad Mon Sep 17 00:00:00 2001 From: Pekka J Enberg Date: Mon, 12 Dec 2005 00:37:16 -0800 Subject: [PATCH] --- yaml --- r: 15026 b: refs/heads/master c: bf001b26793bd9f8a446577c361226fbcd617182 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/include/um_uaccess.h | 2 ++ trunk/arch/um/kernel/skas/include/uaccess-skas.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index adf56e139958..6fe959418818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8140a5005bc6f1c9d0fa103460d50d472e6e3426 +refs/heads/master: bf001b26793bd9f8a446577c361226fbcd617182 diff --git a/trunk/arch/um/include/um_uaccess.h b/trunk/arch/um/include/um_uaccess.h index f8760a3f43b0..4567f1eeb4a7 100644 --- a/trunk/arch/um/include/um_uaccess.h +++ b/trunk/arch/um/include/um_uaccess.h @@ -17,6 +17,8 @@ #include "uaccess-skas.h" #endif +#include "asm/fixmap.h" + #define __under_task_size(addr, size) \ (((unsigned long) (addr) < TASK_SIZE) && \ (((unsigned long) (addr) + (size)) < TASK_SIZE)) diff --git a/trunk/arch/um/kernel/skas/include/uaccess-skas.h b/trunk/arch/um/kernel/skas/include/uaccess-skas.h index f611f83ad4ff..64516c556cdf 100644 --- a/trunk/arch/um/kernel/skas/include/uaccess-skas.h +++ b/trunk/arch/um/kernel/skas/include/uaccess-skas.h @@ -7,7 +7,6 @@ #define __SKAS_UACCESS_H #include "asm/errno.h" -#include "asm/fixmap.h" /* No SKAS-specific checking. */ #define access_ok_skas(type, addr, size) 0