Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6582b7f7 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: merge arch/um/sys-{i386,x86_64} 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 858ba944

arch/um/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ archclean: 


# Generated files



$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@

$(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(HEADER_ARCH) $@



define filechk_gen-asm-offsets

        (set -e; \
@@ -137,7 +137,7 @@ define filechk_gen-asm-offsets 
         echo ""; )

endef



include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s

include/generated/user_constants.h: $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s

	$(call filechk,gen-asm-offsets)



export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH

arch/um/Makefile-i386

+1 −1
Original line number Diff line number Diff line 
core-y += arch/um/sys-i386/ arch/x86/crypto/

core-y += arch/um/sys-x86/ arch/x86/crypto/



TOP_ADDR := $(CONFIG_TOP_ADDR)

arch/um/Makefile-x86_64

+1 −1
Original line number Diff line number Diff line 
# Copyright 2003 - 2004 Pathscale, Inc

# Released under the GPL



core-y += arch/um/sys-x86_64/ arch/x86/crypto/

core-y += arch/um/sys-x86/ arch/x86/crypto/

START := 0x60000000



_extra_flags_ = -fno-builtin -m64

arch/um/sys-i386/bug.c

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Jeff Dike (jdike@addtoit.com)

 * Licensed under the GPL V2

 */



#include <linux/uaccess.h>

#include <asm/errno.h>



/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because

 * that's not relevant in skas mode.

 */



int is_valid_bugaddr(unsigned long eip)

{

	unsigned short ud2;



	if (probe_kernel_address((unsigned short __user *)eip, ud2))

		return 0;



	return ud2 == 0x0b0f;

}

arch/um/sys-i386/ksyms.c

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#include "linux/module.h"

#include "asm/checksum.h"



/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial);