um: merge arch/um/sys-{i386,x86_64}/asm (27f85f12) · Commits · 戴 / test

arch/um/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,12 @@ core-y += $(ARCH_DIR)/kernel/ \
		MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas

		include $(srctree)/$(ARCH_DIR)/Makefile-skas
		include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)

		SHARED_HEADERS := $(ARCH_DIR)/include/shared
		ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS)
		ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
		KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)
		KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)

		# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so
		@@ -46,8 +48,6 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
		$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
		$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include

		include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)

		#This will adjust *FLAGS accordingly to the platform.
		include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)

arch/um/sys-i386/asm/elf.h

deleted100644 → 0

+0 −125

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
		* Licensed under the GPL
		*/
		#ifndef __UM_ELF_I386_H
		#define __UM_ELF_I386_H

		#include <asm/user.h>
		#include "skas.h"

		#define R_386_NONE 0
		#define R_386_32 1
		#define R_386_PC32 2
		#define R_386_GOT32 3
		#define R_386_PLT32 4
		#define R_386_COPY 5
		#define R_386_GLOB_DAT 6
		#define R_386_JMP_SLOT 7
		#define R_386_RELATIVE 8
		#define R_386_GOTOFF 9
		#define R_386_GOTPC 10
		#define R_386_NUM 11

		typedef unsigned long elf_greg_t;

		#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
		typedef elf_greg_t elf_gregset_t[ELF_NGREG];

		typedef struct user_i387_struct elf_fpregset_t;

		/*
		* This is used to ensure we don't load something for the wrong architecture.
		*/
		#define elf_check_arch(x) \
		(((x)->e_machine == EM_386) \|\| ((x)->e_machine == EM_486))

		#define ELF_CLASS ELFCLASS32
		#define ELF_DATA ELFDATA2LSB
		#define ELF_ARCH EM_386

		#define ELF_PLAT_INIT(regs, load_addr) do { \
		PT_REGS_EBX(regs) = 0; \
		PT_REGS_ECX(regs) = 0; \
		PT_REGS_EDX(regs) = 0; \
		PT_REGS_ESI(regs) = 0; \
		PT_REGS_EDI(regs) = 0; \
		PT_REGS_EBP(regs) = 0; \
		PT_REGS_EAX(regs) = 0; \
		} while (0)

		#define ELF_EXEC_PAGESIZE 4096

		#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)

		/* Shamelessly stolen from include/asm-i386/elf.h */

		#define ELF_CORE_COPY_REGS(pr_reg, regs) do { \
		pr_reg[0] = PT_REGS_EBX(regs); \
		pr_reg[1] = PT_REGS_ECX(regs); \
		pr_reg[2] = PT_REGS_EDX(regs); \
		pr_reg[3] = PT_REGS_ESI(regs); \
		pr_reg[4] = PT_REGS_EDI(regs); \
		pr_reg[5] = PT_REGS_EBP(regs); \
		pr_reg[6] = PT_REGS_EAX(regs); \
		pr_reg[7] = PT_REGS_DS(regs); \
		pr_reg[8] = PT_REGS_ES(regs); \
		/* fake once used fs and gs selectors? */ \
		pr_reg[9] = PT_REGS_DS(regs); \
		pr_reg[10] = PT_REGS_DS(regs); \
		pr_reg[11] = PT_REGS_SYSCALL_NR(regs); \
		pr_reg[12] = PT_REGS_IP(regs); \
		pr_reg[13] = PT_REGS_CS(regs); \
		pr_reg[14] = PT_REGS_EFLAGS(regs); \
		pr_reg[15] = PT_REGS_SP(regs); \
		pr_reg[16] = PT_REGS_SS(regs); \
		} while (0);

		#define task_pt_regs(t) (&(t)->thread.regs)

		struct task_struct;

		extern int elf_core_copy_fpregs(struct task_struct t, elf_fpregset_t fpu);

		#define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)

		extern long elf_aux_hwcap;
		#define ELF_HWCAP (elf_aux_hwcap)

		extern char * elf_aux_platform;
		#define ELF_PLATFORM (elf_aux_platform)

		#define SET_PERSONALITY(ex) do { } while (0)

		extern unsigned long vsyscall_ehdr;
		extern unsigned long vsyscall_end;
		extern unsigned long __kernel_vsyscall;

		#define VSYSCALL_BASE vsyscall_ehdr
		#define VSYSCALL_END vsyscall_end

		/*
		* This is the range that is readable by user mode, and things
		* acting like user mode such as get_user_pages.
		*/
		#define FIXADDR_USER_START VSYSCALL_BASE
		#define FIXADDR_USER_END VSYSCALL_END

		#define __HAVE_ARCH_GATE_AREA 1

		/*
		* Architecture-neutral AT_ values in 0-17, leave some room
		* for more of them, start the x86-specific ones at 32.
		*/
		#define AT_SYSINFO 32
		#define AT_SYSINFO_EHDR 33

		#define ARCH_DLINFO \
		do { \
		if ( vsyscall_ehdr ) { \
		NEW_AUX_ENT(AT_SYSINFO, __kernel_vsyscall); \
		NEW_AUX_ENT(AT_SYSINFO_EHDR, vsyscall_ehdr); \
		} \
		} while (0)

		#endif

arch/um/sys-i386/asm/module.h

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		#ifndef __UM_MODULE_I386_H
		#define __UM_MODULE_I386_H

		/* UML is simple */
		struct mod_arch_specific
		{
		};

		#define Elf_Shdr Elf32_Shdr
		#define Elf_Sym Elf32_Sym
		#define Elf_Ehdr Elf32_Ehdr

		#endif

arch/um/sys-i386/asm/vm-flags.h

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2004 Jeff Dike (jdike@addtoit.com)
		* Licensed under the GPL
		*/

		#ifndef __VM_FLAGS_I386_H
		#define __VM_FLAGS_I386_H

		#define VM_DATA_DEFAULT_FLAGS \
		(VM_READ \| VM_WRITE \| \
		((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) \| \
		VM_MAYREAD \| VM_MAYWRITE \| VM_MAYEXEC)

		#endif

arch/um/sys-i386/asm/archparam.h→arch/um/sys-x86/asm/archparam.h

+6 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
		* Copyright 2003 PathScale, Inc.
		* Licensed under the GPL
		*/

		#ifndef __UM_ARCHPARAM_I386_H
		#define __UM_ARCHPARAM_I386_H
		#ifndef __UM_ARCHPARAM_H
		#define __UM_ARCHPARAM_H

		#ifdef CONFIG_X86_32

		#ifdef CONFIG_X86_PAE
		#define LAST_PKMAP 512
		@@ -14,3 +17,4 @@

		#endif

		#endif

Admin message