login
Search
The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option
is used to configure any non-standard kernel with a much larger scope
than only small devices.
This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes
references to the option in the same file. Followup patches will fix the
remainder of the occurrences in the tree.
Calling the option "EXPERT" more accurately represents its intention:
only expert users who understand the impact of the configuration changes
they are making should enable it.
Signed-off-by: David Rientjes <rientjes@google.com>
---
init/Kconfig | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/init/Kconfig b/init/Kconfig
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -689,8 +689,8 @@ config DEBUG_BLK_CGROUP
endif # CGROUPS
menuconfig NAMESPACES
- bool "Namespaces support" if EMBEDDED
- default !EMBEDDED
+ bool "Namespaces support" if EXPERT
+ default !EXPERT
help
Provides the way to make tasks work with different objects using
the same id. For example same IPC id may refer to different objects
@@ -830,8 +830,8 @@ config SYSCTL
config ANON_INODES
bool
-menuconfig EMBEDDED
- bool "Configure standard kernel features (for small systems)"
+menuconfig EXPERT
+ bool "Configure standard kernel features (expert users)"
help
This option allows certain base kernel options and settings
to be disabled or tweaked. This is for specialized
@@ -839,14 +839,14 @@ menuconfig EMBEDDED
Only use this if you really know what you are doing.
config UID16
- bool "Enable 16-bit UID system calls" if EMBEDDED
+ bool "Enable 16-bit UID system calls" if EXPERT
depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
default y
help
This enables the legacy 16-bit UID syscall wrappers.
config ...CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the fs/
directory.
Signed-off-by: David Rientjes <rientjes@google.com>
---
fs/Kconfig | 2 +-
fs/proc/Kconfig | 6 +++---
fs/sysfs/Kconfig | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -51,7 +51,7 @@ config EXPORTFS
tristate
config FILE_LOCKING
- bool "Enable POSIX file locking API" if EMBEDDED
+ bool "Enable POSIX file locking API" if EXPERT
default y
help
This option enables standard file locking support, required
diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
--- a/fs/proc/Kconfig
+++ b/fs/proc/Kconfig
@@ -1,5 +1,5 @@
config PROC_FS
- bool "/proc file system support" if EMBEDDED
+ bool "/proc file system support" if EXPERT
default y
help
This is a virtual file system providing information about the status
@@ -40,7 +40,7 @@ config PROC_VMCORE
Exports the dump image of crashed kernel in ELF format.
config PROC_SYSCTL
- bool "Sysctl support (/proc/sys)" if EMBEDDED
+ bool "Sysctl support (/proc/sys)" if EXPERT
depends on PROC_FS
select SYSCTL
default y
@@ -61,7 +61,7 @@ config PROC_SYSCTL
config PROC_PAGE_MONITOR
default y
depends on PROC_FS && MMU
- bool "Enable /proc page monitoring" if EMBEDDED
+ bool "Enable /proc page monitoring" if EXPERT
help
Various /proc files exist to monitor process memory utilization:
/proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
diff --git a/fs/sysfs/Kconfig b/fs/sysfs/Kconfig
--- a/fs/sysfs/Kconfig
+++ b/fs/sysfs/Kconfig
@@ -1,5 +1,5 @@
config SYSFS
- bool "sysfs file system support" if EMBEDDED
+ bool "sysfs file system support" if EXPERT
default y
help
The sysfs filesystem is a virtual filesystem that the kernel uses to
--
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the
block/ directory.
Signed-off-by: David Rientjes <rientjes@google.com>
---
block/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/block/Kconfig b/block/Kconfig
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -2,7 +2,7 @@
# Block layer core configuration
#
menuconfig BLOCK
- bool "Enable the block layer" if EMBEDDED
+ bool "Enable the block layer" if EXPERT
default y
help
Provide block layer support for the kernel.
--
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the net/ directory. Signed-off-by: David Rientjes <rientjes@google.com> --- net/mac80211/Kconfig | 6 +++--- net/rfkill/Kconfig | 4 ++-- net/wireless/Kconfig | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -19,7 +19,7 @@ config MAC80211_HAS_RC def_bool n config MAC80211_RC_PID - bool "PID controller based rate control algorithm" if EMBEDDED + bool "PID controller based rate control algorithm" if EXPERT select MAC80211_HAS_RC ---help--- This option enables a TX rate control algorithm for @@ -27,14 +27,14 @@ config MAC80211_RC_PID rate. config MAC80211_RC_MINSTREL - bool "Minstrel" if EMBEDDED + bool "Minstrel" if EXPERT select MAC80211_HAS_RC default y ---help--- This option enables the 'minstrel' TX rate control algorithm config MAC80211_RC_MINSTREL_HT - bool "Minstrel 802.11n support" if EMBEDDED + bool "Minstrel 802.11n support" if EXPERT depends on MAC80211_RC_MINSTREL default y ---help--- diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -18,7 +18,7 @@ config RFKILL_LEDS default y config RFKILL_INPUT - bool "RF switch input support" if EMBEDDED + bool "RF switch input support" if EXPERT depends on RFKILL depends on INPUT = y || RFKILL = INPUT - default y if !EMBEDDED + default y if !EXPERT diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -95,7 +95,7 @@ config CFG80211_DEBUGFS If unsure, say N. config CFG80211_INTERNAL_REGDB - bool "use statically compiled regulatory rules database" if EMBEDDED + bool "use statically compiled regulatory rules database" if EXPERT default n depends on CFG80211 ---help--- --
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the lib/ directory. Signed-off-by: David Rientjes <rientjes@google.com> --- lib/Kconfig.debug | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -656,7 +656,7 @@ config DEBUG_HIGHMEM Disable for production systems. config DEBUG_BUGVERBOSE - bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED + bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT depends on BUG depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \ FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300 @@ -728,8 +728,8 @@ config DEBUG_WRITECOUNT If unsure, say N. config DEBUG_MEMORY_INIT - bool "Debug memory initialisation" if EMBEDDED - default !EMBEDDED + bool "Debug memory initialisation" if EXPERT + default !EXPERT help Enable this for additional checks during memory initialisation. The sanity checks verify aspects of the VM such as the memory model --
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the usr/ directory. Signed-off-by: David Rientjes <rientjes@google.com> --- usr/Kconfig | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr/Kconfig b/usr/Kconfig --- a/usr/Kconfig +++ b/usr/Kconfig @@ -46,7 +46,7 @@ config INITRAMFS_ROOT_GID If you are not sure, leave it set to "0". config RD_GZIP - bool "Support initial ramdisks compressed using gzip" if EMBEDDED + bool "Support initial ramdisks compressed using gzip" if EXPERT default y depends on BLK_DEV_INITRD select DECOMPRESS_GZIP @@ -55,8 +55,8 @@ config RD_GZIP If unsure, say Y. config RD_BZIP2 - bool "Support initial ramdisks compressed using bzip2" if EMBEDDED - default !EMBEDDED + bool "Support initial ramdisks compressed using bzip2" if EXPERT + default !EXPERT depends on BLK_DEV_INITRD select DECOMPRESS_BZIP2 help @@ -64,8 +64,8 @@ config RD_BZIP2 If unsure, say N. config RD_LZMA - bool "Support initial ramdisks compressed using LZMA" if EMBEDDED - default !EMBEDDED + bool "Support initial ramdisks compressed using LZMA" if EXPERT + default !EXPERT depends on BLK_DEV_INITRD select DECOMPRESS_LZMA help @@ -73,8 +73,8 @@ config RD_LZMA If unsure, say N. config RD_LZO - bool "Support initial ramdisks compressed using LZO" if EMBEDDED - default !EMBEDDED + bool "Support initial ramdisks compressed using LZO" if EXPERT + default !EXPERT depends on BLK_DEV_INITRD select DECOMPRESS_LZO help --
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the arch/ directory. Signed-off-by: David Rientjes <rientjes@google.com> --- arch/arm/configs/am200epdkit_defconfig | 2 +- arch/arm/configs/ams_delta_defconfig | 2 +- arch/arm/configs/at572d940hfek_defconfig | 2 +- arch/arm/configs/badge4_defconfig | 2 +- arch/arm/configs/bcmring_defconfig | 2 +- arch/arm/configs/cm_x2xx_defconfig | 2 +- arch/arm/configs/colibri_pxa270_defconfig | 2 +- arch/arm/configs/collie_defconfig | 2 +- arch/arm/configs/corgi_defconfig | 2 +- arch/arm/configs/da8xx_omapl_defconfig | 2 +- arch/arm/configs/davinci_all_defconfig | 2 +- arch/arm/configs/dove_defconfig | 2 +- arch/arm/configs/ebsa110_defconfig | 2 +- arch/arm/configs/edb7211_defconfig | 2 +- arch/arm/configs/em_x270_defconfig | 2 +- arch/arm/configs/ep93xx_defconfig | 2 +- arch/arm/configs/eseries_pxa_defconfig | 2 +- arch/arm/configs/ezx_defconfig | 2 +- arch/arm/configs/footbridge_defconfig | 2 +- arch/arm/configs/fortunet_defconfig | 2 +- arch/arm/configs/h5000_defconfig | 2 +- arch/arm/configs/imote2_defconfig | 2 +- arch/arm/configs/ixp2000_defconfig | 2 +- arch/arm/configs/ixp23xx_defconfig | 2 +- arch/arm/configs/ixp4xx_defconfig | 2 +- arch/arm/configs/loki_defconfig | 2 +- arch/arm/configs/lpd7a400_defconfig | 2 +- arch/arm/configs/lpd7a404_defconfig | 2 +- arch/arm/configs/magician_defconfig | 2 +- arch/arm/configs/mv78xx0_defconfig | 2 +- arch/arm/configs/mx1_defconfig ...
CONFIG_EMBEDDED has been renamed to CONFIG_EXPERT, so fix it in the drivers/ directory. Signed-off-by: David Rientjes <rientjes@google.com> --- drivers/acpi/Kconfig | 2 +- drivers/ata/Kconfig | 2 +- drivers/base/Kconfig | 2 +- drivers/char/Kconfig | 10 +++--- drivers/cpufreq/Kconfig | 2 +- drivers/firmware/Kconfig | 2 +- drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/nouveau/Kconfig | 2 +- drivers/gpu/vga/Kconfig | 2 +- drivers/hid/Kconfig | 64 +++++++++++++++++----------------- drivers/hid/usbhid/Kconfig | 2 +- drivers/ide/Kconfig | 2 +- drivers/infiniband/hw/mthca/Kconfig | 2 +- drivers/infiniband/ulp/ipoib/Kconfig | 2 +- drivers/input/Kconfig | 6 ++-- drivers/input/keyboard/Kconfig | 4 +- drivers/input/mouse/Kconfig | 10 +++--- drivers/input/serio/Kconfig | 6 ++-- drivers/input/touchscreen/Kconfig | 30 ++++++++-------- drivers/media/common/tuners/Kconfig | 2 +- drivers/media/dvb/frontends/Kconfig | 2 +- drivers/media/video/Kconfig | 2 +- drivers/net/Kconfig | 2 +- drivers/pci/pcie/Kconfig | 2 +- drivers/pcmcia/Kconfig | 12 +++--- drivers/serial/Kconfig | 4 +- drivers/ssb/Kconfig | 2 +- drivers/usb/core/Kconfig | 6 ++-- drivers/video/Kconfig | 2 +- drivers/video/console/Kconfig | 2 +- 30 files changed, 96 insertions(+), 96 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -310,7 +310,7 @@ config ACPI_PCI_SLOT the module will be called pci_slot. config X86_PM_TIMER - bool "Power Management Timer Support" if EMBEDDED + bool "Power Management ...
Nice! For all patches: Reviewed-by: Ingo Molnar <mingo@elte.hu> Ingo --
Doesn't this patch series break the 'bisectable' rule for patches? I think you can get by with adding a CONFIG_EXPERT selects CONFIG_EMBEDDED in the first patch and the last patch removing that same selects. Robin --
How about leaving it that way during the merge window even? That would help people sending git pull requests that add new dependencies on CONFIG_EMBEDDED. David can submit another patch that removes the temporary CONFIG_EMBEDDED option along with any new users in -rc2 or for 2.6.39 then. Arnd --
That would be fine with me, but I don't think my vote counts for much. I was just trying to help prevent the bisectability of your patchset. Robin --
Ok, so there are a few pending EMBEDDED dependency additions in linux-next as of next-20101230, which should be a pretty good indicator of what type of conflict we might risk during the merge window. - three new defconfig files: 89ba4d12: arch/arm/configs/ag5evm_defconfig 6cfce27c: arch/arm/configs/omap1_defconfig d58f0967: arch/blackfin/configs/BF561-EZKIT-SMP_defconfig - 3ce05168 (drm/kms: load fbcon from drm_kms_helper) - b595076a (tree-wide: fix comment/printk typos) Instead of CONFIG_EXPERT select CONFIG_EMBEDDED, we could add a ninth patch which does CONFIG_EMBEDDED select CONFIG_EXPERT and tag it in some way so we know it's only temporary for the merge window to find new CONFIG_EMBEDDED entries. Andrew, this would be going through your -mm tree anyway, so how would you prefer to merge it? --
What's the plan for those people who are currently on (say) 2.6.35, next upgrade to 2.6.39 or .40, and thus miss the 9th temporary patch? They'll run 'make oldconfig' - if they get prompted, do we want to add a line to the help text that says "This used to be called EMBEDDED"?
On Thu, 30 Dec 2010 11:17:32 -0800 (PST) um, one big patch shortly after -rc1 is released? --
Sounds good, I'll send you a big patch immediately following 2.6.38-rc1 and add a "config EMBEDDED" that will simply do a "select EXPERT" so it's easy to use oldconfig. It's debatable whether CONFIG_EMBEDDED would actually make sense, and I think it does: for example, I think it would be helpful to identify kernel options that really only make sense on embedded devices such as device drivers, CONFIG_PRINTK, CONFIG_SLOB, etc. --
I think it was misnamed from the very beginning; it never really made Thanks for doing this. Acked-by: David Woodhouse <David.Woodhouse@intel.com> -- David Woodhouse Open Source Technology Centre David.Woodhouse@intel.com Intel Corporation --
