Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0e6a1fb1167b8d230c6edcebd31e173cd0add1e5

Authored by Linus Torvalds
2 parents 1d7b24ff33 171b3f0da7
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Just two fixes here - one for the recent addition of Neon stuff which
  causes problems when this is built as a module.  The other was one
  spotted by Olof with the fixed-HZ stuff.

  Last patch (which is at the very top) is not a fix per-se, but an
  almost-end-of-merge window sorting of the select symbols in
  arch/arm/Kconfig to keep them as akpm would like to reduce unnecessary
  conflicts.  I've also taken the liberty this time to add a comment at
  the end to discourage the endless "add the next select to the bottom
  of a nicely sorted list" syndrome"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: sort arch/arm/Kconfig
  ARM: fix forced-HZ values
  ARM: 7835/2: fix modular build of xor_blocks() with NEON enabled

Showing 3 changed files Side-by-side Diff

... ... @@ -3,20 +3,21 @@
3 3 default y
4 4 select ARCH_BINFMT_ELF_RANDOMIZE_PIE
5 5 select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
6   - select ARCH_HAVE_CUSTOM_GPIO_H
7 6 select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
  7 + select ARCH_HAVE_CUSTOM_GPIO_H
8 8 select ARCH_WANT_IPC_PARSE_VERSION
9 9 select BUILDTIME_EXTABLE_SORT if MMU
  10 + select CLONE_BACKWARDS
10 11 select CPU_PM if (SUSPEND || CPU_IDLE)
11 12 select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN && MMU
12 13 select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)
13 14 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  15 + select GENERIC_IDLE_POLL_SETUP
14 16 select GENERIC_IRQ_PROBE
15 17 select GENERIC_IRQ_SHOW
16 18 select GENERIC_PCI_IOMAP
17 19 select GENERIC_SCHED_CLOCK
18 20 select GENERIC_SMP_IDLE_THREAD
19   - select GENERIC_IDLE_POLL_SETUP
20 21 select GENERIC_STRNCPY_FROM_USER
21 22 select GENERIC_STRNLEN_USER
22 23 select HARDIRQS_SW_RESEND
... ... @@ -25,6 +26,7 @@
25 26 select HAVE_ARCH_SECCOMP_FILTER
26 27 select HAVE_ARCH_TRACEHOOK
27 28 select HAVE_BPF_JIT
  29 + select HAVE_CONTEXT_TRACKING
28 30 select HAVE_C_RECORDMCOUNT
29 31 select HAVE_DEBUG_KMEMLEAK
30 32 select HAVE_DMA_API_DEBUG
... ... @@ -47,6 +49,7 @@
47 49 select HAVE_KPROBES if !XIP_KERNEL
48 50 select HAVE_KRETPROBES if (HAVE_KPROBES)
49 51 select HAVE_MEMBLOCK
  52 + select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
50 53 select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
51 54 select HAVE_PERF_EVENTS
52 55 select HAVE_REGS_AND_STACK_ACCESS_API
53 56  
... ... @@ -54,15 +57,14 @@
54 57 select HAVE_UID16
55 58 select IRQ_FORCED_THREADING
56 59 select KTIME_SCALAR
  60 + select MODULES_USE_ELF_REL
  61 + select OLD_SIGACTION
  62 + select OLD_SIGSUSPEND3
57 63 select PERF_USE_VMALLOC
58 64 select RTC_LIB
59 65 select SYS_SUPPORTS_APM_EMULATION
60   - select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
61   - select MODULES_USE_ELF_REL
62   - select CLONE_BACKWARDS
63   - select OLD_SIGSUSPEND3
64   - select OLD_SIGACTION
65   - select HAVE_CONTEXT_TRACKING
  66 + # Above selects are sorted alphabetically; please add new ones
  67 + # according to that. Thanks.
66 68 help
67 69 The ARM series is a line of low-power-consumption RISC chip designs
68 70 licensed by ARM Ltd and targeted at embedded applications and
69 71  
... ... @@ -386,8 +388,8 @@
386 388 bool "Cortina Systems Gemini"
387 389 select ARCH_REQUIRE_GPIOLIB
388 390 select ARCH_USES_GETTIMEOFFSET
389   - select NEED_MACH_GPIO_H
390 391 select CPU_FA526
  392 + select NEED_MACH_GPIO_H
391 393 help
392 394 Support for the Cortina Systems Gemini family SoCs
393 395  
394 396  
... ... @@ -487,8 +489,8 @@
487 489 select GENERIC_CLOCKEVENTS
488 490 select MIGHT_HAVE_PCI
489 491 select NEED_MACH_IO_H
490   - select USB_EHCI_BIG_ENDIAN_MMIO
491 492 select USB_EHCI_BIG_ENDIAN_DESC
  493 + select USB_EHCI_BIG_ENDIAN_MMIO
492 494 help
493 495 Support for Intel's IXP4XX (XScale) family of processors.
494 496  
495 497  
... ... @@ -498,11 +500,11 @@
498 500 select CPU_PJ4
499 501 select GENERIC_CLOCKEVENTS
500 502 select MIGHT_HAVE_PCI
  503 + select MVEBU_MBUS
501 504 select PINCTRL
502 505 select PINCTRL_DOVE
503 506 select PLAT_ORION_LEGACY
504 507 select USB_ARCH_HAS_EHCI
505   - select MVEBU_MBUS
506 508 help
507 509 Support for the Marvell Dove SoC 88AP510
508 510  
509 511  
... ... @@ -512,12 +514,12 @@
512 514 select ARCH_REQUIRE_GPIOLIB
513 515 select CPU_FEROCEON
514 516 select GENERIC_CLOCKEVENTS
  517 + select MVEBU_MBUS
515 518 select PCI
516 519 select PCI_QUIRKS
517 520 select PINCTRL
518 521 select PINCTRL_KIRKWOOD
519 522 select PLAT_ORION_LEGACY
520   - select MVEBU_MBUS
521 523 help
522 524 Support for the following Marvell Kirkwood series SoCs:
523 525 88F6180, 88F6192 and 88F6281.
524 526  
... ... @@ -527,9 +529,9 @@
527 529 select ARCH_REQUIRE_GPIOLIB
528 530 select CPU_FEROCEON
529 531 select GENERIC_CLOCKEVENTS
  532 + select MVEBU_MBUS
530 533 select PCI
531 534 select PLAT_ORION_LEGACY
532   - select MVEBU_MBUS
533 535 help
534 536 Support for the following Marvell MV78xx0 series SoCs:
535 537 MV781x0, MV782x0.
536 538  
... ... @@ -540,9 +542,9 @@
540 542 select ARCH_REQUIRE_GPIOLIB
541 543 select CPU_FEROCEON
542 544 select GENERIC_CLOCKEVENTS
  545 + select MVEBU_MBUS
543 546 select PCI
544 547 select PLAT_ORION_LEGACY
545   - select MVEBU_MBUS
546 548 help
547 549 Support for the following Marvell Orion 5x series SoCs:
548 550 Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
549 551  
... ... @@ -758,8 +760,8 @@
758 760 select HAVE_S3C2410_WATCHDOG if WATCHDOG
759 761 select HAVE_S3C_RTC if RTC_CLASS
760 762 select NEED_MACH_GPIO_H
761   - select SAMSUNG_WDT_RESET
762 763 select SAMSUNG_ATAGS
  764 + select SAMSUNG_WDT_RESET
763 765 help
764 766 Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
765 767 SMDK6450.
766 768  
... ... @@ -777,8 +779,8 @@
777 779 select HAVE_S3C2410_WATCHDOG if WATCHDOG
778 780 select HAVE_S3C_RTC if RTC_CLASS
779 781 select NEED_MACH_GPIO_H
780   - select SAMSUNG_WDT_RESET
781 782 select SAMSUNG_ATAGS
  783 + select SAMSUNG_WDT_RESET
782 784 help
783 785 Samsung S5PC100 series based systems
784 786  
785 787  
... ... @@ -1619,9 +1621,10 @@
1619 1621 ARCH_S5PV210 || ARCH_EXYNOS4
1620 1622 default AT91_TIMER_HZ if ARCH_AT91
1621 1623 default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
  1624 + default 0
1622 1625  
1623 1626 choice
1624   - depends on !HZ_FIXED
  1627 + depends on HZ_FIXED = 0
1625 1628 prompt "Timer frequency"
1626 1629  
1627 1630 config HZ_100
... ... @@ -1646,7 +1649,7 @@
1646 1649  
1647 1650 config HZ
1648 1651 int
1649   - default HZ_FIXED if HZ_FIXED
  1652 + default HZ_FIXED if HZ_FIXED != 0
1650 1653 default 100 if HZ_100
1651 1654 default 200 if HZ_200
1652 1655 default 250 if HZ_250
arch/arm/lib/Makefile
Diff comments   View file @ 0e6a1fb
... ... @@ -49,6 +49,6 @@
49 49 ifeq ($(CONFIG_KERNEL_MODE_NEON),y)
50 50 NEON_FLAGS := -mfloat-abi=softfp -mfpu=neon
51 51 CFLAGS_xor-neon.o += $(NEON_FLAGS)
52   - lib-$(CONFIG_XOR_BLOCKS) += xor-neon.o
  52 + obj-$(CONFIG_XOR_BLOCKS) += xor-neon.o
53 53 endif
arch/arm/lib/xor-neon.c
Diff comments   View file @ 0e6a1fb
... ... @@ -9,7 +9,10 @@
9 9 */
10 10  
11 11 #include <linux/raid/xor.h>
  12 +#include <linux/module.h>
12 13  
  14 +MODULE_LICENSE("GPL");
  15 +
13 16 #ifndef __ARM_NEON__
14 17 #error You should compile this file with '-mfloat-abi=softfp -mfpu=neon'
15 18 #endif
... ... @@ -40,4 +43,5 @@
40 43 .do_4 = xor_8regs_4,
41 44 .do_5 = xor_8regs_5,
42 45 };
  46 +EXPORT_SYMBOL(xor_block_neon_inner);