Merge branch 'akpm'

* akpm:
  kernel/smp.c: consolidate writes in smp_call_function_interrupt()
  kernel/smp.c: fix smp_call_function_many() SMP race
  memcg: correctly order reading PCG_USED and pc->mem_cgroup
  backlight: fix 88pm860x_bl macro collision
  drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
  MAINTAINERS: update Atmel AT91 entry
  mm: fix truncate_setsize() comment
  memcg: fix rmdir, force_empty with THP
  memcg: fix LRU accounting with THP
  memcg: fix USED bit handling at uncharge in THP
  memcg: modify accounting function for supporting THP better
  fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
  mm: compaction: prevent division-by-zero during user-requested compaction
  mm/vmscan.c: remove duplicate include of compaction.h
  memblock: fix memblock_is_region_memory()
  thp: keep highpte mapped until it is no longer needed
  kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ccac7d090727..b7980a83ce2d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -5,7 +5,7 @@
 menu "Character devices"
 
 config VT
-        bool "Virtual terminal" if EMBEDDED
+        bool "Virtual terminal" if EXPERT
         depends on !S390
         select INPUT
         default y
@@ -39,13 +39,13 @@ config VT
 config CONSOLE_TRANSLATIONS
         depends on VT
         default y
-        bool "Enable character translations in console" if EMBEDDED
+        bool "Enable character translations in console" if EXPERT
         ---help---
           This enables support for font mapping and Unicode translation
           on virtual consoles.
 
 config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EMBEDDED
+        bool "Support for console on virtual terminal" if EXPERT
         depends on VT
         default y
         ---help---
@@ -429,7 +429,7 @@ config SGI_MBCS
 source "drivers/tty/serial/Kconfig"
 
 config UNIX98_PTYS
-        bool "Unix98 PTY support" if EMBEDDED
+        bool "Unix98 PTY support" if EXPERT
         default y
         ---help---
           A pseudo terminal (PTY) is a software device consisting of two
@@ -495,7 +495,7 @@ config LEGACY_PTY_COUNT
 
 config TTY_PRINTK
         bool "TTY driver to output user messages via printk"
-        depends on EMBEDDED
+        depends on EXPERT
         default n
         ---help---
           If you say Y here, the support for writing user messages (i.e.