mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 03:43:03 +00:00
6440f462f9
* commit 'v3.10.49': (529 commits)
Linux 3.10.49
ACPI / battery: Retry to get battery information if failed during probing
x86, ioremap: Speed up check for RAM pages
Score: Modify the Makefile of Score, remove -mlong-calls for compiling
Score: The commit is for compiling successfully.
Score: Implement the function csum_ipv6_magic
score: normalize global variables exported by vmlinux.lds
rtmutex: Plug slow unlock race
rtmutex: Handle deadlock detection smarter
rtmutex: Detect changes in the pi lock chain
rtmutex: Fix deadlock detector for real
ring-buffer: Check if buffer exists before polling
drm/radeon: stop poisoning the GART TLB
drm/radeon: fix typo in golden register setup on evergreen
ext4: disable synchronous transaction batching if max_batch_time==0
ext4: clarify error count warning messages
ext4: fix unjournalled bg descriptor while initializing inode bitmap
dm io: fix a race condition in the wake up code for sync_io
Drivers: hv: vmbus: Fix a bug in the channel callback dispatch code
clk: spear3xx: Use proper control register offset
...
In addition to bringing in upstream commits, this merge also makes minor
changes to mainitain compatibility with upstream:
The definition of list_next_entry in qcrypto.c and ipa_dp.c has been
removed, as upstream has moved the definition to list.h. The implementation
of list_next_entry was identical between the two.
irq.c, for both arm and arm64 architecture, has had its calls to
__irq_set_affinity_locked updated to reflect changes to the API upstream.
Finally, as we have removed the sleep_length member variable of the
tick_sched struct, all changes made by upstream commit ec804bd do not
apply to our tree and have been removed from this merge. Only
kernel/time/tick-sched.c is impacted.
Change-Id: I63b7e0c1354812921c94804e1f3b33d1ad6ee3f1
Signed-off-by: Ian Maund <imaund@codeaurora.org>
114 lines
1.7 KiB
Plaintext
114 lines
1.7 KiB
Plaintext
menu "Machine selection"
|
|
|
|
config SCORE
|
|
def_bool y
|
|
select GENERIC_IRQ_SHOW
|
|
select GENERIC_IOMAP
|
|
select GENERIC_ATOMIC64
|
|
select HAVE_MEMBLOCK
|
|
select HAVE_MEMBLOCK_NODE_MAP
|
|
select ARCH_DISCARD_MEMBLOCK
|
|
select GENERIC_CPU_DEVICES
|
|
select GENERIC_CLOCKEVENTS
|
|
select HAVE_MOD_ARCH_SPECIFIC
|
|
select VIRT_TO_BUS
|
|
select MODULES_USE_ELF_REL
|
|
select CLONE_BACKWARDS
|
|
|
|
choice
|
|
prompt "System type"
|
|
default MACH_SPCT6600
|
|
|
|
config ARCH_SCORE7
|
|
bool "SCORE7 processor"
|
|
select SYS_SUPPORTS_32BIT_KERNEL
|
|
select CPU_SCORE7
|
|
select GENERIC_HAS_IOMAP
|
|
|
|
config MACH_SPCT6600
|
|
bool "SPCT6600 series based machines"
|
|
select SYS_SUPPORTS_32BIT_KERNEL
|
|
select CPU_SCORE7
|
|
select GENERIC_HAS_IOMAP
|
|
|
|
config SCORE_SIM
|
|
bool "Score simulator"
|
|
select SYS_SUPPORTS_32BIT_KERNEL
|
|
select CPU_SCORE7
|
|
select GENERIC_HAS_IOMAP
|
|
endchoice
|
|
|
|
endmenu
|
|
|
|
config CPU_SCORE7
|
|
bool
|
|
|
|
config NO_DMA
|
|
bool
|
|
default y
|
|
|
|
config RWSEM_GENERIC_SPINLOCK
|
|
def_bool y
|
|
|
|
config GENERIC_HWEIGHT
|
|
def_bool y
|
|
|
|
config GENERIC_CALIBRATE_DELAY
|
|
def_bool y
|
|
|
|
menu "Kernel type"
|
|
|
|
config 32BIT
|
|
def_bool y
|
|
|
|
config ARCH_FLATMEM_ENABLE
|
|
def_bool y
|
|
|
|
source "mm/Kconfig"
|
|
|
|
config MEMORY_START
|
|
hex
|
|
default 0xa0000000
|
|
|
|
source "kernel/Kconfig.hz"
|
|
source "kernel/Kconfig.preempt"
|
|
|
|
endmenu
|
|
|
|
config RWSEM_GENERIC_SPINLOCK
|
|
def_bool y
|
|
|
|
config LOCKDEP_SUPPORT
|
|
def_bool y
|
|
|
|
config STACKTRACE_SUPPORT
|
|
def_bool y
|
|
|
|
source "init/Kconfig"
|
|
|
|
config MMU
|
|
def_bool y
|
|
|
|
menu "Executable file formats"
|
|
|
|
source "fs/Kconfig.binfmt"
|
|
|
|
endmenu
|
|
|
|
source "net/Kconfig"
|
|
|
|
source "drivers/Kconfig"
|
|
|
|
source "fs/Kconfig"
|
|
|
|
source "arch/score/Kconfig.debug"
|
|
|
|
source "security/Kconfig"
|
|
|
|
source "crypto/Kconfig"
|
|
|
|
source "lib/Kconfig"
|
|
|
|
config NO_IOMEM
|
|
def_bool y
|