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

# 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; \

         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

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

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

TOP_ADDR := $(CONFIG_TOP_ADDR)

# 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

/*

 * 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;

}

#include "linux/module.h"

#include "asm/checksum.h"

/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial);