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

Commit c45166be authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: support AES i586 crypto driver 



We want to make possible, for the user, to enable the i586 AES implementation.
This requires a restructure.

- Add a CONFIG_UML_X86 to notify that we are building a UML for i386.

- Rename CONFIG_64_BIT to CONFIG_64BIT as is used for all other archs

- Tell crypto/Kconfig that UML_X86 is as good as X86

- Tell it that it must exclude not X86_64 but 64BIT, which will give the
  same results.

- Tell kbuild to descend down into arch/i386/crypto/ to build what's needed.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b05d85a8

arch/um/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ config KERNEL_HALF_GIGS 


config HIGHMEM

	bool "Highmem support"

	depends on !64BIT



config KERNEL_STACK_ORDER

	int "Kernel stack size order"

arch/um/Kconfig_i386

+5 −1
Original line number Diff line number Diff line 
config 64_BIT

config UML_X86

	bool

	default y



config 64BIT

	bool

	default n

arch/um/Kconfig_x86_64

+5 −1
Original line number Diff line number Diff line 
config 64_BIT

config UML_X86

	bool

	default y



config 64BIT

	bool

	default y

arch/um/Makefile-i386

+1 −1
Original line number Diff line number Diff line 
SUBARCH_CORE := arch/um/sys-i386/

SUBARCH_CORE := arch/um/sys-i386/ arch/i386/crypto/



TOP_ADDR := $(CONFIG_TOP_ADDR)

arch/um/defconfig

+5 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc1-bk1

# Sun Mar 20 16:53:00 2005

# Linux kernel version: 2.6.12-rc3-skas3-v9-pre2

# Sun Apr 24 19:46:10 2005

#

CONFIG_GENERIC_HARDIRQS=y

CONFIG_UML=y
@@ -15,7 +15,8 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
#

CONFIG_MODE_TT=y

CONFIG_MODE_SKAS=y

# CONFIG_64_BIT is not set

CONFIG_UML_X86=y

# CONFIG_64BIT is not set

CONFIG_TOP_ADDR=0xc0000000

# CONFIG_3_LEVEL_PGTABLES is not set

CONFIG_ARCH_HAS_SC_SIGNALS=y
@@ -41,6 +42,7 @@ CONFIG_UML_REAL_TIME_CLOCK=y 
CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -158,7 +160,6 @@ CONFIG_UML_NET_SLIRP=y 
#

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -412,6 +413,5 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_FS is not set

CONFIG_FRAME_POINTER=y

CONFIG_PT_PROXY=y

# CONFIG_GPROF is not set

# CONFIG_GCOV is not set

# CONFIG_SYSCALL_DEBUG is not set