x86, um: merge Kconfig.i386 and Kconfig.x86_64