Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c0c463d34adf0c150e5e24fa412fa23f3f7ddc27

Authored by Linus Torvalds
5 parents e72542191c a03fc8c375 f505c553db a7de915383 08a4a43fc4
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-lin… 

…us' 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

Showing 4 changed files Side-by-side Diff

arch/um/sys-i386/Makefile
Diff comments   View file @ c0c463d
... ... @@ -8,7 +8,8 @@
8 8  
9 9 obj-$(CONFIG_BINFMT_ELF) += elfcore.o
10 10  
11   -subarch-obj-y = lib/rwsem.o lib/string_32.o
  11 +subarch-obj-y = lib/string_32.o
  12 +subarch-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += lib/rwsem.o
12 13 subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
13 14 subarch-obj-$(CONFIG_MODULES) += kernel/module.o
14 15  
... ... @@ -96,11 +96,6 @@
96 96  
97 97 #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
98 98  
99   -static inline __deprecated bool CHECK_IRQ_PER_CPU(unsigned int status)
100   -{
101   - return status & IRQ_PER_CPU;
102   -}
103   -
104 99 /*
105 100 * Return value for chip->irq_set_affinity()
106 101 *
... ... @@ -917,6 +917,8 @@
917 917  
918 918 menuconfig EXPERT
919 919 bool "Configure standard kernel features (expert users)"
  920 + # Unhide debug options, to make the on-by-default options visible
  921 + select DEBUG_KERNEL
920 922 help
921 923 This option allows certain base kernel options and settings
922 924 to be disabled or tweaked. This is for specialized
... ... @@ -52,7 +52,10 @@
52 52 endif
53 53 ifeq ($(ARCH),x86_64)
54 54 ARCH := x86
55   - IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
  55 + IS_X86_64 := 0
  56 + ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
  57 + IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
  58 + endif
56 59 ifeq (${IS_X86_64}, 1)
57 60 RAW_ARCH := x86_64
58 61 ARCH_CFLAGS := -DARCH_X86_64