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

Commit c0c463d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus',... 

Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM

* 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  debug: Make CONFIG_EXPERT select CONFIG_DEBUG_KERNEL to unhide debug options

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Remove unused CHECK_IRQ_PER_CPU()

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools, x86: Fix 32-bit compile on 64-bit system
parents e7254219 a03fc8c3 f505c553 a7de9153 08a4a43f

arch/um/sys-i386/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ 


obj-$(CONFIG_BINFMT_ELF) += elfcore.o



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

subarch-obj-y = lib/string_32.o

subarch-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += lib/rwsem.o

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

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

include/linux/irq.h

+0 −5
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ enum { 


#define IRQ_NO_BALANCING_MASK	(IRQ_PER_CPU | IRQ_NO_BALANCING)



static inline __deprecated bool CHECK_IRQ_PER_CPU(unsigned int status)

{

	return status & IRQ_PER_CPU;

}



/*

 * Return value for chip->irq_set_affinity()

 *

init/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -917,6 +917,8 @@ config ANON_INODES 


menuconfig EXPERT

	bool "Configure standard kernel features (expert users)"

	# Unhide debug options, to make the on-by-default options visible

	select DEBUG_KERNEL

	help

	  This option allows certain base kernel options and settings

          to be disabled or tweaked. This is for specialized

tools/perf/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ ifeq ($(ARCH),i386) 
endif

ifeq ($(ARCH),x86_64)

	ARCH := x86

	IS_X86_64 := 0

	ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))

		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)

	endif

	ifeq (${IS_X86_64}, 1)

		RAW_ARCH := x86_64

		ARCH_CFLAGS := -DARCH_X86_64