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

Commit 5245698f authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

x86, UML: remove x86-specific implementations of find_first_bit 



x86 has been switched to the generic versions of find_first_bit
and find_first_zero_bit, but the original versions were retained.
This patch just removes the now unused x86-specific versions.

also update UML.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3a483050

arch/um/Kconfig.i386

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA 
	bool

	default y



config GENERIC_FIND_FIRST_BIT

	bool

	default y



config GENERIC_FIND_NEXT_BIT

	bool

	default y

arch/um/Kconfig.x86_64

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ config SMP_BROKEN 
	bool

	default y



config GENERIC_FIND_FIRST_BIT

	bool

	default y



config GENERIC_FIND_NEXT_BIT

	bool

	default y

arch/um/sys-i386/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ 
	ptrace_user.o setjmp.o signal.o stub.o stub_segv.o syscalls.o sysrq.o \

	sys_call_table.o tls.o



subarch-obj-y = lib/bitops_32.o lib/semaphore_32.o lib/string_32.o

subarch-obj-y = lib/semaphore_32.o lib/string_32.o

subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o

subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o

arch/um/sys-x86_64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \ 


obj-$(CONFIG_MODULES) += um_module.o



subarch-obj-y = lib/bitops_64.o lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o

subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o

subarch-obj-$(CONFIG_MODULES) += kernel/module_64.o



ldt-y = ../sys-i386/ldt.o

arch/x86/lib/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ else 


        lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o

        lib-y += thunk_64.o clear_page_64.o copy_page_64.o

        lib-y += bitops_64.o

        lib-y += memmove_64.o memset_64.o

        lib-y += copy_user_64.o rwlock_64.o copy_user_nocache_64.o

endif