diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 20:25:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 20:25:34 -0400 |
| commit | 27c1ee3f929555b71fa39ec0d81a7e7185de1b16 (patch) | |
| tree | 42e40bdfe4efac660d650658019391536ce67a42 /arch/mips/Kconfig | |
| parent | 37cd9600a9e20359b0283983c9e3a55d84347168 (diff) | |
| parent | 086ff4b3a7fb9cdf41e6a5d0ccd99b86d84633a1 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge Andrew's first set of patches:
"Non-MM patches:
- lots of misc bits
- tree-wide have_clk() cleanups
- quite a lot of printk tweaks. I draw your attention to "printk:
convert the format for KERN_<LEVEL> to a 2 byte pattern" which
looks a bit scary. But afaict it's solid.
- backlight updates
- lib/ feature work (notably the addition and use of memweight())
- checkpatch updates
- rtc updates
- nilfs updates
- fatfs updates (partial, still waiting for acks)
- kdump, proc, fork, IPC, sysctl, taskstats, pps, etc
- new fault-injection feature work"
* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
drivers/misc/lkdtm.c: fix missing allocation failure check
lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
fault-injection: add tool to run command with failslab or fail_page_alloc
fault-injection: add selftests for cpu and memory hotplug
powerpc: pSeries reconfig notifier error injection module
memory: memory notifier error injection module
PM: PM notifier error injection module
cpu: rewrite cpu-notifier-error-inject module
fault-injection: notifier error injection
c/r: fcntl: add F_GETOWNER_UIDS option
resource: make sure requested range is included in the root range
include/linux/aio.h: cpp->C conversions
fs: cachefiles: add support for large files in filesystem caching
pps: return PTR_ERR on error in device_create
taskstats: check nla_reserve() return
sysctl: suppress kmemleak messages
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
ipc: compat: use signed size_t types for msgsnd and msgrcv
ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
ipc: add COMPAT_SHMLBA support
...
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 750429018534..e3efc06e6409 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -20,12 +20,14 @@ config MIPS | |||
| 20 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 20 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
| 21 | select RTC_LIB if !MACH_LOONGSON | 21 | select RTC_LIB if !MACH_LOONGSON |
| 22 | select GENERIC_ATOMIC64 if !64BIT | 22 | select GENERIC_ATOMIC64 if !64BIT |
| 23 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | ||
| 23 | select HAVE_DMA_ATTRS | 24 | select HAVE_DMA_ATTRS |
| 24 | select HAVE_DMA_API_DEBUG | 25 | select HAVE_DMA_API_DEBUG |
| 25 | select HAVE_GENERIC_HARDIRQS | 26 | select HAVE_GENERIC_HARDIRQS |
| 26 | select GENERIC_IRQ_PROBE | 27 | select GENERIC_IRQ_PROBE |
| 27 | select GENERIC_IRQ_SHOW | 28 | select GENERIC_IRQ_SHOW |
| 28 | select HAVE_ARCH_JUMP_LABEL | 29 | select HAVE_ARCH_JUMP_LABEL |
| 30 | select ARCH_WANT_IPC_PARSE_VERSION | ||
| 29 | select IRQ_FORCED_THREADING | 31 | select IRQ_FORCED_THREADING |
| 30 | select HAVE_MEMBLOCK | 32 | select HAVE_MEMBLOCK |
| 31 | select HAVE_MEMBLOCK_NODE_MAP | 33 | select HAVE_MEMBLOCK_NODE_MAP |