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

Commit 9b79ed95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3:
  x86, bitops: select the generic bitmap search functions
  x86: include/asm-x86/pgalloc.h/bitops.h: checkpatch cleanups - formatting only
  x86: finalize bitops unification
  x86, UML: remove x86-specific implementations of find_first_bit
  x86: optimize find_first_bit for small bitmaps
  x86: switch 64-bit to generic find_first_bit
  x86: generic versions of find_first_(zero_)bit, convert i386
  bitops: use __fls for fls64 on 64-bit archs
  generic: implement __fls on all 64-bit archs
  generic: introduce a generic __fls implementation
  x86: merge the simple bitops and move them to bitops.h
  x86, generic: optimize find_next_(zero_)bit for small constant-size bitmaps
  x86, uml: fix uml with generic find_next_bit for x86
  x86: change x86 to use generic find_next_bit
  uml: Kconfig cleanup
  uml: fix build error
parents a52b0d25 19870def

arch/um/Kconfig.x86_64

+7 −0
Original line number Diff line number Diff line 


menu "Host processor type and features"



source "arch/x86/Kconfig.cpu"



endmenu



config UML_X86

	bool

	default y

arch/um/os-Linux/helper.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "os.h"

#include "um_malloc.h"

#include "user.h"

#include <linux/limits.h>



struct helper_data {

	void (*pre_exec)(void*);

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/Kconfig.cpu

+6 −1
Original line number Diff line number Diff line
@@ -278,6 +278,11 @@ config GENERIC_CPU 


endchoice



config X86_CPU

	def_bool y

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT



config X86_GENERIC

	bool "Generic x86 support"

	depends on X86_32
@@ -398,7 +403,7 @@ config X86_TSC 
# generates cmov.

config X86_CMOV

	def_bool y

	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)

	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || X86_64)



config X86_MINIMUM_CPU_FAMILY

	int