lkml.org 
[lkml]   [2004]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] UML - Allow vsyscall code to build on 2.4
Date
From
From: Bodo Stroesser <bstroesser@fujitsu-siemens.com>

This patch fixes compilation on 2.4 hosts by not relying on macros from 2.6
host kernel headers in one userspace file. It's about AT_SYSINFO_* macros.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>

diff -puN /dev/null arch/um/include/elf_user.h
--- /dev/null 2004-06-30 21:04:37.000000000 +0200
+++ linux-2.6.10-rc2-root/arch/um/include/elf_user.h 2004-11-25 17:33:23.559706592 +0100
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2004 Fujitsu Siemens Computers GmbH
+ * Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
+ * Licensed under the GPL
+ */
+
+#ifndef __ELF_USER_H__
+#define __ELF_USER_H__
+
+/* For compilation on a host that doesn't support AT_SYSINFO (Linux 2.4) */
+
+#ifndef AT_SYSINFO
+#define AT_SYSINFO 32
+#endif
+#ifndef AT_SYSINFO_EHDR
+#define AT_SYSINFO_EHDR 33
+#endif
+
+#endif
diff -puN arch/um/os-Linux/elf_aux.c~compile-elf_aux arch/um/os-Linux/elf_aux.c
--- linux-2.6.10-rc2/arch/um/os-Linux/elf_aux.c~compile-elf_aux 2004-11-25 17:33:23.555707903 +0100
+++ linux-2.6.10-rc2-root/arch/um/os-Linux/elf_aux.c 2004-11-25 17:33:23.559706592 +0100
@@ -10,6 +10,7 @@
#include <elf.h>
#include <stddef.h>
#include "init.h"
+#include "elf_user.h"

#if ELF_CLASS == ELFCLASS32
typedef Elf32_auxv_t elf_auxv_t;
_
-
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/

\
 
 \ /
  Last update: 2005-03-22 14:08    [W:0.047 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site