Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934031AbXLNQSN (ORCPT ); Fri, 14 Dec 2007 11:18:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934139AbXLNQRl (ORCPT ); Fri, 14 Dec 2007 11:17:41 -0500 Received: from saraswathi.solana.com ([198.99.130.12]:41477 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762328AbXLNQRj (ORCPT ); Fri, 14 Dec 2007 11:17:39 -0500 Date: Fri, 14 Dec 2007 11:16:47 -0500 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel , Peter Zijlstra Subject: [PATCH] UML - Add asm/fixmap.h include Message-ID: <20071214161647.GA5802@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1106 Lines: 30 [ This needs to go into 2.6.24, as it fixes a build breakage seen on x86_64 ] um_uaccess.h refers to FIXADDR_USER_*, so it should include fixmap.h. I also changed the non-UML includes to use <> instead of "". Signed-off-by: Jeff Dike --- arch/um/include/um_uaccess.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6.22/arch/um/include/um_uaccess.h =================================================================== --- linux-2.6.22.orig/arch/um/include/um_uaccess.h 2007-12-13 10:09:22.000000000 -0500 +++ linux-2.6.22/arch/um/include/um_uaccess.h 2007-12-13 15:11:42.000000000 -0500 @@ -6,7 +6,8 @@ #ifndef __ARCH_UM_UACCESS_H #define __ARCH_UM_UACCESS_H -#include "asm/elf.h" +#include +#include #include "sysdep/archsetjmp.h" #define __under_task_size(addr, size) \ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/