Patches contributed by Eötvös Lorand University
commit c493756e2a8a78bcaae30668317890dcfe86e7c3
Merge: 0d15504f16f6 4480f15b3306
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Oct 13 10:52:30 2008 +0200
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
diff --cc arch/x86/kernel/apic_32.c
index 0ff576d026a4,a91c57cb666a..21c831d96af3
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@@ -240,6 -290,36 +290,40 @@@ static void __setup_APIC_LVTT(unsigned
apic_write(APIC_TMICT, clocks / APIC_DIVISOR);
}
+ /*
+ * Setup extended LVT, AMD specific (K8, family 10h)
+ *
+ * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and
+ * MCE interrupts are supported. Thus MCE offset must be set to 0.
++ *
++ * If mask=1, the LVT entry does not generate interrupts while mask=0
++ * enables the vector. See also the BKDGs.
+ */
+
+ #define APIC_EILVT_LVTOFF_MCE 0
+ #define APIC_EILVT_LVTOFF_IBS 1
+
+ static void setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask)
+ {
+ unsigned long reg = (lvt_off << 4) + APIC_EILVT0;
+ unsigned int v = (mask << 16) | (msg_type << 8) | vector;
+
+ apic_write(reg, v);
+ }
+
+ u8 setup_APIC_eilvt_mce(u8 vector, u8 msg_type, u8 mask)
+ {
+ setup_APIC_eilvt(APIC_EILVT_LVTOFF_MCE, vector, msg_type, mask);
+ return APIC_EILVT_LVTOFF_MCE;
+ }
+
+ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)
+ {
+ setup_APIC_eilvt(APIC_EILVT_LVTOFF_IBS, vector, msg_type, mask);
+ return APIC_EILVT_LVTOFF_IBS;
+ }
++EXPORT_SYMBOL_GPL(setup_APIC_eilvt_ibs);
+
/*
* Program the next event, relative to now
*/
commit b807305059c28fb8197496c944bfaa6b372a40ad
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 5 17:12:36 2008 +0200
x86: remove additional_cpus configurability
additional_cpus=<x> parameter is dangerous and broken: for example
if we boot additional_cpus=-2 on a stock dual-core system it will
crash the box on bootup.
So reduce the maze of code a bit by removingthe user-configurability
angle.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index adaca6fa927d..fc8351f374fd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1438,24 +1438,6 @@ config HOTPLUG_CPU
automatically on SMP systems. )
Say N if you want to disable CPU hotplug.
-config HOTPLUG_RESTRICT_TO_BOOTUP_CPUS
- def_bool n
- prompt "Restrict CPU hotplugging to processors found during boot" if HOTPLUG_CPU
- ---help---
- Say no here to use the default, which allows as many CPUs as are marked
- "disabled" by ACPI or MPTABLES to be hotplugged after bootup.
-
- Say yes if you do not want to allow CPUs to be added after booting, for
- example if you only need CPU hotplugging enabled for suspend/resume.
-
- If CPU_HOTPLUG is enabled this value may be overridden at boot time
- with the "additional_cpus" kernel parameter.
-
-config HOTPLUG_ADDITIONAL_CPUS
- int
- default 0 if !HOTPLUG_CPU || HOTPLUG_RESTRICT_TO_BOOTUP_CPUS
- default -1
-
config COMPAT_VDSO
def_bool y
prompt "Compat VDSO support"
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 857a88bb9195..8dd201c31329 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1261,7 +1261,7 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
check_nmi_watchdog();
}
-static int additional_cpus __initdata = CONFIG_HOTPLUG_ADDITIONAL_CPUS;
+static int additional_cpus = -1;
/*
* cpu_possible_map should be static, it cannot change as cpu's
@@ -1334,12 +1334,6 @@ static void remove_siblinginfo(int cpu)
cpu_clear(cpu, cpu_sibling_setup_map);
}
-static __init int setup_additional_cpus(char *s)
-{
- return s && get_option(&s, &additional_cpus) ? 0 : -EINVAL;
-}
-early_param("additional_cpus", setup_additional_cpus);
-
static void __ref remove_cpu_from_maps(int cpu)
{
cpu_clear(cpu, cpu_online_map);
commit 3e6de5a393661c5cdabe44115e93bcbde6a742fc
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Sep 15 08:26:15 2008 +0200
x86: print out EBDA/lowmem address
it's useful for debugging purposes to know the location of the EBDA.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c
index 3e66bd364a9d..1dcb0f13897e 100644
--- a/arch/x86/kernel/head.c
+++ b/arch/x86/kernel/head.c
@@ -35,6 +35,7 @@ void __init reserve_ebda_region(void)
/* start of EBDA area */
ebda_addr = get_bios_ebda();
+ printk(KERN_INFO "BIOS EBDA/lowmem at: %08x/%08x\n", ebda_addr, lowmem);
/* Fixup: bios puts an EBDA in the top 64K segment */
/* of conventional memory, but does not adjust lowmem. */
commit bf94e17bc8d35fc339945a42990a2f2b5e9b5a40
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 23:51:38 2008 -0700
net/mac80211/rx.c: fix build error
older versions of gcc do not recognize that ieee80211_rx_h_mesh_fwding()
is unused when CONFIG_MAC80211_MESH is disabled:
net/built-in.o: In function `ieee80211_rx_h_mesh_fwding':
rx.c:(.text+0xd89af): undefined reference to `mpp_path_lookup'
rx.c:(.text+0xd89c6): undefined reference to `mpp_path_add'
as this code construct:
if (ieee80211_vif_is_mesh(&sdata->vif))
CALL_RXH(ieee80211_rx_h_mesh_fwding);
still causes ieee80211_rx_h_mesh_fwding() to be linked in.
Protect these places with an #ifdef.
commit b0dee578 ("Fix modpost failure when rx handlers are not inlined.")
solved part of this problem - this patch is still needed.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 77e7b014872b..cf6b121e1bbf 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1379,6 +1379,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
return RX_QUEUED;
}
+#ifdef CONFIG_MAC80211_MESH
static ieee80211_rx_result
ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
{
@@ -1453,7 +1454,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
else
return RX_DROP_MONITOR;
}
-
+#endif
static ieee80211_rx_result debug_noinline
ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
@@ -1780,8 +1781,10 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
/* must be after MMIC verify so header is counted in MPDU mic */
CALL_RXH(ieee80211_rx_h_remove_qos_control)
CALL_RXH(ieee80211_rx_h_amsdu)
+#ifdef CONFIG_MAC80211_MESH
if (ieee80211_vif_is_mesh(&sdata->vif))
CALL_RXH(ieee80211_rx_h_mesh_fwding);
+#endif
CALL_RXH(ieee80211_rx_h_data)
CALL_RXH(ieee80211_rx_h_ctrl)
CALL_RXH(ieee80211_rx_h_action)
commit 82cbc11a4146d6a8acd81f81f7fe17387668107f
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Aug 18 12:54:00 2008 +0200
warning: fix init do_mounts_md c
fix warning:
init/do_mounts_md.c: In function ‘md_run_setup’:
init/do_mounts_md.c:282: warning: ISO C90 forbids mixed declarations and code
also, use the opportunity to put the RAID autodetection code
into a separate function - this also solves a checkpatch style warning.
No code changed:
md5:
aa36a35faef371b05f1974ad583bdbbd do_mounts_md.o.before.asm
aa36a35faef371b05f1974ad583bdbbd do_mounts_md.o.after.asm
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 1ec5c41c8a3c..c0dfd3c1e91b 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -264,26 +264,32 @@ static int __init raid_setup(char *str)
__setup("raid=", raid_setup);
__setup("md=", md_setup);
+static void autodetect_raid(void)
+{
+ int fd;
+
+ /*
+ * Since we don't want to detect and use half a raid array, we need to
+ * wait for the known devices to complete their probing
+ */
+ printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
+ printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
+ while (driver_probe_done() < 0)
+ msleep(100);
+ fd = sys_open("/dev/md0", 0, 0);
+ if (fd >= 0) {
+ sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
+ sys_close(fd);
+ }
+}
+
void __init md_run_setup(void)
{
create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
if (raid_noautodetect)
printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
- else {
- /*
- * Since we don't want to detect and use half a raid array, we need to
- * wait for the known devices to complete their probing
- */
- printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
- printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
- while (driver_probe_done() < 0)
- msleep(100);
- int fd = sys_open("/dev/md0", 0, 0);
- if (fd >= 0) {
- sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
- sys_close(fd);
- }
- }
+ else
+ autodetect_raid();
md_setup_drive();
}
commit 8daf14cf56816303d64d1a705fcbc389211ba36e
Merge: 1db5fff9aeab eceb1383361c 28f7e66fc1da fd1452ebf257 7aa413def761 46eaa6702016 45e96f26f257 9f482807a6bd 325af5fb1418 acbaa41a7804 2407390bd20d
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 15:50:02 2008 +0200
Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
diff --cc Documentation/kernel-parameters.txt
index 25efbaf1f59b,25efbaf1f59b,1150444a21ab,1150444a21ab,e07c432c731f,bade177ab736,92ddd4afe174,25efbaf1f59b,25efbaf1f59b,25efbaf1f59b,1150444a21ab..2443f5bb4364
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@@@@@@@@@@ -278,22 -278,22 -278,17 -278,17 -271,6 -278,22 -278,17 -278,22 -278,22 -278,22 -278,17 +278,22 @@@@@@@@@@@@ and is between 256 and 4096 characters
aic79xx= [HW,SCSI]
See Documentation/scsi/aic79xx.txt.
+ amd_iommu= [HW,X86-84]
+ Pass parameters to the AMD IOMMU driver in the system.
+ Possible values are:
+ isolate - enable device isolation (each device, as far
+ as possible, will get its own protection
+ domain)
+++ + + fullflush - enable flushing of IO/TLB entries when
+++ + + they are unmapped. Otherwise they are
+++ + + flushed before they will be reused, which
+++ + + is a lot of faster
+++ + +
+ amd_iommu_size= [HW,X86-64]
+ Define the size of the aperture for the AMD IOMMU
+ driver. Possible values are:
+ '32M', '64M' (default), '128M', '256M', '512M', '1G'
+
amijoy.map= [HW,JOY] Amiga joystick support
Map of devices attached to JOY0DAT and JOY1DAT
Format: <a>,<b>
@@@@@@@@@@@@ -1231,7 -1231,7 -1228,7 -1228,7 -1166,7 -1231,30 -1224,7 -1231,7 -1231,7 -1231,7 -1228,7 +1232,30 @@@@@@@@@@@@
or
memmap=0x10000$0x18690000
- memtest= [KNL,X86_64] Enable memtest
+++++ +++++ memory_corruption_check=0/1 [X86]
+++++ +++++ Some BIOSes seem to corrupt the first 64k of
+++++ +++++ memory when doing things like suspend/resume.
+++++ +++++ Setting this option will scan the memory
+++++ +++++ looking for corruption. Enabling this will
+++++ +++++ both detect corruption and prevent the kernel
+++++ +++++ from using the memory being corrupted.
+++++ +++++ However, its intended as a diagnostic tool; if
+++++ +++++ repeatable BIOS-originated corruption always
+++++ +++++ affects the same memory, you can use memmap=
+++++ +++++ to prevent the kernel from using that memory.
+++++ +++++
+++++ +++++ memory_corruption_check_size=size [X86]
+++++ +++++ By default it checks for corruption in the low
+++++ +++++ 64k, making this memory unavailable for normal
+++++ +++++ use. Use this parameter to scan for
+++++ +++++ corruption in more or less memory.
+++++ +++++
+++++ +++++ memory_corruption_check_period=seconds [X86]
+++++ +++++ By default it checks for corruption every 60
+++++ +++++ seconds. Use this parameter to check at some
+++++ +++++ other rate. 0 disables periodic checking.
+++++ +++++
+ memtest= [KNL,X86] Enable memtest
Format: <integer>
range: 0,4 : pattern number
default : 0 <disable>
diff --cc MAINTAINERS
index 587f418ed00d,587f418ed00d,b3e92fbe336c,b5154c12ca27,cd587eec9fa7,587f418ed00d,4cbf6016a9b9,587f418ed00d,587f418ed00d,587f418ed00d,3596d1782264..8bf72d378332
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@@@@@ -222,7 -222,7 -222,7 -222,7 -216,8 -222,7 -216,8 -222,7 -222,7 -222,7 -222,7 +222,7 @@@@@@@@@@@@ W: http://code.google.com/p/aceracp
S: Maintained
ACPI
- P: Andi Kleen
- M: ak@linux.intel.com
+ P: Len Brown
- M: len.brown@intel.com
M: lenb@kernel.org
L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/
@@@@@@@@@@@@ -383,13 -383,13 -383,12 -383,17 -376,6 -383,13 -378,12 -383,13 -383,13 -383,13 -383,12 +383,18 @@@@@@@@@@@@ L: linux-geode@lists.infradead.org (mod
W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
S: Supported
+ AMD IOMMU (AMD-VI)
+ P: Joerg Roedel
+ M: joerg.roedel@amd.com
+ L: iommu@lists.linux-foundation.org
+++ + +T: git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
+ S: Supported
+
+++ +++++++AMD MICROCODE UPDATE SUPPORT
+++ +++++++P: Peter Oruba
+++ +++++++M: peter.oruba@amd.com
+++ +++++++S: Supported
+++ +++++++
AMS (Apple Motion Sensor) DRIVER
P: Stelian Pop
M: stelian@popies.net
@@@@@@@@@@@@ -498,34 -498,34 -491,34 -496,34 -475,11 -498,34 -480,28 -498,34 -498,34 -498,34 -491,34 +503,34 @@@@@@@@@@@@ M: kernel@wantstofly.or
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
-- - -ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+++ + +ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
+ P: Mike Rapoport
+ M: mike@compulab.co.il
+ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ S: Maintained
+
ARM/CORGI MACHINE SUPPORT
P: Richard Purdie
M: rpurdie@rpsys.net
S: Maintained
+ ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
+ P: Daniel Ribeiro
+ M: drwyrm@gmail.com
+ P: Stefan Schmidt
+ M: stefan@openezx.org
+ P: Harald Welte
+ M: laforge@openezx.org
+ L: openezx-devel@lists.openezx.org (subscribers-only)
+ W: http://www.openezx.org/
+ S: Maintained
+
+ + ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
+ + P: Sascha Hauer
+ + M: kernel@pengutronix.de
+ + L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ + S: Maintained
+ +
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
P: Lennert Buytenhek
M: kernel@wantstofly.org
@@@@@@@@@@@@ -612,30 -612,30 -605,24 -610,24 -566,11 -612,30 -588,19 -612,30 -612,30 -612,30 -605,24 +617,30 @@@@@@@@@@@@ M: kernel@wantstofly.or
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
+ + ARM/MAGICIAN MACHINE SUPPORT
+ + P: Philipp Zabel
+ + M: philipp.zabel@gmail.com
+ + S: Maintained
+ +
ARM/TOSA MACHINE SUPPORT
+ P: Dmitry Baryshkov
+ M: dbaryshkov@gmail.com
P: Dirk Opfer
M: dirk@opfer-online.de
S: Maintained
+ ARM/PALMTX SUPPORT
+ P: Marek Vasut
+ M: marek.vasut@gmail.com
+ W: http://hackndev.com
+ S: Maintained
+
+++ + +ARM/PALMZ72 SUPPORT
+++ + +P: Sergey Lapin
+++ + +M: slapin@ossfans.org
+++ + +W: http://hackndev.com
+++ + +S: Maintained
+++ + +
ARM/PLEB SUPPORT
P: Peter Chubb
M: pleb@gelato.unsw.edu.au
@@@@@@@@@@@@ -962,19 -962,19 -947,19 -954,19 -885,94 -962,19 -916,94 -962,19 -962,19 -962,19 -949,19 +967,19 @@@@@@@@@@@@ M: joern@lazybastard.or
L: linux-mtd@lists.infradead.org
S: Maintained
- - BLUETOOTH SUBSYSTEM
+ + BLUETOOTH DRIVERS
P: Marcel Holtmann
M: marcel@holtmann.org
- - P: Maxim Krasnyansky
- - M: maxk@qualcomm.com
L: linux-bluetooth@vger.kernel.org
- - W: http://bluez.sf.net
- - W: http://www.bluez.org
- - W: http://www.holtmann.org/linux/bluetooth/
- - T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
- - S: Maintained
- -
- - BLUETOOTH RFCOMM LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH BNEP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH CMTP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HIDP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI UART DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH HCI USB DRIVER
- - P: Marcel Holtmann
- - M: marcel@holtmann.org
- - P: Maxim Krasnyansky
- - M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH HCI BCM203X DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI BPA10X DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI BFUSB DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI DTL1 DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
+ + W: http://www.bluez.org/
S: Maintained
- BLUETOOTH BNEP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH CMTP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HIDP LAYER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI UART DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH HCI USB DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- P: Maxim Krasnyansky
- M: maxk@qualcomm.com
- S: Maintained
-
- BLUETOOTH HCI BCM203X DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI BPA10X DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI BFUSB DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- BLUETOOTH HCI DTL1 DRIVER
- P: Marcel Holtmann
- M: marcel@holtmann.org
- S: Maintained
-
- - BLUETOOTH HCI BLUECARD DRIVER
- - P: Marcel Holtmann
- - M: marcel@holtmann.org
- - S: Maintained
- -
- - BLUETOOTH HCI BT3C DRIVER
- - P: Marcel Holtmann
- - M: marcel@holtmann.org
- - S: Maintained
- -
- - BLUETOOTH HCI BTUART DRIVER
+ + BLUETOOTH SUBSYSTEM
P: Marcel Holtmann
M: marcel@holtmann.org
- - S: Maintained
- -
- - BLUETOOTH HCI VHCI DRIVER
- - P: Maxim Krasnyansky
- - M: maxk@qualcomm.com
+ + L: linux-bluetooth@vger.kernel.org
+ + W: http://www.bluez.org/
+ + T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
S: Maintained
BONDING DRIVER
@@@@@@@@@@@@ -1061,19 -1061,19 -1046,12 -1053,12 -1053,11 -1061,19 -1090,12 -1061,19 -1061,19 -1061,19 -1048,12 +1066,19 @@@@@@@@@@@@ L: cbe-oss-dev@ozlabs.or
W: http://www.ibm.com/developerworks/power/cell/
S: Supported
+++ + +CISCO 10G ETHERNET DRIVER
+++ + +P: Scott Feldman
+++ + +M: scofeldm@cisco.com
+++ + +P: Joe Eykholt
+++ + +M: jeykholt@cisco.com
+++ + +S: Supported
+++ + +
CFAG12864B LCD DRIVER
P: Miguel Ojeda Sandonis
- M: maxextreme@gmail.com
+ M: miguel.ojeda.sandonis@gmail.com
L: linux-kernel@vger.kernel.org
- W: http://auxdisplay.googlepages.com/
+ W: http://miguelojeda.es/auxdisplay.htm
+ W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
S: Maintained
CFAG12864BFB LCD FRAMEBUFFER DRIVER
@@@@@@@@@@@@ -1440,14 -1440,14 -1420,14 -1427,14 -1420,6 -1440,14 -1464,14 -1440,14 -1440,14 -1440,14 -1422,14 +1445,14 @@@@@@@@@@@@ M: kristen.c.accardi@intel.co
L: linux-acpi@vger.kernel.org
S: Supported
+ DOCUMENTATION (/Documentation directory)
- - P: Michael Kerrisk
- - M: mtk.manpages@gmail.com
- - P: Randy Dunlap
- - M: rdunlap@xenotime.net
- - L: linux-doc@vger.kernel.org
- - S: Maintained
+ + + P: Michael Kerrisk
+ + + M: mtk.manpages@gmail.com
+ + + P: Randy Dunlap
+ + + M: rdunlap@xenotime.net
+ + + L: linux-doc@vger.kernel.org
+ + + S: Maintained
+
DOUBLETALK DRIVER
P: James R. Van Zandt
M: jrv@vanzandt.mv.com
@@@@@@@@@@@@ -1659,10 -1659,10 -1639,9 -1646,9 -1631,9 -1659,10 -1683,9 -1659,10 -1659,10 -1659,10 -1641,9 +1664,10 @@@@@@@@@@@@ L: linux-ext4@vger.kernel.or
S: Maintained
EXT4 FILE SYSTEM
--- - -P: Stephen Tweedie, Andrew Morton
-- - -M: sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
- M: sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
+++ + +P: Theodore Ts'o
+++ + +M: tytso@mit.edu, adilger@sun.com
L: linux-ext4@vger.kernel.org
+++ + +W: http://ext4.wiki.kernel.org
S: Maintained
F71805F HARDWARE MONITORING DRIVER
@@@@@@@@@@@@ -1855,12 -1855,12 -1834,12 -1841,12 -1808,16 -1855,12 -1878,16 -1855,12 -1855,12 -1855,12 -1836,12 +1860,12 @@@@@@@@@@@@ W: http://gigaset307x.sourceforge.net
S: Maintained
HARDWARE MONITORING
- - P: Mark M. Hoffman
- - M: mhoffman@lightlink.com
L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.org/
- S: Orphaned
- - T: git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git testing
- - T: git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release
- - S: Maintained
+ + + S: Orphan
HARDWARE RANDOM NUMBER GENERATOR CORE
- - - S: Orphaned
+ + + S: Orphan
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
P: Robert Love
@@@@@@@@@@@@ -2730,9 -2730,9 -2703,8 -2710,8 -2680,8 -2730,9 -2751,8 -2730,9 -2730,9 -2730,9 -2705,8 +2735,9 @@@@@@@@@@@@ S: Supporte
MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
P: Michael Kerrisk
M: mtk.manpages@gmail.com
- - W: http://www.kernel.org/doc/man-pages
- - S: Supported
- W: ftp://ftp.kernel.org/pub/linux/docs/manpages
- S: Maintained
+ + + W: http://www.kernel.org/doc/man-pages
+++ + +L: linux-man@vger.kernel.org
+ + + S: Supported
MARVELL LIBERTAS WIRELESS DRIVER
P: Dan Williams
@@@@@@@@@@@@ -2892,12 -2892,12 -2864,12 -2871,12 -2837,6 -2892,12 -2912,6 -2892,12 -2892,12 -2892,12 -2866,12 +2897,12 @@@@@@@@@@@@ M: jirislaby@gmail.co
L: linux-kernel@vger.kernel.org
S: Maintained
+ + MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
- P: Felipe Balbi
- M: felipe.balbi@nokia.com
- L: linux-usb@vger.kernel.org
- S: Maintained
+ + + P: Felipe Balbi
+ + + M: felipe.balbi@nokia.com
+ + + L: linux-usb@vger.kernel.org
+ + + S: Maintained
+ +
MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
P: Andrew Gallatin
M: gallatin@myri.com
@@@@@@@@@@@@ -3683,9 -3683,9 -3648,8 -3655,8 -3605,8 -3683,9 -3683,8 -3683,9 -3683,9 -3683,9 -3650,8 +3688,9 @@@@@@@@@@@@ M: jmorris@namei.or
P: Eric Paris
M: eparis@parisplace.org
L: linux-kernel@vger.kernel.org (kernel issues)
- -L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
- -W: http://www.nsa.gov/selinux
+ +L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
- - - W: http://www.nsa.gov/selinux
+++ + +W: http://selinuxproject.org
+++ + +T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
S: Supported
SENSABLE PHANTOM
@@@@@@@@@@@@ -3801,12 -3801,12 -3765,12 -3772,12 -3712,6 -3801,12 -3790,6 -3801,12 -3801,12 -3801,12 -3767,12 +3806,12 @@@@@@@@@@@@ P: Ben Nizett
M: bn@niasdigital.com
S: Maintained
+ + SOC-CAMERA V4L2 SUBSYSTEM
- P: Guennadi Liakhovetski
- M: g.liakhovetski@gmx.de
- L: video4linux-list@redhat.com
- S: Maintained
+ + + P: Guennadi Liakhovetski
+ + + M: g.liakhovetski@gmx.de
+ + + L: video4linux-list@redhat.com
+ + + S: Maintained
+ +
SOFTWARE RAID (Multiple Disks) SUPPORT
P: Ingo Molnar
M: mingo@redhat.com
@@@@@@@@@@@@ -4405,14 -4405,14 -4360,14 -4367,14 -4314,6 -4405,14 -4385,14 -4405,14 -4405,14 -4405,14 -4363,14 +4410,14 @@@@@@@@@@@@ L: netdev@vger.kernel.or
W: http://www.linux-usb.org/usbnet
S: Maintained
+ USB VIDEO CLASS
+ P: Laurent Pinchart
+ M: laurent.pinchart@skynet.be
- - L: linx-uvc-devel@berlios.de
+ + + L: linux-uvc-devel@lists.berlios.de
+ L: video4linux-list@redhat.com
+ W: http://linux-uvc.berlios.de
+ S: Maintained
+
USB W996[87]CF DRIVER
P: Luca Risolia
M: luca.risolia@studio.unibo.it
diff --cc arch/x86/Kconfig
index 44d4f2130d01,44d4f2130d01,ed92864d1325,995165509355,52e18e6d2ba0,25e2f7a20d66,e3cba0b45600,44d4f2130d01,44d4f2130d01,44d4f2130d01,ed92864d1325..fc8351f374fd
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@@@@@@@ -21,17 -21,17 -21,16 -21,16 -21,10 -21,17 -21,15 -21,17 -21,17 -21,17 -21,16 +21,17 @@@@@@@@@@@@ config X8
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_IDE
select HAVE_OPROFILE
+ select HAVE_IOREMAP_PROT
select HAVE_KPROBES
- select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X
+ + select ARCH_WANT_OPTIONAL_GPIOLIB
select HAVE_KRETPROBES
+ select HAVE_DYNAMIC_FTRACE
+ select HAVE_FTRACE
select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
select HAVE_ARCH_KGDB if !X86_VOYAGER
+++ + + select HAVE_ARCH_TRACEHOOK
+ + select HAVE_GENERIC_DMA_COHERENT if X86_32
+ select HAVE_EFFICIENT_UNALIGNED_ACCESS
config ARCH_DEFCONFIG
string
@@@@@@@@@@@@ -332,18 -332,18 -331,18 -331,18 -289,7 -332,18 -330,32 -332,18 -332,18 -332,18 -331,18 +332,18 @@@@@@@@@@@@ config X86_BIGSM
This option is needed for the systems that have more than 8 CPUs
and if the system is not of any sub-arch type above.
- If you don't have such a system, you should say N here.
+ endif
+
- config X86_RDC321X
- bool "RDC R-321x SoC"
- depends on X86_32
- select M486
- select X86_REBOOTFIXUPS
- select GENERIC_GPIO
- select LEDS_CLASS
- select LEDS_GPIO
- select NEW_LEDS
- help
- This option is needed for RDC R-321x system-on-chip, also known
- as R-8610-(G).
- If you don't have one of these chips, you should say N here.
-
+ config X86_VSMP
+ bool "Support for ScaleMP vSMP"
+ select PARAVIRT
+ depends on X86_64 && PCI
+ help
+ Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
+ supposed to run on these EM64T-based machines. Only choose this option
+ if you have one of these machines.
+
+ endchoice
config X86_VISWS
bool "SGI 320/540 (Visual Workstation)"
@@@@@@@@@@@@ -354,19 -354,19 -353,19 -353,19 -300,51 -354,19 -366,9 -354,19 -354,19 -354,19 -353,19 +354,19 @@@@@@@@@@@@
Say Y here to create a kernel to run on the SGI 320 or 540.
- A kernel compiled for the Visual Workstation will not run on PCs
- and vice versa. See <file:Documentation/sgi-visws.txt> for details.
-
- config X86_GENERICARCH
- bool "Generic architecture (Summit, bigsmp, ES7000, default)"
- depends on X86_32
- help
- This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
- It is intended for a generic binary kernel.
- If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
-
- config X86_ES7000
- bool "Support for Unisys ES7000 IA32 series"
- depends on X86_32 && SMP
- help
- Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
- supposed to run on an IA32-based Unisys ES7000 system.
- Only choose this option if you have such a system, otherwise you
- should say N here.
+ A kernel compiled for the Visual Workstation will run on general
+ PCs as well. See <file:Documentation/sgi-visws.txt> for details.
+ config X86_RDC321X
+ bool "RDC R-321x SoC"
+ depends on X86_32
+ select M486
+ select X86_REBOOTFIXUPS
- select GENERIC_GPIO
- select LEDS_CLASS
- select LEDS_GPIO
- select NEW_LEDS
+ help
+ This option is needed for RDC R-321x system-on-chip, also known
+ as R-8610-(G).
+ If you don't have one of these chips, you should say N here.
+
- config X86_VSMP
- bool "Support for ScaleMP vSMP"
- select PARAVIRT
- depends on X86_64
- help
- Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
- supposed to run on these EM64T-based machines. Only choose this option
- if you have one of these machines.
-
- endchoice
-
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"
@@@@@@@@@@@@ -551,22 -551,22 -550,21 -550,21 -544,6 -551,22 -553,21 -551,22 -551,22 -551,22 -550,21 +551,22 @@@@@@@@@@@@ config CALGARY_IOMMU_ENABLED_BY_DEFAUL
Calgary anyway, pass 'iommu=calgary' on the kernel command line.
If unsure, say Y.
+ config AMD_IOMMU
+ bool "AMD IOMMU support"
+ select SWIOTLB
+++ + + select PCI_MSI
+ depends on X86_64 && PCI && ACPI
+ help
+ With this option you can enable support for AMD IOMMU hardware in
+ your system. An IOMMU is a hardware component which provides
+ remapping of DMA memory accesses from devices. With an AMD IOMMU you
+ can isolate the the DMA memory of different devices and protect the
+ system from misbehaving device drivers or hardware.
+
+ You can find out if your system has an AMD IOMMU if you look into
+ your BIOS for an option to enable it or if you have an IVRS ACPI
+ table.
+
# need this always selected by IOMMU for the VIA workaround
config SWIOTLB
bool
@@@@@@@@@@@@ -578,26 -578,26 -576,26 -576,26 -555,17 -578,26 -579,31 -578,26 -578,26 -578,26 -576,26 +578,26 @@@@@@@@@@@@
3 GB of memory. If unsure, say Y.
config IOMMU_HELPER
- def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
+ def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+ +
+ config MAXSMP
+ bool "Configure Maximum number of SMP Processors and NUMA Nodes"
- depends on X86_64 && SMP
+ + depends on X86_64 && SMP && BROKEN
+ default n
+ help
+ Configure maximum number of CPUS and NUMA Nodes for this architecture.
+ If unsure, say N.
- if MAXSMP
config NR_CPUS
- int "Maximum number of CPUs (2-255)"
- range 2 255
- int
- default "4096"
- endif
-
- if !MAXSMP
- config NR_CPUS
- int "Maximum number of CPUs (2-4096)"
- range 2 4096
+ + int "Maximum number of CPUs (2-512)" if !MAXSMP
+ + range 2 512
depends on SMP
+ + default "4096" if MAXSMP
default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
default "8"
help
This allows you to specify the maximum number of CPUs which this
- kernel will support. The maximum supported value is 255 and the
- kernel will support. The maximum supported value is 4096 and the
+ + kernel will support. The maximum supported value is 512 and the
minimum value which makes sense is 2.
This is purely to save memory - each supported CPU adds
@@@@@@@@@@@@ -992,17 -992,17 -990,17 -1012,17 -960,13 -992,17 -999,25 -992,17 -992,17 -992,17 -990,17 +1014,17 @@@@@@@@@@@@ config NUMA_EM
into virtual nodes when booted with "numa=fake=N", where N is the
number of nodes. This is only useful for debugging.
- if MAXSMP
-
config NODES_SHIFT
- int "Max num nodes shift(1-15)"
- range 1 15 if X86_64
- int
- default "9"
- endif
-
- if !MAXSMP
- config NODES_SHIFT
- int "Maximum NUMA Nodes (as a power of 2)"
+ + int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
+ range 1 9 if X86_64
+ + default "9" if MAXSMP
default "6" if X86_64
default "4" if X86_NUMAQ
default "3"
depends on NEED_MULTIPLE_NODES
+ help
+ Specify the maximum number of NUMA Nodes available on the target
+ system. Increases memory reserved to accomodate various tables.
- endif
config HAVE_ARCH_BOOTMEM_NODE
def_bool y
@@@@@@@@@@@@ -1119,38 -1119,38 -1117,38 -1139,38 -1083,7 -1169,38 -1134,38 -1119,38 -1119,38 -1119,38 -1117,38 +1191,38 @@@@@@@@@@@@ config MTR
You can safely say Y even if your machine doesn't have MTRRs, you'll
just add about 9 KB to your kernel.
--- - - See <file:Documentation/mtrr.txt> for more information.
+++ + + See <file:Documentation/x86/mtrr.txt> for more information.
+
+ config MTRR_SANITIZER
-- - - bool
+++ + + def_bool y
+ prompt "MTRR cleanup support"
+ depends on MTRR
+ help
+ Convert MTRR layout from continuous to discrete, so X drivers can
+ add writeback entries.
+
+ Can be disabled with disable_mtrr_cleanup on the kernel command line.
+ The largest mtrr entry size for a continous block can be set with
+ mtrr_chunk_size.
+
-- - - If unsure, say N.
+++ + + If unsure, say Y.
+
+ config MTRR_SANITIZER_ENABLE_DEFAULT
+ int "MTRR cleanup enable value (0-1)"
+ range 0 1
+ default "0"
+ depends on MTRR_SANITIZER
+ help
+ Enable mtrr cleanup default value
+
+ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
+ int "MTRR cleanup spare reg num (0-7)"
+ range 0 7
+ default "1"
+ depends on MTRR_SANITIZER
+ help
+ mtrr cleanup spare entries default, it can be changed via
+ mtrr_spare_reg_nr=N on the kernel command line.
config X86_PAT
bool
@@@@@@@@@@@@ -1250,7 -1250,7 -1249,7 -1271,7 -1184,8 -1300,7 -1266,7 -1250,7 -1250,7 -1250,7 -1249,7 +1322,7 @@@@@@@@@@@@ config KEXE
strongly in flux, so no good recommendation can be made.
config CRASH_DUMP
- - bool "kernel crash dumps (EXPERIMENTAL)"
- depends on EXPERIMENTAL
+ + bool "kernel crash dumps"
depends on X86_64 || (X86_32 && HIGHMEM)
help
Generate crash dump after being started by kexec.
diff --cc arch/x86/configs/i386_defconfig
index ef9a52005ec9,ef9a52005ec9,104275e191a8,104275e191a8,ad7ddaaff588,ef9a52005ec9,4d73f53287b6,ef9a52005ec9,ef9a52005ec9,ef9a52005ec9,8cc9eea839e4..ca226ca31288
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@@@@@@@@@@@ -1,16 -1,16 -1,16 -1,16 -1,10 -1,16 -1,16 -1,16 -1,16 -1,16 -1,16 +1,16 @@@@@@@@@@@@
#
# Automatically generated make config: don't edit
-- -# Linux kernel version: 2.6.27-rc4
-- -# Mon Aug 25 15:04:00 2008
- # Linux kernel version: 2.6.22-git14
- # Fri Jul 20 09:53:15 2007
- # Linux kernel version: 2.6.26-rc1
- # Sun May 4 19:59:02 2008
+++ + +# Linux kernel version: 2.6.27-rc5
+++ + +# Wed Sep 3 17:23:09 2008
#
+ # CONFIG_64BIT is not set
CONFIG_X86_32=y
+ # CONFIG_X86_64 is not set
+ CONFIG_X86=y
- CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig"
+ + CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+ # CONFIG_GENERIC_LOCKBREAK is not set
CONFIG_GENERIC_TIME=y
+ CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@@@@@@@@@@@ -24,39 -24,39 -24,39 -24,39 -19,12 -24,39 -24,38 -24,39 -24,39 -24,39 -24,39 +24,39 @@@@@@@@@@@@ CONFIG_GENERIC_ISA_DMA=
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
+ # CONFIG_GENERIC_GPIO is not set
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
- CONFIG_DMI=y
+ # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+ # CONFIG_ARCH_HAS_ILOG2_U32 is not set
+ # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+ CONFIG_GENERIC_CALIBRATE_DELAY=y
+ # CONFIG_GENERIC_TIME_VSYSCALL is not set
+ CONFIG_ARCH_HAS_CPU_RELAX=y
+ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+ # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+ CONFIG_ARCH_SUSPEND_POSSIBLE=y
+ # CONFIG_ZONE_DMA32 is not set
+ CONFIG_ARCH_POPULATES_NODE_MAP=y
+ # CONFIG_AUDIT_ARCH is not set
+ CONFIG_ARCH_SUPPORTS_AOUT=y
+ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+ CONFIG_GENERIC_HARDIRQS=y
+ CONFIG_GENERIC_IRQ_PROBE=y
+ CONFIG_GENERIC_PENDING_IRQ=y
+ CONFIG_X86_SMP=y
+ CONFIG_X86_32_SMP=y
+ CONFIG_X86_HT=y
+ CONFIG_X86_BIOS_REBOOT=y
+ CONFIG_X86_TRAMPOLINE=y
+ CONFIG_KTIME_SCALAR=y
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
- # Code maturity level options
+ # General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
@@@@@@@@@@@@ -67,39 -67,39 -67,39 -67,39 -39,16 -67,39 -66,38 -67,39 -67,39 -67,39 -67,39 +67,39 @@@@@@@@@@@@ CONFIG_SWAP=
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
- # CONFIG_BSD_PROCESS_ACCT is not set
- # CONFIG_TASKSTATS is not set
- # CONFIG_USER_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=18
- # CONFIG_CPUSETS is not set
- CONFIG_SYSFS_DEPRECATED=y
+ CONFIG_BSD_PROCESS_ACCT=y
+ # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+ CONFIG_TASKSTATS=y
+ CONFIG_TASK_DELAY_ACCT=y
+ CONFIG_TASK_XACCT=y
+ CONFIG_TASK_IO_ACCOUNTING=y
+ CONFIG_AUDIT=y
+ CONFIG_AUDITSYSCALL=y
+ CONFIG_AUDIT_TREE=y
+ # CONFIG_IKCONFIG is not set
+ CONFIG_LOG_BUF_SHIFT=17
+ CONFIG_CGROUPS=y
+ # CONFIG_CGROUP_DEBUG is not set
+ CONFIG_CGROUP_NS=y
+ # CONFIG_CGROUP_DEVICE is not set
+ CONFIG_CPUSETS=y
+ + CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+ CONFIG_GROUP_SCHED=y
+ CONFIG_FAIR_GROUP_SCHED=y
+ # CONFIG_RT_GROUP_SCHED is not set
+ # CONFIG_USER_SCHED is not set
+ CONFIG_CGROUP_SCHED=y
+ CONFIG_CGROUP_CPUACCT=y
+ CONFIG_RESOURCE_COUNTERS=y
+ # CONFIG_CGROUP_MEM_RES_CTLR is not set
+ # CONFIG_SYSFS_DEPRECATED_V2 is not set
+ CONFIG_PROC_PID_CPUSET=y
CONFIG_RELAY=y
+ CONFIG_NAMESPACES=y
+ CONFIG_UTS_NS=y
+ CONFIG_IPC_NS=y
+ CONFIG_USER_NS=y
+ CONFIG_PID_NS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@@@@@@@@@@@ -107,15 -107,15 -107,15 -107,15 -56,13 -107,15 -105,15 -107,15 -107,15 -107,15 -107,15 +107,15 @@@@@@@@@@@@ CONFIG_SYSCTL=
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
- CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
+ CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
+ + CONFIG_PCSPKR_PLATFORM=y
+ # CONFIG_COMPAT_BRK is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_ANON_INODES=y
@@@@@@@@@@@@ -129,23 -129,23 -129,23 -129,23 -76,6 -129,23 -127,17 -129,23 -129,23 -129,23 -129,23 +129,23 @@@@@@@@@@@@ CONFIG_SLUB_DEBUG=
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
+ CONFIG_PROFILING=y
+ CONFIG_MARKERS=y
+ # CONFIG_OPROFILE is not set
+ CONFIG_HAVE_OPROFILE=y
+ CONFIG_KPROBES=y
+ + CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+ CONFIG_KRETPROBES=y
+ + CONFIG_HAVE_IOREMAP_PROT=y
+ CONFIG_HAVE_KPROBES=y
+ CONFIG_HAVE_KRETPROBES=y
+ + # CONFIG_HAVE_ARCH_TRACEHOOK is not set
+ # CONFIG_HAVE_DMA_ATTRS is not set
+ + CONFIG_USE_GENERIC_SMP_HELPERS=y
+ + # CONFIG_HAVE_CLK is not set
+ CONFIG_PROC_PAGE_MONITOR=y
+ + CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+ CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
@@@@@@@@@@@@ -155,14 -155,14 -155,14 -155,14 -84,13 -155,14 -146,13 -155,14 -155,14 -155,14 -155,14 +155,14 @@@@@@@@@@@@ CONFIG_MODULE_UNLOAD=
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
- - # CONFIG_KMOD is not set
+ + CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
- CONFIG_LBD=y
- # CONFIG_BLK_DEV_IO_TRACE is not set
+ # CONFIG_LBD is not set
+ CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_LSF is not set
- # CONFIG_BLK_DEV_BSG is not set
+ CONFIG_BLK_DEV_BSG=y
+ + # CONFIG_BLK_DEV_INTEGRITY is not set
#
# IO Schedulers
@@@@@@@@@@@@ -184,28 -184,28 -184,28 -184,28 -111,28 -184,28 -174,30 -184,28 -184,28 -184,28 -184,28 +184,28 @@@@@@@@@@@@ CONFIG_CLASSIC_RCU=
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
- # CONFIG_X86_PC is not set
+ + CONFIG_X86_FIND_SMP_CONFIG=y
+ + CONFIG_X86_MPPARSE=y
+ CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
- - # CONFIG_X86_NUMAQ is not set
- - # CONFIG_X86_SUMMIT is not set
- - # CONFIG_X86_BIGSMP is not set
- - # CONFIG_X86_VISWS is not set
- CONFIG_X86_GENERICARCH=y
- # CONFIG_X86_ES7000 is not set
- # CONFIG_PARAVIRT is not set
- CONFIG_X86_CYCLONE_TIMER=y
+ # CONFIG_X86_GENERICARCH is not set
- # CONFIG_X86_ES7000 is not set
- # CONFIG_X86_RDC321X is not set
+ # CONFIG_X86_VSMP is not set
+ + # CONFIG_X86_RDC321X is not set
+ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+ # CONFIG_PARAVIRT_GUEST is not set
+ + # CONFIG_MEMTEST is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not set
--- - -# CONFIG_M686 is not set
+++ + +CONFIG_M686=y
# CONFIG_MPENTIUMII is not set
- CONFIG_MPENTIUMIII=y
+ # CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
- # CONFIG_MCORE2 is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
@@@@@@@@@@@@ -220,31 -220,31 -220,29 -220,29 -147,28 -220,31 -212,31 -220,31 -220,31 -220,31 -220,29 +220,31 @@@@@@@@@@@@
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
+ # CONFIG_MPSC is not set
-- - -CONFIG_MCORE2=y
+++ + +# CONFIG_MCORE2 is not set
+ # CONFIG_GENERIC_CPU is not set
- # CONFIG_X86_GENERIC is not set
+ CONFIG_X86_GENERIC=y
+ CONFIG_X86_CPU=y
CONFIG_X86_CMPXCHG=y
- CONFIG_X86_L1_CACHE_SHIFT=6
+ CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_XADD=y
- CONFIG_RWSEM_XCHGADD_ALGORITHM=y
- # CONFIG_ARCH_HAS_ILOG2_U32 is not set
- # CONFIG_ARCH_HAS_ILOG2_U64 is not set
- CONFIG_GENERIC_CALIBRATE_DELAY=y
+++ + +# CONFIG_X86_PPRO_FENCE is not set
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
- - CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
- CONFIG_X86_P6_NOP=y
CONFIG_X86_TSC=y
- CONFIG_X86_MINIMUM_CPU_FAMILY=6
++ + +CONFIG_X86_CMOV=y
+ CONFIG_X86_MINIMUM_CPU_FAMILY=4
+ CONFIG_X86_DEBUGCTLMSR=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
- CONFIG_NR_CPUS=32
+ CONFIG_DMI=y
+ # CONFIG_IOMMU_HELPER is not set
-- - -CONFIG_NR_CPUS=4
-- - -# CONFIG_SCHED_SMT is not set
+++ + +CONFIG_NR_CPUS=64
++ + +CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
@@@@@@@@@@@@ -255,96 -255,96 -253,95 -253,95 -182,82 -255,96 -247,96 -255,96 -255,96 -255,96 -253,95 +255,96 @@@@@@@@@@@@ CONFIG_X86_IO_APIC=
CONFIG_VM86=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
- - # CONFIG_X86_REBOOTFIXUPS is not set
- # CONFIG_MICROCODE is not set
+ + CONFIG_X86_REBOOTFIXUPS=y
-- -# CONFIG_MICROCODE is not set
++ + +CONFIG_MICROCODE=y
++ + +CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
-
- #
- # Firmware Drivers
- #
- # CONFIG_EDD is not set
- # CONFIG_DELL_RBU is not set
- # CONFIG_DCDBAS is not set
- CONFIG_DMIID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
- CONFIG_ARCH_POPULATES_NODE_MAP=y
- CONFIG_NEED_NODE_MEMMAP_SIZE=y
+ CONFIG_ARCH_FLATMEM_ENABLE=y
+ CONFIG_ARCH_SPARSEMEM_ENABLE=y
+ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_SELECT_MEMORY_MODEL=y
- # CONFIG_FLATMEM_MANUAL is not set
+ CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
- CONFIG_SPARSEMEM_MANUAL=y
- CONFIG_SPARSEMEM=y
- CONFIG_HAVE_MEMORY_PRESENT=y
+ # CONFIG_SPARSEMEM_MANUAL is not set
+ CONFIG_FLATMEM=y
+ CONFIG_FLAT_NODE_MEM_MAP=y
- # CONFIG_SPARSEMEM_STATIC is not set
+ CONFIG_SPARSEMEM_STATIC=y
+ # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-
- #
- # Memory hotplug is currently incompatible with Software Suspend
- #
+ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
- CONFIG_NR_QUICK=1
CONFIG_VIRT_TO_BUS=y
- - # CONFIG_HIGHPTE is not set
+ + CONFIG_HIGHPTE=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
- # CONFIG_EFI is not set
- # CONFIG_X86_PAT is not set
+ + # CONFIG_MTRR_SANITIZER is not set
+ + CONFIG_X86_PAT=y
+ CONFIG_EFI=y
# CONFIG_IRQBALANCE is not set
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
- CONFIG_HZ_250=y
+ # CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
- # CONFIG_HZ_1000 is not set
- CONFIG_HZ=250
- # CONFIG_KEXEC is not set
- # CONFIG_CRASH_DUMP is not set
- CONFIG_PHYSICAL_START=0x100000
- # CONFIG_RELOCATABLE is not set
- CONFIG_PHYSICAL_ALIGN=0x100000
- # CONFIG_HOTPLUG_CPU is not set
- CONFIG_COMPAT_VDSO=y
+ CONFIG_HZ_1000=y
+ CONFIG_HZ=1000
+ CONFIG_SCHED_HRTICK=y
+ CONFIG_KEXEC=y
+ CONFIG_CRASH_DUMP=y
+ + # CONFIG_KEXEC_JUMP is not set
+ CONFIG_PHYSICAL_START=0x1000000
+ CONFIG_RELOCATABLE=y
+ CONFIG_PHYSICAL_ALIGN=0x200000
+ CONFIG_HOTPLUG_CPU=y
+ # CONFIG_COMPAT_VDSO is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
- # Power management options (ACPI, APM)
+ # Power management options
#
CONFIG_PM=y
- CONFIG_PM_LEGACY=y
- # CONFIG_PM_DEBUG is not set
-
- #
- # ACPI (Advanced Configuration and Power Interface) Support
- #
+ CONFIG_PM_DEBUG=y
+ # CONFIG_PM_VERBOSE is not set
+ CONFIG_CAN_PM_TRACE=y
+ CONFIG_PM_TRACE=y
+ CONFIG_PM_TRACE_RTC=y
+ CONFIG_PM_SLEEP_SMP=y
+ CONFIG_PM_SLEEP=y
+ CONFIG_SUSPEND=y
+ + # CONFIG_PM_TEST_SUSPEND is not set
+ CONFIG_SUSPEND_FREEZER=y
+ CONFIG_HIBERNATION=y
+ CONFIG_PM_STD_PARTITION=""
CONFIG_ACPI=y
+ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
+ CONFIG_ACPI_PROCFS_POWER=y
+ CONFIG_ACPI_SYSFS_POWER=y
+ CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
- # CONFIG_ACPI_DOCK is not set
+ CONFIG_ACPI_DOCK=y
+ # CONFIG_ACPI_BAY is not set
CONFIG_ACPI_PROCESSOR=y
+ CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_THERMAL=y
+ # CONFIG_ACPI_WMI is not set
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_TOSHIBA is not set
- CONFIG_ACPI_BLACKLIST_YEAR=2001
- CONFIG_ACPI_DEBUG=y
+ # CONFIG_ACPI_CUSTOM_DSDT is not set
+ CONFIG_ACPI_BLACKLIST_YEAR=0
+ # CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
+ + # CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
@@@@@@@@@@@@ -403,8 -403,8 -400,8 -400,8 -312,7 -403,8 -395,8 -403,8 -403,8 -403,8 -400,8 +403,8 @@@@@@@@@@@@ CONFIG_PCI=
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
- CONFIG_PCI_GOANY=y
+ # CONFIG_PCI_GOOLPC is not set
+ CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
@@@@@@@@@@@@ -455,7 -455,7 -452,7 -452,7 -338,11 -455,7 -447,11 -455,7 -455,7 -455,7 -452,7 +455,7 @@@@@@@@@@@@ CONFIG_HOTPLUG_PCI=
#
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
- # CONFIG_BINFMT_MISC is not set
-
- #
- # Networking
- #
+ CONFIG_BINFMT_MISC=y
-
- #
- # Networking
- #
CONFIG_NET=y
#
@@@@@@@@@@@@ -472,24 -472,24 -469,24 -469,24 -358,17 -472,24 -468,21 -472,24 -472,24 -472,24 -469,24 +472,24 @@@@@@@@@@@@ CONFIG_XFRM_USER=
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
- # CONFIG_IP_ADVANCED_ROUTER is not set
+ CONFIG_IP_ADVANCED_ROUTER=y
+ CONFIG_ASK_IP_FIB_HASH=y
+ # CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
+ CONFIG_IP_MULTIPLE_TABLES=y
+ CONFIG_IP_ROUTE_MULTIPATH=y
+ CONFIG_IP_ROUTE_VERBOSE=y
- # CONFIG_IP_PNP is not set
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
- # CONFIG_IP_PNP_BOOTP is not set
- # CONFIG_IP_PNP_RARP is not set
+ + CONFIG_IP_PNP_BOOTP=y
+ + CONFIG_IP_PNP_RARP=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
- # CONFIG_IP_MROUTE is not set
+ CONFIG_IP_MROUTE=y
+ CONFIG_IP_PIMSM_V1=y
+ CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
- # CONFIG_SYN_COOKIES is not set
+ CONFIG_SYN_COOKIES=y
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
@@@@@@@@@@@@ -616,52 -616,52 -613,52 -613,52 -416,11 -616,52 -609,53 -616,52 -616,52 -616,52 -613,52 +616,52 @@@@@@@@@@@@ CONFIG_LLC=
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-
- #
- # QoS and/or fair queueing
- #
- # CONFIG_NET_SCHED is not set
+ CONFIG_NET_SCHED=y
+
+ #
+ # Queueing/Scheduling
+ #
+ # CONFIG_NET_SCH_CBQ is not set
+ # CONFIG_NET_SCH_HTB is not set
+ # CONFIG_NET_SCH_HFSC is not set
+ # CONFIG_NET_SCH_PRIO is not set
- # CONFIG_NET_SCH_RR is not set
+ # CONFIG_NET_SCH_RED is not set
+ # CONFIG_NET_SCH_SFQ is not set
+ # CONFIG_NET_SCH_TEQL is not set
+ # CONFIG_NET_SCH_TBF is not set
+ # CONFIG_NET_SCH_GRED is not set
+ # CONFIG_NET_SCH_DSMARK is not set
+ # CONFIG_NET_SCH_NETEM is not set
+ # CONFIG_NET_SCH_INGRESS is not set
+
+ #
+ # Classification
+ #
+ CONFIG_NET_CLS=y
+ # CONFIG_NET_CLS_BASIC is not set
+ # CONFIG_NET_CLS_TCINDEX is not set
+ # CONFIG_NET_CLS_ROUTE4 is not set
+ # CONFIG_NET_CLS_FW is not set
+ # CONFIG_NET_CLS_U32 is not set
+ # CONFIG_NET_CLS_RSVP is not set
+ # CONFIG_NET_CLS_RSVP6 is not set
+ # CONFIG_NET_CLS_FLOW is not set
+ CONFIG_NET_EMATCH=y
+ CONFIG_NET_EMATCH_STACK=32
+ # CONFIG_NET_EMATCH_CMP is not set
+ # CONFIG_NET_EMATCH_NBYTE is not set
+ # CONFIG_NET_EMATCH_U32 is not set
+ # CONFIG_NET_EMATCH_META is not set
+ # CONFIG_NET_EMATCH_TEXT is not set
+ CONFIG_NET_CLS_ACT=y
+ # CONFIG_NET_ACT_POLICE is not set
+ # CONFIG_NET_ACT_GACT is not set
+ # CONFIG_NET_ACT_MIRRED is not set
+ # CONFIG_NET_ACT_IPT is not set
+ # CONFIG_NET_ACT_NAT is not set
+ # CONFIG_NET_ACT_PEDIT is not set
+ # CONFIG_NET_ACT_SIMP is not set
+ CONFIG_NET_SCH_FIFO=y
#
# Network testing
@@@@@@@@@@@@ -683,22 -683,22 -680,22 -680,22 -435,9 -683,22 -677,31 -683,22 -683,22 -683,22 -680,22 +683,22 @@@@@@@@@@@@ CONFIG_FIB_RULES=
#
# Wireless
#
- # CONFIG_CFG80211 is not set
- # CONFIG_WIRELESS_EXT is not set
- # CONFIG_MAC80211 is not set
+ CONFIG_CFG80211=y
+ CONFIG_NL80211=y
+ CONFIG_WIRELESS_EXT=y
+ + CONFIG_WIRELESS_EXT_SYSFS=y
+ CONFIG_MAC80211=y
+
+ #
+ # Rate control algorithm selection
+ #
+ + CONFIG_MAC80211_RC_PID=y
+ CONFIG_MAC80211_RC_DEFAULT_PID=y
- # CONFIG_MAC80211_RC_DEFAULT_NONE is not set
-
- #
- # Selecting 'y' for an algorithm will
- #
-
- #
- # build the algorithm into mac80211.
- #
+ CONFIG_MAC80211_RC_DEFAULT="pid"
- CONFIG_MAC80211_RC_PID=y
+ # CONFIG_MAC80211_MESH is not set
+ CONFIG_MAC80211_LEDS=y
+ # CONFIG_MAC80211_DEBUGFS is not set
- # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
- # CONFIG_MAC80211_DEBUG is not set
+ + # CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_IEEE80211 is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@@@@@@@@@@@ -714,13 -714,13 -711,13 -711,13 -452,10 -714,13 -717,11 -714,13 -714,13 -714,13 -711,13 +714,13 @@@@@@@@@@@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
+ + CONFIG_FIRMWARE_IN_KERNEL=y
+ + CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
- # CONFIG_DEBUG_DEVRES is not set
+ CONFIG_DEBUG_DEVRES=y
# CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
+ CONFIG_CONNECTOR=y
+ CONFIG_PROC_EVENTS=y
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
CONFIG_PNP=y
@@@@@@@@@@@@ -744,30 -744,30 -741,30 -741,30 -479,83 -744,30 -745,27 -744,30 -744,30 -744,30 -741,30 +744,30 @@@@@@@@@@@@ CONFIG_BLK_DEV_LOOP=
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=4096
- CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+ CONFIG_BLK_DEV_RAM_SIZE=16384
+ # CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+ + # CONFIG_BLK_DEV_HD is not set
CONFIG_MISC_DEVICES=y
# CONFIG_IBM_ASM is not set
# CONFIG_PHANTOM is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
+ # CONFIG_ACER_WMI is not set
+ # CONFIG_ASUS_LAPTOP is not set
+ # CONFIG_FUJITSU_LAPTOP is not set
+ # CONFIG_TC1100_WMI is not set
+ # CONFIG_MSI_LAPTOP is not set
+ + # CONFIG_COMPAL_LAPTOP is not set
# CONFIG_SONY_LAPTOP is not set
# CONFIG_THINKPAD_ACPI is not set
- CONFIG_IDE=y
- CONFIG_BLK_DEV_IDE=y
-
- #
- # Please see Documentation/ide.txt for help/info on IDE drives
- #
- # CONFIG_BLK_DEV_IDE_SATA is not set
- # CONFIG_BLK_DEV_HD_IDE is not set
- CONFIG_BLK_DEV_IDEDISK=y
- CONFIG_IDEDISK_MULTI_MODE=y
- CONFIG_BLK_DEV_IDECD=y
- # CONFIG_BLK_DEV_IDETAPE is not set
- # CONFIG_BLK_DEV_IDEFLOPPY is not set
- # CONFIG_BLK_DEV_IDESCSI is not set
- CONFIG_BLK_DEV_IDEACPI=y
- # CONFIG_IDE_TASK_IOCTL is not set
- CONFIG_IDE_PROC_FS=y
-
- #
- # IDE chipset support/bugfixes
- #
- CONFIG_IDE_GENERIC=y
- # CONFIG_BLK_DEV_CMD640 is not set
- # CONFIG_BLK_DEV_IDEPNP is not set
- CONFIG_BLK_DEV_IDEPCI=y
- # CONFIG_IDEPCI_SHARE_IRQ is not set
- CONFIG_IDEPCI_PCIBUS_ORDER=y
- # CONFIG_BLK_DEV_OFFBOARD is not set
- # CONFIG_BLK_DEV_GENERIC is not set
- # CONFIG_BLK_DEV_OPTI621 is not set
- # CONFIG_BLK_DEV_RZ1000 is not set
- CONFIG_BLK_DEV_IDEDMA_PCI=y
- # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
- # CONFIG_IDEDMA_ONLYDISK is not set
- # CONFIG_BLK_DEV_AEC62XX is not set
- # CONFIG_BLK_DEV_ALI15X3 is not set
- CONFIG_BLK_DEV_AMD74XX=y
- # CONFIG_BLK_DEV_ATIIXP is not set
- # CONFIG_BLK_DEV_CMD64X is not set
- # CONFIG_BLK_DEV_TRIFLEX is not set
- # CONFIG_BLK_DEV_CY82C693 is not set
- # CONFIG_BLK_DEV_CS5520 is not set
- # CONFIG_BLK_DEV_CS5530 is not set
- # CONFIG_BLK_DEV_CS5535 is not set
- # CONFIG_BLK_DEV_HPT34X is not set
- # CONFIG_BLK_DEV_HPT366 is not set
- # CONFIG_BLK_DEV_JMICRON is not set
- # CONFIG_BLK_DEV_SC1200 is not set
- CONFIG_BLK_DEV_PIIX=y
- # CONFIG_BLK_DEV_IT8213 is not set
- # CONFIG_BLK_DEV_IT821X is not set
- # CONFIG_BLK_DEV_NS87415 is not set
- # CONFIG_BLK_DEV_PDC202XX_OLD is not set
- # CONFIG_BLK_DEV_PDC202XX_NEW is not set
- # CONFIG_BLK_DEV_SVWKS is not set
- # CONFIG_BLK_DEV_SIIMAGE is not set
- # CONFIG_BLK_DEV_SIS5513 is not set
- # CONFIG_BLK_DEV_SLC90E66 is not set
- # CONFIG_BLK_DEV_TRM290 is not set
- # CONFIG_BLK_DEV_VIA82CXXX is not set
- # CONFIG_BLK_DEV_TC86C001 is not set
- # CONFIG_IDE_ARM is not set
- CONFIG_BLK_DEV_IDEDMA=y
- # CONFIG_IDEDMA_IVB is not set
- # CONFIG_BLK_DEV_HD is not set
+ # CONFIG_INTEL_MENLOW is not set
+ # CONFIG_ENCLOSURE_SERVICES is not set
+ + # CONFIG_HP_ILO is not set
+ CONFIG_HAVE_IDE=y
+ # CONFIG_IDE is not set
#
# SCSI device support
@@@@@@@@@@@@ -803,14 -803,14 -800,14 -800,14 -591,60 -803,14 -801,13 -803,14 -803,14 -803,14 -800,14 +803,14 @@@@@@@@@@@@ CONFIG_SCSI_WAIT_SCAN=
# SCSI Transports
#
CONFIG_SCSI_SPI_ATTRS=y
- CONFIG_SCSI_FC_ATTRS=y
- # CONFIG_SCSI_ISCSI_ATTRS is not set
+ # CONFIG_SCSI_FC_ATTRS is not set
- # CONFIG_SCSI_ISCSI_ATTRS is not set
+ + CONFIG_SCSI_ISCSI_ATTRS=y
# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
-
- #
- # SCSI low-level drivers
- #
- # CONFIG_ISCSI_TCP is not set
- CONFIG_BLK_DEV_3W_XXXX_RAID=y
- # CONFIG_SCSI_3W_9XXX is not set
- # CONFIG_SCSI_ACARD is not set
- # CONFIG_SCSI_AACRAID is not set
- CONFIG_SCSI_AIC7XXX=y
- CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
- CONFIG_AIC7XXX_RESET_DELAY_MS=5000
- CONFIG_AIC7XXX_DEBUG_ENABLE=y
- CONFIG_AIC7XXX_DEBUG_MASK=0
- CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
- # CONFIG_SCSI_AIC7XXX_OLD is not set
- CONFIG_SCSI_AIC79XX=y
- CONFIG_AIC79XX_CMDS_PER_DEVICE=32
- CONFIG_AIC79XX_RESET_DELAY_MS=4000
- # CONFIG_AIC79XX_DEBUG_ENABLE is not set
- CONFIG_AIC79XX_DEBUG_MASK=0
- # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
- # CONFIG_SCSI_AIC94XX is not set
- # CONFIG_SCSI_DPT_I2O is not set
- # CONFIG_SCSI_ADVANSYS is not set
- # CONFIG_SCSI_ARCMSR is not set
- # CONFIG_MEGARAID_NEWGEN is not set
- # CONFIG_MEGARAID_LEGACY is not set
- # CONFIG_MEGARAID_SAS is not set
- # CONFIG_SCSI_HPTIOP is not set
- # CONFIG_SCSI_BUSLOGIC is not set
- # CONFIG_SCSI_DMX3191D is not set
- # CONFIG_SCSI_EATA is not set
- # CONFIG_SCSI_FUTURE_DOMAIN is not set
- # CONFIG_SCSI_GDTH is not set
- # CONFIG_SCSI_IPS is not set
- # CONFIG_SCSI_INITIO is not set
- # CONFIG_SCSI_INIA100 is not set
- # CONFIG_SCSI_STEX is not set
- # CONFIG_SCSI_SYM53C8XX_2 is not set
- # CONFIG_SCSI_IPR is not set
- # CONFIG_SCSI_QLOGIC_1280 is not set
- # CONFIG_SCSI_QLA_FC is not set
- # CONFIG_SCSI_QLA_ISCSI is not set
- # CONFIG_SCSI_LPFC is not set
- # CONFIG_SCSI_DC395x is not set
- # CONFIG_SCSI_DC390T is not set
- # CONFIG_SCSI_NSP32 is not set
- # CONFIG_SCSI_DEBUG is not set
- # CONFIG_SCSI_SRP is not set
+ # CONFIG_SCSI_SRP_ATTRS is not set
+ # CONFIG_SCSI_LOWLEVEL is not set
+ # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ + # CONFIG_SCSI_DH is not set
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_ACPI=y
@@@@@@@@@@@@ -842,10 -842,10 -839,10 -839,10 -673,9 -842,10 -839,10 -842,10 -842,10 -842,10 -839,10 +842,10 @@@@@@@@@@@@ CONFIG_PATA_AMD=
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
+ # CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
- - # CONFIG_ATA_GENERIC is not set
+ + CONFIG_ATA_GENERIC=y
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
@@@@@@@@@@@@ -855,15 -855,15 -852,15 -852,15 -685,12 -855,15 -852,15 -855,15 -855,15 -855,15 -852,15 +855,15 @@@@@@@@@@@@
# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
- - # CONFIG_PATA_MPIIX is not set
- # CONFIG_PATA_OLDPIIX is not set
+ + CONFIG_PATA_MPIIX=y
+ CONFIG_PATA_OLDPIIX=y
# CONFIG_PATA_NETCELL is not set
+ # CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87410 is not set
+ # CONFIG_PATA_NS87415 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
+ # CONFIG_PATA_PCMCIA is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RZ1000 is not set
@@@@@@@@@@@@ -874,16 -874,16 -871,16 -871,16 -701,8 -874,16 -871,15 -874,16 -874,16 -874,16 -871,16 +874,16 @@@@@@@@@@@@
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+ + CONFIG_PATA_SCH=y
CONFIG_MD=y
- # CONFIG_BLK_DEV_MD is not set
+ CONFIG_BLK_DEV_MD=y
+ # CONFIG_MD_LINEAR is not set
+ # CONFIG_MD_RAID0 is not set
+ # CONFIG_MD_RAID1 is not set
+ # CONFIG_MD_RAID10 is not set
+ # CONFIG_MD_RAID456 is not set
+ # CONFIG_MD_MULTIPATH is not set
+ # CONFIG_MD_FAULTY is not set
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
# CONFIG_DM_CRYPT is not set
@@@@@@@@@@@@ -898,42 -898,42 -895,42 -895,42 -725,45 -898,42 -894,23 -898,42 -898,42 -898,42 -895,42 +898,42 @@@@@@@@@@@@ CONFIG_DM_ZERO=
#
# IEEE 1394 (FireWire) support
#
- # CONFIG_FIREWIRE is not set
- CONFIG_IEEE1394=y
-
- #
- # Subsystem Options
- #
- # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-
- #
- # Controllers
- #
-
- #
- # Texas Instruments PCILynx requires I2C
- #
- CONFIG_IEEE1394_OHCI1394=y
+
+ #
- # Protocols
+ + # Enable only one of the two stacks, unless you know what you are doing
+ #
- # CONFIG_IEEE1394_VIDEO1394 is not set
- # CONFIG_IEEE1394_SBP2 is not set
- # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
- # CONFIG_IEEE1394_ETH1394 is not set
- # CONFIG_IEEE1394_DV1394 is not set
- CONFIG_IEEE1394_RAWIO=y
+ # CONFIG_FIREWIRE is not set
+ # CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
CONFIG_MACINTOSH_DRIVERS=y
- # CONFIG_MAC_EMUMOUSEBTN is not set
+ CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
- CONFIG_NETDEVICES_MULTIQUEUE=y
- # CONFIG_NETDEVICES_MULTIQUEUE is not set
+ # CONFIG_IFB is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
+ # CONFIG_VETH is not set
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
- - # CONFIG_PHYLIB is not set
+ + CONFIG_PHYLIB=y
+ +
+ + #
+ + # MII PHY device drivers
+ + #
+ + # CONFIG_MARVELL_PHY is not set
+ + # CONFIG_DAVICOM_PHY is not set
+ + # CONFIG_QSEMI_PHY is not set
+ + # CONFIG_LXT_PHY is not set
+ + # CONFIG_CICADA_PHY is not set
+ + # CONFIG_VITESSE_PHY is not set
+ + # CONFIG_SMSC_PHY is not set
+ + # CONFIG_BROADCOM_PHY is not set
+ + # CONFIG_ICPLUS_PHY is not set
+ + # CONFIG_REALTEK_PHY is not set
+ + # CONFIG_FIXED_PHY is not set
+ + # CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
@@@@@@@@@@@@ -966,10 -966,10 -963,10 -963,10 -795,10 -966,10 -943,10 -966,10 -966,10 -966,10 -963,10 +966,10 @@@@@@@@@@@@ CONFIG_FORCEDETH=
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
- - # CONFIG_NE2K_PCI is not set
- CONFIG_8139CP=y
+ + CONFIG_NE2K_PCI=y
+ # CONFIG_8139CP is not set
CONFIG_8139TOO=y
- CONFIG_8139TOO_PIO=y
+ # CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
@@@@@@@@@@@@ -984,24 -984,24 -981,24 -981,24 -812,21 -984,24 -961,25 -984,24 -984,24 -984,24 -981,24 +984,24 @@@@@@@@@@@@ CONFIG_NETDEV_1000=
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
CONFIG_E1000=y
- - # CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
- # CONFIG_E1000E is not set
- # CONFIG_E1000E_ENABLED is not set
+ + CONFIG_E1000E=y
+ # CONFIG_IP1000 is not set
+ # CONFIG_IGB is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
- # CONFIG_R8169 is not set
+ CONFIG_R8169=y
- # CONFIG_R8169_NAPI is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
CONFIG_SKY2=y
+ # CONFIG_SKY2_DEBUG is not set
# CONFIG_VIA_VELOCITY is not set
CONFIG_TIGON3=y
- # CONFIG_BNX2 is not set
+ CONFIG_BNX2=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
+ + # CONFIG_ATL1E is not set
CONFIG_NETDEV_10000=y
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
@@@@@@@@@@@@ -1025,36 -1025,36 -1022,36 -1022,36 -841,7 -1025,36 -1003,35 -1025,36 -1025,36 -1025,36 -1022,36 +1025,36 @@@@@@@@@@@@ CONFIG_TR=
# Wireless LAN
#
# CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
+ CONFIG_WLAN_80211=y
+ # CONFIG_PCMCIA_RAYCS is not set
+ # CONFIG_IPW2100 is not set
+ # CONFIG_IPW2200 is not set
+ # CONFIG_LIBERTAS is not set
+ # CONFIG_AIRO is not set
+ # CONFIG_HERMES is not set
+ # CONFIG_ATMEL is not set
+ # CONFIG_AIRO_CS is not set
+ # CONFIG_PCMCIA_WL3501 is not set
+ # CONFIG_PRISM54 is not set
+ # CONFIG_USB_ZD1201 is not set
+ # CONFIG_USB_NET_RNDIS_WLAN is not set
+ # CONFIG_RTL8180 is not set
+ # CONFIG_RTL8187 is not set
+ # CONFIG_ADM8211 is not set
+ + # CONFIG_MAC80211_HWSIM is not set
+ # CONFIG_P54_COMMON is not set
+ CONFIG_ATH5K=y
+ # CONFIG_ATH5K_DEBUG is not set
- # CONFIG_IWLWIFI is not set
+ + # CONFIG_ATH9K is not set
+ # CONFIG_IWLCORE is not set
+ # CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_IWL4965 is not set
+ + # CONFIG_IWLAGN is not set
+ # CONFIG_IWL3945 is not set
+ # CONFIG_HOSTAP is not set
+ # CONFIG_B43 is not set
+ # CONFIG_B43LEGACY is not set
+ # CONFIG_ZD1211RW is not set
+ # CONFIG_RT2X00 is not set
#
# USB Network Adapters
@@@@@@@@@@@@ -1128,60 -1128,60 -1125,60 -1125,60 -905,11 -1128,60 -1105,57 -1128,60 -1128,60 -1128,60 -1125,60 +1128,60 @@@@@@@@@@@@ CONFIG_MOUSE_PS2_TRACKPOINT=
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_APPLETOUCH is not set
+ + # CONFIG_MOUSE_BCM5974 is not set
# CONFIG_MOUSE_VSXXXAA is not set
- # CONFIG_INPUT_JOYSTICK is not set
- # CONFIG_INPUT_TABLET is not set
- # CONFIG_INPUT_TOUCHSCREEN is not set
- # CONFIG_INPUT_MISC is not set
+ CONFIG_INPUT_JOYSTICK=y
+ # CONFIG_JOYSTICK_ANALOG is not set
+ # CONFIG_JOYSTICK_A3D is not set
+ # CONFIG_JOYSTICK_ADI is not set
+ # CONFIG_JOYSTICK_COBRA is not set
+ # CONFIG_JOYSTICK_GF2K is not set
+ # CONFIG_JOYSTICK_GRIP is not set
+ # CONFIG_JOYSTICK_GRIP_MP is not set
+ # CONFIG_JOYSTICK_GUILLEMOT is not set
+ # CONFIG_JOYSTICK_INTERACT is not set
+ # CONFIG_JOYSTICK_SIDEWINDER is not set
+ # CONFIG_JOYSTICK_TMDC is not set
+ # CONFIG_JOYSTICK_IFORCE is not set
+ # CONFIG_JOYSTICK_WARRIOR is not set
+ # CONFIG_JOYSTICK_MAGELLAN is not set
+ # CONFIG_JOYSTICK_SPACEORB is not set
+ # CONFIG_JOYSTICK_SPACEBALL is not set
+ # CONFIG_JOYSTICK_STINGER is not set
+ # CONFIG_JOYSTICK_TWIDJOY is not set
+ # CONFIG_JOYSTICK_ZHENHUA is not set
+ # CONFIG_JOYSTICK_JOYDUMP is not set
+ # CONFIG_JOYSTICK_XPAD is not set
+ CONFIG_INPUT_TABLET=y
+ # CONFIG_TABLET_USB_ACECAD is not set
+ # CONFIG_TABLET_USB_AIPTEK is not set
+ # CONFIG_TABLET_USB_GTCO is not set
+ # CONFIG_TABLET_USB_KBTAB is not set
+ # CONFIG_TABLET_USB_WACOM is not set
+ CONFIG_INPUT_TOUCHSCREEN=y
+ # CONFIG_TOUCHSCREEN_FUJITSU is not set
+ # CONFIG_TOUCHSCREEN_GUNZE is not set
+ # CONFIG_TOUCHSCREEN_ELO is not set
+ # CONFIG_TOUCHSCREEN_MTOUCH is not set
+ + # CONFIG_TOUCHSCREEN_INEXIO is not set
+ # CONFIG_TOUCHSCREEN_MK712 is not set
+ # CONFIG_TOUCHSCREEN_PENMOUNT is not set
+ # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+ # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+ # CONFIG_TOUCHSCREEN_UCB1400 is not set
+ # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+ + # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+ CONFIG_INPUT_MISC=y
+ # CONFIG_INPUT_PCSPKR is not set
+ # CONFIG_INPUT_APANEL is not set
+ # CONFIG_INPUT_WISTRON_BTNS is not set
+ # CONFIG_INPUT_ATLAS_BTNS is not set
+ # CONFIG_INPUT_ATI_REMOTE is not set
+ # CONFIG_INPUT_ATI_REMOTE2 is not set
+ # CONFIG_INPUT_KEYSPAN_REMOTE is not set
+ # CONFIG_INPUT_POWERMATE is not set
+ # CONFIG_INPUT_YEALINK is not set
+ # CONFIG_INPUT_UINPUT is not set
#
# Hardware I/O ports
@@@@@@@@@@@@ -1199,29 -1199,29 -1196,29 -1196,29 -927,10 -1199,29 -1173,28 -1199,29 -1199,29 -1199,29 -1196,29 +1199,29 @@@@@@@@@@@@ CONFIG_SERIO_LIBPS2=
# Character devices
#
CONFIG_VT=y
+ + CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
- # CONFIG_VT_HW_CONSOLE_BINDING is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
+ CONFIG_VT_HW_CONSOLE_BINDING=y
+ CONFIG_DEVKMEM=y
+ CONFIG_SERIAL_NONSTANDARD=y
+ # CONFIG_COMPUTONE is not set
+ # CONFIG_ROCKETPORT is not set
+ # CONFIG_CYCLADES is not set
+ # CONFIG_DIGIEPCA is not set
+ # CONFIG_MOXA_INTELLIO is not set
+ # CONFIG_MOXA_SMARTIO is not set
+ # CONFIG_ISI is not set
+ # CONFIG_SYNCLINK is not set
+ # CONFIG_SYNCLINKMP is not set
+ # CONFIG_SYNCLINK_GT is not set
+ # CONFIG_N_HDLC is not set
+ # CONFIG_RISCOM8 is not set
+ # CONFIG_SPECIALIX is not set
+ # CONFIG_SX is not set
+ # CONFIG_RIO is not set
+ # CONFIG_STALDRV is not set
+ # CONFIG_NOZOMI is not set
#
# Serial drivers
@@@@@@@@@@@@ -1247,14 -1247,14 -1244,14 -1244,14 -951,17 -1247,14 -1220,14 -1247,14 -1247,14 -1247,14 -1244,14 +1247,14 @@@@@@@@@@@@ CONFIG_SERIAL_CORE=
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
- CONFIG_LEGACY_PTYS=y
- CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
- # CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=y
- # CONFIG_HW_RANDOM_INTEL is not set
- # CONFIG_HW_RANDOM_AMD is not set
+ CONFIG_HW_RANDOM_INTEL=y
+ CONFIG_HW_RANDOM_AMD=y
CONFIG_HW_RANDOM_GEODE=y
CONFIG_HW_RANDOM_VIA=y
- # CONFIG_NVRAM is not set
- CONFIG_RTC=y
+ CONFIG_NVRAM=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set
@@@@@@@@@@@@ -1270,259 -1270,259 -1267,259 -1267,259 -981,43 -1270,259 -1243,233 -1270,259 -1270,259 -1270,259 -1267,259 +1270,259 @@@@@@@@@@@@
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_CS5535_GPIO is not set
- CONFIG_RAW_DRIVER=y
- CONFIG_MAX_RAW_DEVS=256
+ # CONFIG_RAW_DRIVER is not set
CONFIG_HPET=y
- - # CONFIG_HPET_RTC_IRQ is not set
- CONFIG_HPET_MMAP=y
+ # CONFIG_HPET_MMAP is not set
# CONFIG_HANGCHECK_TIMER is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
- # CONFIG_I2C is not set
+ CONFIG_I2C=y
+ CONFIG_I2C_BOARDINFO=y
+ # CONFIG_I2C_CHARDEV is not set
+ + CONFIG_I2C_HELPER_AUTO=y
+
+ #
+ # I2C Hardware Bus support
+ #
+ +
+ + #
+ + # PC SMBus host controller drivers
+ + #
+ # CONFIG_I2C_ALI1535 is not set
+ # CONFIG_I2C_ALI1563 is not set
+ # CONFIG_I2C_ALI15X3 is not set
+ # CONFIG_I2C_AMD756 is not set
+ # CONFIG_I2C_AMD8111 is not set
+ CONFIG_I2C_I801=y
- # CONFIG_I2C_I810 is not set
+ + # CONFIG_I2C_ISCH is not set
+ # CONFIG_I2C_PIIX4 is not set
+ # CONFIG_I2C_NFORCE2 is not set
- # CONFIG_I2C_OCORES is not set
- # CONFIG_I2C_PARPORT_LIGHT is not set
- # CONFIG_I2C_PROSAVAGE is not set
- # CONFIG_I2C_SAVAGE4 is not set
- # CONFIG_I2C_SIMTEC is not set
- # CONFIG_SCx200_ACB is not set
+ # CONFIG_I2C_SIS5595 is not set
+ # CONFIG_I2C_SIS630 is not set
+ # CONFIG_I2C_SIS96X is not set
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
- # CONFIG_I2C_TINY_USB is not set
+ # CONFIG_I2C_VIA is not set
+ # CONFIG_I2C_VIAPRO is not set
+ +
+ + #
+ + # I2C system bus drivers (mostly embedded / system-on-chip)
+ + #
+ + # CONFIG_I2C_OCORES is not set
+ + # CONFIG_I2C_SIMTEC is not set
+
+ #
- # SPI support
+ + # External I2C/SMBus adapter drivers
+ #
+ + # CONFIG_I2C_PARPORT_LIGHT is not set
+ + # CONFIG_I2C_TAOS_EVM is not set
+ + # CONFIG_I2C_TINY_USB is not set
+ +
+ + #
+ + # Graphics adapter I2C/DDC channel drivers
+ + #
+ # CONFIG_I2C_VOODOO3 is not set
+ +
+ + #
+ + # Other I2C/SMBus bus drivers
+ + #
+ # CONFIG_I2C_PCA_PLATFORM is not set
+ + # CONFIG_I2C_STUB is not set
+ + # CONFIG_SCx200_ACB is not set
+
+ #
+ # Miscellaneous I2C Chip support
+ #
+ # CONFIG_DS1682 is not set
+ + # CONFIG_AT24 is not set
+ # CONFIG_SENSORS_EEPROM is not set
+ # CONFIG_SENSORS_PCF8574 is not set
+ # CONFIG_PCF8575 is not set
+ + # CONFIG_SENSORS_PCA9539 is not set
+ # CONFIG_SENSORS_PCF8591 is not set
+ # CONFIG_SENSORS_MAX6875 is not set
+ # CONFIG_SENSORS_TSL2550 is not set
+ # CONFIG_I2C_DEBUG_CORE is not set
+ # CONFIG_I2C_DEBUG_ALGO is not set
+ # CONFIG_I2C_DEBUG_BUS is not set
+ # CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_SPI is not set
- # CONFIG_SPI_MASTER is not set
+ + CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+ + # CONFIG_GPIOLIB is not set
# CONFIG_W1 is not set
- # CONFIG_POWER_SUPPLY is not set
+ CONFIG_POWER_SUPPLY=y
+ # CONFIG_POWER_SUPPLY_DEBUG is not set
+ # CONFIG_PDA_POWER is not set
+ # CONFIG_BATTERY_DS2760 is not set
# CONFIG_HWMON is not set
+ CONFIG_THERMAL=y
+ CONFIG_WATCHDOG=y
+ # CONFIG_WATCHDOG_NOWAYOUT is not set
+
+ #
+ # Watchdog Device Drivers
+ #
+ # CONFIG_SOFT_WATCHDOG is not set
+ # CONFIG_ACQUIRE_WDT is not set
+ # CONFIG_ADVANTECH_WDT is not set
+ # CONFIG_ALIM1535_WDT is not set
+ # CONFIG_ALIM7101_WDT is not set
+ # CONFIG_SC520_WDT is not set
+ # CONFIG_EUROTECH_WDT is not set
+ # CONFIG_IB700_WDT is not set
+ # CONFIG_IBMASR is not set
+ # CONFIG_WAFER_WDT is not set
+ # CONFIG_I6300ESB_WDT is not set
+ # CONFIG_ITCO_WDT is not set
+ # CONFIG_IT8712F_WDT is not set
+ # CONFIG_HP_WATCHDOG is not set
+ # CONFIG_SC1200_WDT is not set
+ # CONFIG_PC87413_WDT is not set
+ # CONFIG_60XX_WDT is not set
+ # CONFIG_SBC8360_WDT is not set
+ # CONFIG_SBC7240_WDT is not set
+ # CONFIG_CPU5_WDT is not set
+ # CONFIG_SMSC37B787_WDT is not set
+ # CONFIG_W83627HF_WDT is not set
+ # CONFIG_W83697HF_WDT is not set
+ # CONFIG_W83877F_WDT is not set
+ # CONFIG_W83977F_WDT is not set
+ # CONFIG_MACHZ_WDT is not set
+ # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+ #
+ # PCI-based Watchdog Cards
+ #
+ # CONFIG_PCIPCWATCHDOG is not set
+ # CONFIG_WDTPCI is not set
+
+ #
+ # USB-based Watchdog Cards
+ #
+ # CONFIG_USBPCWATCHDOG is not set
+
+ #
+ # Sonics Silicon Backplane
+ #
+ CONFIG_SSB_POSSIBLE=y
+ # CONFIG_SSB is not set
#
# Multifunction device drivers
#
+ + # CONFIG_MFD_CORE is not set
# CONFIG_MFD_SM501 is not set
+ # CONFIG_HTC_PASIC3 is not set
+ + # CONFIG_MFD_TMIO is not set
#
# Multimedia devices
#
+
+ #
+ # Multimedia core support
+ #
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
+ + # CONFIG_VIDEO_MEDIA is not set
+
+ #
+ # Multimedia drivers
+ #
CONFIG_DAB=y
# CONFIG_USB_DABUSB is not set
#
# Graphics support
#
- # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+ CONFIG_AGP=y
+ # CONFIG_AGP_ALI is not set
+ # CONFIG_AGP_ATI is not set
+ # CONFIG_AGP_AMD is not set
+ CONFIG_AGP_AMD64=y
+ CONFIG_AGP_INTEL=y
+ # CONFIG_AGP_NVIDIA is not set
+ # CONFIG_AGP_SIS is not set
+ # CONFIG_AGP_SWORKS is not set
+ # CONFIG_AGP_VIA is not set
+ # CONFIG_AGP_EFFICEON is not set
+ CONFIG_DRM=y
+ # CONFIG_DRM_TDFX is not set
+ # CONFIG_DRM_R128 is not set
+ # CONFIG_DRM_RADEON is not set
+ # CONFIG_DRM_I810 is not set
+ # CONFIG_DRM_I830 is not set
+ CONFIG_DRM_I915=y
+ # CONFIG_DRM_MGA is not set
+ # CONFIG_DRM_SIS is not set
+ # CONFIG_DRM_VIA is not set
+ # CONFIG_DRM_SAVAGE is not set
+ # CONFIG_VGASTATE is not set
+ # CONFIG_VIDEO_OUTPUT_CONTROL is not set
+ CONFIG_FB=y
+ # CONFIG_FIRMWARE_EDID is not set
+ # CONFIG_FB_DDC is not set
+ CONFIG_FB_CFB_FILLRECT=y
+ CONFIG_FB_CFB_COPYAREA=y
+ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+ # CONFIG_FB_SYS_FILLRECT is not set
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_FOREIGN_ENDIAN is not set
+ # CONFIG_FB_SYS_FOPS is not set
- CONFIG_FB_DEFERRED_IO=y
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
+ CONFIG_FB_MODE_HELPERS=y
+ CONFIG_FB_TILEBLITTING=y
+
+ #
+ # Frame buffer hardware drivers
+ #
+ # CONFIG_FB_CIRRUS is not set
+ # CONFIG_FB_PM2 is not set
+ # CONFIG_FB_CYBER2000 is not set
+ # CONFIG_FB_ARC is not set
+ # CONFIG_FB_ASILIANT is not set
+ # CONFIG_FB_IMSTT is not set
+ # CONFIG_FB_VGA16 is not set
+ # CONFIG_FB_UVESA is not set
+ # CONFIG_FB_VESA is not set
+ CONFIG_FB_EFI=y
+ # CONFIG_FB_IMAC is not set
+ # CONFIG_FB_N411 is not set
+ # CONFIG_FB_HGA is not set
+ # CONFIG_FB_S1D13XXX is not set
+ # CONFIG_FB_NVIDIA is not set
+ # CONFIG_FB_RIVA is not set
+ # CONFIG_FB_I810 is not set
+ # CONFIG_FB_LE80578 is not set
+ # CONFIG_FB_INTEL is not set
+ # CONFIG_FB_MATROX is not set
+ # CONFIG_FB_RADEON is not set
+ # CONFIG_FB_ATY128 is not set
+ # CONFIG_FB_ATY is not set
+ # CONFIG_FB_S3 is not set
+ # CONFIG_FB_SAVAGE is not set
+ # CONFIG_FB_SIS is not set
+ # CONFIG_FB_NEOMAGIC is not set
+ # CONFIG_FB_KYRO is not set
+ # CONFIG_FB_3DFX is not set
+ # CONFIG_FB_VOODOO1 is not set
+ # CONFIG_FB_VT8623 is not set
+ # CONFIG_FB_CYBLA is not set
+ # CONFIG_FB_TRIDENT is not set
+ # CONFIG_FB_ARK is not set
+ # CONFIG_FB_PM3 is not set
+ + # CONFIG_FB_CARMINE is not set
+ # CONFIG_FB_GEODE is not set
+ # CONFIG_FB_VIRTUAL is not set
+ CONFIG_BACKLIGHT_LCD_SUPPORT=y
+ # CONFIG_LCD_CLASS_DEVICE is not set
+ CONFIG_BACKLIGHT_CLASS_DEVICE=y
+ # CONFIG_BACKLIGHT_CORGI is not set
+ # CONFIG_BACKLIGHT_PROGEAR is not set
+ + # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
#
# Display device support
@@@@@@@@@@@@ -1534,127 -1534,127 -1531,127 -1531,127 -1031,31 -1534,127 -1481,163 -1534,127 -1534,127 -1534,127 -1531,126 +1534,126 @@@@@@@@@@@@
#
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
- CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128
- CONFIG_VIDEO_SELECT=y
+ CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
---- ----- CONFIG_VIDEO_SELECT=y
CONFIG_DUMMY_CONSOLE=y
-
- #
- # Sound
- #
+ # CONFIG_FRAMEBUFFER_CONSOLE is not set
+ CONFIG_LOGO=y
+ # CONFIG_LOGO_LINUX_MONO is not set
+ # CONFIG_LOGO_LINUX_VGA16 is not set
+ CONFIG_LOGO_LINUX_CLUT224=y
-
- #
- # Sound
- #
CONFIG_SOUND=y
- -
- - #
- - # Advanced Linux Sound Architecture
- #
- # CONFIG_SND is not set
-
- #
- # Open Sound System
- - #
- CONFIG_SOUND_PRIME=y
- # CONFIG_SOUND_TRIDENT is not set
- # CONFIG_SOUND_MSNDCLAS is not set
- # CONFIG_SOUND_MSNDPIN is not set
- # CONFIG_SOUND_OSS is not set
+ CONFIG_SND=y
+ CONFIG_SND_TIMER=y
+ CONFIG_SND_PCM=y
+ CONFIG_SND_HWDEP=y
+ CONFIG_SND_SEQUENCER=y
+ CONFIG_SND_SEQ_DUMMY=y
+ CONFIG_SND_OSSEMUL=y
+ CONFIG_SND_MIXER_OSS=y
+ CONFIG_SND_PCM_OSS=y
+ CONFIG_SND_PCM_OSS_PLUGINS=y
+ CONFIG_SND_SEQUENCER_OSS=y
+ CONFIG_SND_DYNAMIC_MINORS=y
+ CONFIG_SND_SUPPORT_OLD_API=y
+ CONFIG_SND_VERBOSE_PROCFS=y
+ # CONFIG_SND_VERBOSE_PRINTK is not set
+ # CONFIG_SND_DEBUG is not set
+ CONFIG_SND_VMASTER=y
-
- #
- # Generic devices
- #
+ + CONFIG_SND_DRIVERS=y
+ # CONFIG_SND_PCSP is not set
+ # CONFIG_SND_DUMMY is not set
+ # CONFIG_SND_VIRMIDI is not set
+ # CONFIG_SND_MTPAV is not set
+ # CONFIG_SND_SERIAL_U16550 is not set
+ # CONFIG_SND_MPU401 is not set
-
- #
- # PCI devices
- #
+ + CONFIG_SND_PCI=y
+ # CONFIG_SND_AD1889 is not set
+ # CONFIG_SND_ALS300 is not set
+ # CONFIG_SND_ALS4000 is not set
+ # CONFIG_SND_ALI5451 is not set
+ # CONFIG_SND_ATIIXP is not set
+ # CONFIG_SND_ATIIXP_MODEM is not set
+ # CONFIG_SND_AU8810 is not set
+ # CONFIG_SND_AU8820 is not set
+ # CONFIG_SND_AU8830 is not set
+ # CONFIG_SND_AW2 is not set
+ # CONFIG_SND_AZT3328 is not set
+ # CONFIG_SND_BT87X is not set
+ # CONFIG_SND_CA0106 is not set
+ # CONFIG_SND_CMIPCI is not set
+ # CONFIG_SND_OXYGEN is not set
+ # CONFIG_SND_CS4281 is not set
+ # CONFIG_SND_CS46XX is not set
+ # CONFIG_SND_CS5530 is not set
+ # CONFIG_SND_CS5535AUDIO is not set
+ # CONFIG_SND_DARLA20 is not set
+ # CONFIG_SND_GINA20 is not set
+ # CONFIG_SND_LAYLA20 is not set
+ # CONFIG_SND_DARLA24 is not set
+ # CONFIG_SND_GINA24 is not set
+ # CONFIG_SND_LAYLA24 is not set
+ # CONFIG_SND_MONA is not set
+ # CONFIG_SND_MIA is not set
+ # CONFIG_SND_ECHO3G is not set
+ # CONFIG_SND_INDIGO is not set
+ # CONFIG_SND_INDIGOIO is not set
+ # CONFIG_SND_INDIGODJ is not set
+ # CONFIG_SND_EMU10K1 is not set
+ # CONFIG_SND_EMU10K1X is not set
+ # CONFIG_SND_ENS1370 is not set
+ # CONFIG_SND_ENS1371 is not set
+ # CONFIG_SND_ES1938 is not set
+ # CONFIG_SND_ES1968 is not set
+ # CONFIG_SND_FM801 is not set
+ CONFIG_SND_HDA_INTEL=y
+ CONFIG_SND_HDA_HWDEP=y
+ CONFIG_SND_HDA_CODEC_REALTEK=y
+ CONFIG_SND_HDA_CODEC_ANALOG=y
+ CONFIG_SND_HDA_CODEC_SIGMATEL=y
+ CONFIG_SND_HDA_CODEC_VIA=y
+ CONFIG_SND_HDA_CODEC_ATIHDMI=y
+ CONFIG_SND_HDA_CODEC_CONEXANT=y
+ CONFIG_SND_HDA_CODEC_CMEDIA=y
+ CONFIG_SND_HDA_CODEC_SI3054=y
+ CONFIG_SND_HDA_GENERIC=y
+ # CONFIG_SND_HDA_POWER_SAVE is not set
+ # CONFIG_SND_HDSP is not set
+ # CONFIG_SND_HDSPM is not set
+ # CONFIG_SND_HIFIER is not set
+ # CONFIG_SND_ICE1712 is not set
+ # CONFIG_SND_ICE1724 is not set
+ # CONFIG_SND_INTEL8X0 is not set
+ # CONFIG_SND_INTEL8X0M is not set
+ # CONFIG_SND_KORG1212 is not set
+ # CONFIG_SND_MAESTRO3 is not set
+ # CONFIG_SND_MIXART is not set
+ # CONFIG_SND_NM256 is not set
+ # CONFIG_SND_PCXHR is not set
+ # CONFIG_SND_RIPTIDE is not set
+ # CONFIG_SND_RME32 is not set
+ # CONFIG_SND_RME96 is not set
+ # CONFIG_SND_RME9652 is not set
+ # CONFIG_SND_SIS7019 is not set
+ # CONFIG_SND_SONICVIBES is not set
+ # CONFIG_SND_TRIDENT is not set
+ # CONFIG_SND_VIA82XX is not set
+ # CONFIG_SND_VIA82XX_MODEM is not set
+ # CONFIG_SND_VIRTUOSO is not set
+ # CONFIG_SND_VX222 is not set
+ # CONFIG_SND_YMFPCI is not set
-
- #
- # USB devices
- #
+ + CONFIG_SND_USB=y
+ # CONFIG_SND_USB_AUDIO is not set
+ # CONFIG_SND_USB_USX2Y is not set
+ # CONFIG_SND_USB_CAIAQ is not set
-
- #
- # PCMCIA devices
- #
+ + CONFIG_SND_PCMCIA=y
+ # CONFIG_SND_VXPOCKET is not set
+ # CONFIG_SND_PDAUDIOCF is not set
-
- #
- # System on Chip audio support
- #
+ # CONFIG_SND_SOC is not set
-
- #
- # ALSA SoC audio for Freescale SOCs
- #
-
- #
- # SoC Audio for the Texas Instruments OMAP
- #
-
- #
- # Open Sound System
- #
+ # CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
- # CONFIG_HID_DEBUG is not set
+ CONFIG_HID_DEBUG=y
+ CONFIG_HIDRAW=y
#
# USB Input Devices
@@@@@@@@@@@@ -1683,9 -1683,9 -1680,9 -1680,9 -1077,9 -1683,9 -1666,8 -1683,9 -1683,9 -1683,9 -1679,9 +1682,9 @@@@@@@@@@@@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
- # CONFIG_USB_SUSPEND is not set
- # CONFIG_USB_PERSIST is not set
+ CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
+ + CONFIG_USB_MON=y
#
# USB Host Controller Drivers
@@@@@@@@@@@@ -1729,11 -1729,11 -1726,11 -1726,11 -1121,8 -1729,11 -1710,10 -1729,11 -1729,11 -1729,11 -1725,11 +1728,11 @@@@@@@@@@@@ CONFIG_USB_STORAGE=
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
+ # CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
- # CONFIG_USB_LIBUSUAL is not set
+ + # CONFIG_USB_STORAGE_SIERRA is not set
+ # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+ CONFIG_USB_LIBUSUAL=y
#
# USB Imaging devices
@@@@@@@@@@@@ -1768,104 -1768,104 -1765,104 -1765,104 -1163,56 -1768,104 -1750,98 -1768,104 -1768,104 -1768,104 -1764,104 +1767,104 @@@@@@@@@@@@
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
+ + # CONFIG_USB_ISIGHTFW is not set
+ # CONFIG_USB_GADGET is not set
+ # CONFIG_MMC is not set
+ # CONFIG_MEMSTICK is not set
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
#
- # USB DSL modem support
+ # LED drivers
#
+ + # CONFIG_LEDS_PCA9532 is not set
+ # CONFIG_LEDS_CLEVO_MAIL is not set
+ + # CONFIG_LEDS_PCA955X is not set
#
- # USB Gadget Support
+ # LED Triggers
#
- # CONFIG_USB_GADGET is not set
- # CONFIG_MMC is not set
+ CONFIG_LEDS_TRIGGERS=y
+ # CONFIG_LEDS_TRIGGER_TIMER is not set
+ # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+ # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+ # CONFIG_ACCESSIBILITY is not set
+ # CONFIG_INFINIBAND is not set
+ CONFIG_EDAC=y
#
- # LED devices
+ # Reporting subsystems
#
- # CONFIG_NEW_LEDS is not set
+ # CONFIG_EDAC_DEBUG is not set
+ # CONFIG_EDAC_MM_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+ # CONFIG_RTC_HCTOSYS is not set
+ # CONFIG_RTC_DEBUG is not set
#
- # LED drivers
+ # RTC interfaces
#
+ CONFIG_RTC_INTF_SYSFS=y
+ CONFIG_RTC_INTF_PROC=y
+ CONFIG_RTC_INTF_DEV=y
+ # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+ # CONFIG_RTC_DRV_TEST is not set
#
- # LED Triggers
+ # I2C RTC drivers
#
- # CONFIG_INFINIBAND is not set
- # CONFIG_EDAC is not set
+ # CONFIG_RTC_DRV_DS1307 is not set
+ # CONFIG_RTC_DRV_DS1374 is not set
+ # CONFIG_RTC_DRV_DS1672 is not set
+ # CONFIG_RTC_DRV_MAX6900 is not set
+ # CONFIG_RTC_DRV_RS5C372 is not set
+ # CONFIG_RTC_DRV_ISL1208 is not set
+ # CONFIG_RTC_DRV_X1205 is not set
+ # CONFIG_RTC_DRV_PCF8563 is not set
+ # CONFIG_RTC_DRV_PCF8583 is not set
+ # CONFIG_RTC_DRV_M41T80 is not set
+ # CONFIG_RTC_DRV_S35390A is not set
+ + # CONFIG_RTC_DRV_FM3130 is not set
#
- # Real Time Clock
+ # SPI RTC drivers
#
- # CONFIG_RTC_CLASS is not set
#
- # DMA Engine support
+ # Platform RTC drivers
#
- # CONFIG_DMA_ENGINE is not set
+ CONFIG_RTC_DRV_CMOS=y
+ # CONFIG_RTC_DRV_DS1511 is not set
+ # CONFIG_RTC_DRV_DS1553 is not set
+ # CONFIG_RTC_DRV_DS1742 is not set
+ # CONFIG_RTC_DRV_STK17TA8 is not set
+ # CONFIG_RTC_DRV_M48T86 is not set
+ # CONFIG_RTC_DRV_M48T59 is not set
+ # CONFIG_RTC_DRV_V3020 is not set
#
- # DMA Clients
+ # on-CPU RTC drivers
#
+ CONFIG_DMADEVICES=y
#
# DMA Devices
#
- CONFIG_VIRTUALIZATION=y
- # CONFIG_KVM is not set
+ # CONFIG_INTEL_IOATDMA is not set
+ # CONFIG_UIO is not set
#
- # Userspace I/O
+ # Firmware Drivers
#
- # CONFIG_UIO is not set
+ # CONFIG_EDD is not set
+ + CONFIG_FIRMWARE_MEMMAP=y
+ CONFIG_EFI_VARS=y
+ # CONFIG_DELL_RBU is not set
+ # CONFIG_DCDBAS is not set
+ CONFIG_DMIID=y
- # CONFIG_ISCSI_IBFT_FIND is not set
+ + CONFIG_ISCSI_IBFT_FIND=y
+ + CONFIG_ISCSI_IBFT=y
#
# File systems
@@@@@@@@@@@@ -1943,28 -1943,28 -1940,28 -1940,28 -1296,33 -1943,28 -1919,15 -1943,28 -1943,28 -1943,28 -1939,28 +1942,28 @@@@@@@@@@@@ CONFIG_HUGETLB_PAGE=
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
+ # CONFIG_MINIX_FS is not set
+ + # CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
+ # CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-
- #
- # Network File Systems
- #
+ CONFIG_NETWORK_FILESYSTEMS=y
- # CONFIG_NFS_FS is not set
+ CONFIG_NFS_FS=y
+ CONFIG_NFS_V3=y
- # CONFIG_NFS_V3_ACL is not set
- # CONFIG_NFS_V4 is not set
- # CONFIG_NFS_DIRECTIO is not set
- CONFIG_NFSD=y
- CONFIG_NFSD_V3=y
- # CONFIG_NFSD_V3_ACL is not set
- # CONFIG_NFSD_V4 is not set
- CONFIG_NFSD_TCP=y
+ + CONFIG_NFS_V3_ACL=y
+ + CONFIG_NFS_V4=y
+ CONFIG_ROOT_NFS=y
+ # CONFIG_NFSD is not set
+ CONFIG_LOCKD=y
+ CONFIG_LOCKD_V4=y
- CONFIG_EXPORTFS=y
+ + CONFIG_NFS_ACL_SUPPORT=y
+ CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
- # CONFIG_SUNRPC_BIND34 is not set
- # CONFIG_RPCSEC_GSS_KRB5 is not set
+ + CONFIG_SUNRPC_GSS=y
+ + CONFIG_RPCSEC_GSS_KRB5=y
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@@@@@@@@@@@ -2038,13 -2038,13 -2035,13 -2035,13 -1392,11 -2038,13 -2001,13 -2038,13 -2038,13 -2038,13 -2034,13 +2037,13 @@@@@@@@@@@@ CONFIG_NLS_UTF8=
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
- - # CONFIG_PRINTK_TIME is not set
- # CONFIG_ENABLE_WARN_DEPRECATED is not set
- - # CONFIG_ENABLE_MUST_CHECK is not set
+ + CONFIG_PRINTK_TIME=y
+ + CONFIG_ENABLE_WARN_DEPRECATED=y
+ + CONFIG_ENABLE_MUST_CHECK=y
+ CONFIG_FRAME_WARN=2048
CONFIG_MAGIC_SYSRQ=y
- CONFIG_UNUSED_SYMBOLS=y
- # CONFIG_DEBUG_FS is not set
+ # CONFIG_UNUSED_SYMBOLS is not set
+ CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
@@@@@@@@@@@@ -2069,182 -2069,182 -2066,182 -2066,182 -1419,34 -2069,182 -2032,167 -2069,182 -2069,182 -2069,182 -2065,182 +2068,182 @@@@@@@@@@@@ CONFIG_TIMER_STATS=
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
+ # CONFIG_DEBUG_WRITECOUNT is not set
+ + CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_LIST is not set
- # CONFIG_FRAME_POINTER is not set
- CONFIG_OPTIMIZE_INLINING=y
+ # CONFIG_DEBUG_SG is not set
+ CONFIG_FRAME_POINTER=y
+ # CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
+ # CONFIG_KPROBES_SANITY_TEST is not set
+ # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_LKDTM is not set
# CONFIG_FAULT_INJECTION is not set
+ # CONFIG_LATENCYTOP is not set
+ + CONFIG_SYSCTL_SYSCALL_CHECK=y
+ + CONFIG_HAVE_FTRACE=y
+ + CONFIG_HAVE_DYNAMIC_FTRACE=y
+ + # CONFIG_FTRACE is not set
+ + # CONFIG_IRQSOFF_TRACER is not set
+ + # CONFIG_SYSPROF_TRACER is not set
+ + # CONFIG_SCHED_TRACER is not set
+ + # CONFIG_CONTEXT_SWITCH_TRACER is not set
+ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+ # CONFIG_SAMPLES is not set
- # CONFIG_KGDB is not set
+ CONFIG_HAVE_ARCH_KGDB=y
+ + # CONFIG_KGDB is not set
+ # CONFIG_STRICT_DEVMEM is not set
+ + CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
CONFIG_DEBUG_STACKOVERFLOW=y
- # CONFIG_DEBUG_STACK_USAGE is not set
- # CONFIG_DEBUG_RODATA is not set
+ CONFIG_DEBUG_STACK_USAGE=y
+ # CONFIG_DEBUG_PAGEALLOC is not set
+ + # CONFIG_DEBUG_PER_CPU_MAPS is not set
+ # CONFIG_X86_PTDUMP is not set
+ CONFIG_DEBUG_RODATA=y
+ # CONFIG_DEBUG_RODATA_TEST is not set
+ CONFIG_DEBUG_NX_TEST=m
# CONFIG_4KSTACKS is not set
- - CONFIG_X86_FIND_SMP_CONFIG=y
- - CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y
+ + # CONFIG_MMIOTRACE is not set
+ CONFIG_IO_DELAY_TYPE_0X80=0
+ CONFIG_IO_DELAY_TYPE_0XED=1
+ CONFIG_IO_DELAY_TYPE_UDELAY=2
+ CONFIG_IO_DELAY_TYPE_NONE=3
+ CONFIG_IO_DELAY_0X80=y
+ # CONFIG_IO_DELAY_0XED is not set
+ # CONFIG_IO_DELAY_UDELAY is not set
+ # CONFIG_IO_DELAY_NONE is not set
+ CONFIG_DEFAULT_IO_DELAY_TYPE=0
+ CONFIG_DEBUG_BOOT_PARAMS=y
+ # CONFIG_CPA_DEBUG is not set
-- -# CONFIG_OPTIMIZE_INLINING is not set
+++ + +CONFIG_OPTIMIZE_INLINING=y
#
# Security options
#
- # CONFIG_KEYS is not set
- # CONFIG_SECURITY is not set
- # CONFIG_CRYPTO is not set
+ CONFIG_KEYS=y
+ CONFIG_KEYS_DEBUG_PROC_KEYS=y
+ CONFIG_SECURITY=y
+ CONFIG_SECURITY_NETWORK=y
+ # CONFIG_SECURITY_NETWORK_XFRM is not set
- CONFIG_SECURITY_CAPABILITIES=y
+ CONFIG_SECURITY_FILE_CAPABILITIES=y
+ # CONFIG_SECURITY_ROOTPLUG is not set
+ CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
+ CONFIG_SECURITY_SELINUX=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+ CONFIG_SECURITY_SELINUX_DISABLE=y
+ CONFIG_SECURITY_SELINUX_DEVELOP=y
+ CONFIG_SECURITY_SELINUX_AVC_STATS=y
+ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+ # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+ # CONFIG_SECURITY_SMACK is not set
+ CONFIG_CRYPTO=y
+
+ #
+ # Crypto core or helper
+ #
+ CONFIG_CRYPTO_ALGAPI=y
+ CONFIG_CRYPTO_AEAD=y
+ CONFIG_CRYPTO_BLKCIPHER=y
+ CONFIG_CRYPTO_HASH=y
+ CONFIG_CRYPTO_MANAGER=y
+ # CONFIG_CRYPTO_GF128MUL is not set
+ # CONFIG_CRYPTO_NULL is not set
+ # CONFIG_CRYPTO_CRYPTD is not set
+ CONFIG_CRYPTO_AUTHENC=y
+ # CONFIG_CRYPTO_TEST is not set
+
+ #
+ # Authenticated Encryption with Associated Data
+ #
+ # CONFIG_CRYPTO_CCM is not set
+ # CONFIG_CRYPTO_GCM is not set
+ # CONFIG_CRYPTO_SEQIV is not set
+
+ #
+ # Block modes
+ #
+ CONFIG_CRYPTO_CBC=y
+ # CONFIG_CRYPTO_CTR is not set
+ # CONFIG_CRYPTO_CTS is not set
+ CONFIG_CRYPTO_ECB=y
+ # CONFIG_CRYPTO_LRW is not set
+ # CONFIG_CRYPTO_PCBC is not set
+ # CONFIG_CRYPTO_XTS is not set
+
+ #
+ # Hash modes
+ #
+ CONFIG_CRYPTO_HMAC=y
+ # CONFIG_CRYPTO_XCBC is not set
+
+ #
+ # Digest
+ #
+ # CONFIG_CRYPTO_CRC32C is not set
+ # CONFIG_CRYPTO_MD4 is not set
+ CONFIG_CRYPTO_MD5=y
+ # CONFIG_CRYPTO_MICHAEL_MIC is not set
+ + # CONFIG_CRYPTO_RMD128 is not set
+ + # CONFIG_CRYPTO_RMD160 is not set
+ + # CONFIG_CRYPTO_RMD256 is not set
+ + # CONFIG_CRYPTO_RMD320 is not set
+ CONFIG_CRYPTO_SHA1=y
+ # CONFIG_CRYPTO_SHA256 is not set
+ # CONFIG_CRYPTO_SHA512 is not set
+ # CONFIG_CRYPTO_TGR192 is not set
+ # CONFIG_CRYPTO_WP512 is not set
+
+ #
+ # Ciphers
+ #
+ CONFIG_CRYPTO_AES=y
- # CONFIG_CRYPTO_AES_586 is not set
+ + CONFIG_CRYPTO_AES_586=y
+ # CONFIG_CRYPTO_ANUBIS is not set
+ CONFIG_CRYPTO_ARC4=y
+ # CONFIG_CRYPTO_BLOWFISH is not set
+ # CONFIG_CRYPTO_CAMELLIA is not set
+ # CONFIG_CRYPTO_CAST5 is not set
+ # CONFIG_CRYPTO_CAST6 is not set
+ CONFIG_CRYPTO_DES=y
+ # CONFIG_CRYPTO_FCRYPT is not set
+ # CONFIG_CRYPTO_KHAZAD is not set
+ # CONFIG_CRYPTO_SALSA20 is not set
+ # CONFIG_CRYPTO_SALSA20_586 is not set
+ # CONFIG_CRYPTO_SEED is not set
+ # CONFIG_CRYPTO_SERPENT is not set
+ # CONFIG_CRYPTO_TEA is not set
+ # CONFIG_CRYPTO_TWOFISH is not set
+ # CONFIG_CRYPTO_TWOFISH_586 is not set
+
+ #
+ # Compression
+ #
+ # CONFIG_CRYPTO_DEFLATE is not set
+ # CONFIG_CRYPTO_LZO is not set
+ CONFIG_CRYPTO_HW=y
+ # CONFIG_CRYPTO_DEV_PADLOCK is not set
+ # CONFIG_CRYPTO_DEV_GEODE is not set
+ # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+ CONFIG_HAVE_KVM=y
+ CONFIG_VIRTUALIZATION=y
+ # CONFIG_KVM is not set
+ # CONFIG_LGUEST is not set
+ # CONFIG_VIRTIO_PCI is not set
+ # CONFIG_VIRTIO_BALLOON is not set
#
# Library routines
#
CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_FIRST_BIT=y
+ CONFIG_GENERIC_FIND_NEXT_BIT=y
# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
+ + CONFIG_CRC_T10DIF=y
# CONFIG_CRC_ITU_T is not set
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
diff --cc arch/x86/configs/x86_64_defconfig
index e620ea6e2a7a,e620ea6e2a7a,678c8acefe04,678c8acefe04,2d6f5b2809d2,e620ea6e2a7a,a40452429625,e620ea6e2a7a,e620ea6e2a7a,e620ea6e2a7a,ab91941e5496..2c4b1c771e28
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@@@@@@@@@@@ -1,62 -1,62 -1,62 -1,62 -1,40 -1,62 -1,61 -1,62 -1,62 -1,62 -1,62 +1,62 @@@@@@@@@@@@
#
# Automatically generated make config: don't edit
-- -# Linux kernel version: 2.6.27-rc4
-- -# Mon Aug 25 14:40:46 2008
- # Linux kernel version: 2.6.22-git14
- # Fri Jul 20 09:53:15 2007
- # Linux kernel version: 2.6.26-rc1
- # Sun May 4 19:59:57 2008
+++ + +# Linux kernel version: 2.6.27-rc5
+++ + +# Wed Sep 3 17:13:39 2008
#
- CONFIG_X86_64=y
CONFIG_64BIT=y
+ # CONFIG_X86_32 is not set
+ CONFIG_X86_64=y
CONFIG_X86=y
- CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig"
+ + CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+ # CONFIG_GENERIC_LOCKBREAK is not set
CONFIG_GENERIC_TIME=y
- CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CMOS_UPDATE=y
- CONFIG_ZONE_DMA32=y
+ CONFIG_CLOCKSOURCE_WATCHDOG=y
+ CONFIG_GENERIC_CLOCKEVENTS=y
+ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
- CONFIG_SEMAPHORE_SLEEPERS=y
+ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+ CONFIG_FAST_CMPXCHG_LOCAL=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
- CONFIG_QUICKLIST=y
- CONFIG_NR_QUICK=2
- CONFIG_RWSEM_GENERIC_SPINLOCK=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
- CONFIG_X86_CMPXCHG=y
- CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
- CONFIG_ARCH_MAY_HAVE_PC_FDC=y
- CONFIG_ARCH_POPULATES_NODE_MAP=y
- CONFIG_DMI=y
- CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
+ CONFIG_GENERIC_HWEIGHT=y
+ # CONFIG_GENERIC_GPIO is not set
+ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+ # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+ CONFIG_GENERIC_CALIBRATE_DELAY=y
+ CONFIG_GENERIC_TIME_VSYSCALL=y
+ CONFIG_ARCH_HAS_CPU_RELAX=y
+ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+ CONFIG_ARCH_SUSPEND_POSSIBLE=y
+ CONFIG_ZONE_DMA32=y
+ CONFIG_ARCH_POPULATES_NODE_MAP=y
+ CONFIG_AUDIT_ARCH=y
+ CONFIG_ARCH_SUPPORTS_AOUT=y
+ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+ CONFIG_GENERIC_HARDIRQS=y
+ CONFIG_GENERIC_IRQ_PROBE=y
+ CONFIG_GENERIC_PENDING_IRQ=y
+ CONFIG_X86_SMP=y
+ CONFIG_X86_64_SMP=y
+ CONFIG_X86_HT=y
+ CONFIG_X86_BIOS_REBOOT=y
+ CONFIG_X86_TRAMPOLINE=y
+ # CONFIG_KTIME_SCALAR is not set
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
- # Code maturity level options
+ # General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
@@@@@@@@@@@@ -67,39 -67,39 -67,39 -67,39 -49,16 -67,39 -66,38 -67,39 -67,39 -67,39 -67,39 +67,39 @@@@@@@@@@@@ CONFIG_SWAP=
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
- # CONFIG_BSD_PROCESS_ACCT is not set
- # CONFIG_TASKSTATS is not set
- # CONFIG_USER_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
- CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=18
- # CONFIG_CPUSETS is not set
- CONFIG_SYSFS_DEPRECATED=y
+ CONFIG_BSD_PROCESS_ACCT=y
+ # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+ CONFIG_TASKSTATS=y
+ CONFIG_TASK_DELAY_ACCT=y
+ CONFIG_TASK_XACCT=y
+ CONFIG_TASK_IO_ACCOUNTING=y
+ CONFIG_AUDIT=y
+ CONFIG_AUDITSYSCALL=y
+ CONFIG_AUDIT_TREE=y
+ # CONFIG_IKCONFIG is not set
+ CONFIG_LOG_BUF_SHIFT=17
+ CONFIG_CGROUPS=y
+ # CONFIG_CGROUP_DEBUG is not set
+ CONFIG_CGROUP_NS=y
+ # CONFIG_CGROUP_DEVICE is not set
+ CONFIG_CPUSETS=y
+ + CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+ CONFIG_GROUP_SCHED=y
+ CONFIG_FAIR_GROUP_SCHED=y
+ # CONFIG_RT_GROUP_SCHED is not set
+ # CONFIG_USER_SCHED is not set
+ CONFIG_CGROUP_SCHED=y
+ CONFIG_CGROUP_CPUACCT=y
+ CONFIG_RESOURCE_COUNTERS=y
+ # CONFIG_CGROUP_MEM_RES_CTLR is not set
+ # CONFIG_SYSFS_DEPRECATED_V2 is not set
+ CONFIG_PROC_PID_CPUSET=y
CONFIG_RELAY=y
+ CONFIG_NAMESPACES=y
+ CONFIG_UTS_NS=y
+ CONFIG_IPC_NS=y
+ CONFIG_USER_NS=y
+ CONFIG_PID_NS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@@@@@@@@@@@ -107,15 -107,15 -107,15 -107,15 -66,13 -107,15 -105,15 -107,15 -107,15 -107,15 -107,15 +107,15 @@@@@@@@@@@@ CONFIG_SYSCTL=
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
- CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
+ CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
+ + CONFIG_PCSPKR_PLATFORM=y
+ # CONFIG_COMPAT_BRK is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_ANON_INODES=y
@@@@@@@@@@@@ -125,27 -125,27 -125,27 -125,27 -82,9 -125,27 -123,21 -125,27 -125,27 -125,27 -125,27 +125,27 @@@@@@@@@@@@ CONFIG_TIMERFD=
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
- CONFIG_SLAB=y
- # CONFIG_SLUB is not set
+ CONFIG_SLUB_DEBUG=y
+ # CONFIG_SLAB is not set
+ CONFIG_SLUB=y
# CONFIG_SLOB is not set
+ CONFIG_PROFILING=y
+ CONFIG_MARKERS=y
+ # CONFIG_OPROFILE is not set
+ CONFIG_HAVE_OPROFILE=y
+ CONFIG_KPROBES=y
+ + CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+ CONFIG_KRETPROBES=y
+ + CONFIG_HAVE_IOREMAP_PROT=y
+ CONFIG_HAVE_KPROBES=y
+ CONFIG_HAVE_KRETPROBES=y
+ + # CONFIG_HAVE_ARCH_TRACEHOOK is not set
+ # CONFIG_HAVE_DMA_ATTRS is not set
+ + CONFIG_USE_GENERIC_SMP_HELPERS=y
+ + # CONFIG_HAVE_CLK is not set
+ CONFIG_PROC_PAGE_MONITOR=y
+ + # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+ CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
@@@@@@@@@@@@ -155,13 -155,13 -155,13 -155,13 -93,11 -155,13 -146,12 -155,13 -155,13 -155,13 -155,13 +155,13 @@@@@@@@@@@@ CONFIG_MODULE_UNLOAD=
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
- - # CONFIG_KMOD is not set
+ + CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
- # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_BLK_DEV_BSG is not set
+ CONFIG_BLK_DEV_IO_TRACE=y
+ CONFIG_BLK_DEV_BSG=y
+ + # CONFIG_BLK_DEV_INTEGRITY is not set
+ CONFIG_BLOCK_COMPAT=y
#
# IO Schedulers
@@@@@@@@@@@@ -180,155 -180,155 -180,158 -180,158 -115,92 -180,155 -170,158 -180,155 -180,155 -180,155 -180,158 +180,155 @@@@@@@@@@@@ CONFIG_CLASSIC_RCU=
#
# Processor type and features
#
+ CONFIG_TICK_ONESHOT=y
+ CONFIG_NO_HZ=y
+ CONFIG_HIGH_RES_TIMERS=y
+ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+ CONFIG_SMP=y
+ + CONFIG_X86_FIND_SMP_CONFIG=y
+ + CONFIG_X86_MPPARSE=y
CONFIG_X86_PC=y
+ # CONFIG_X86_ELAN is not set
+ # CONFIG_X86_VOYAGER is not set
- # CONFIG_X86_NUMAQ is not set
- # CONFIG_X86_SUMMIT is not set
- # CONFIG_X86_BIGSMP is not set
- # CONFIG_X86_VISWS is not set
+ # CONFIG_X86_GENERICARCH is not set
- # CONFIG_X86_ES7000 is not set
- # CONFIG_X86_RDC321X is not set
# CONFIG_X86_VSMP is not set
+ # CONFIG_PARAVIRT_GUEST is not set
- CONFIG_MEMTEST_BOOTPARAM=y
- CONFIG_MEMTEST_BOOTPARAM_VALUE=0
+ + # CONFIG_MEMTEST is not set
+ # CONFIG_M386 is not set
+ # CONFIG_M486 is not set
+ # CONFIG_M586 is not set
+ # CONFIG_M586TSC is not set
+ # CONFIG_M586MMX is not set
+ # CONFIG_M686 is not set
+ # CONFIG_MPENTIUMII is not set
+ # CONFIG_MPENTIUMIII is not set
+ # CONFIG_MPENTIUMM is not set
+ # CONFIG_MPENTIUM4 is not set
+ # CONFIG_MK6 is not set
+ # CONFIG_MK7 is not set
# CONFIG_MK8 is not set
+ # CONFIG_MCRUSOE is not set
+ # CONFIG_MEFFICEON is not set
+ # CONFIG_MWINCHIPC6 is not set
+ # CONFIG_MWINCHIP2 is not set
+ # CONFIG_MWINCHIP3D is not set
+ # CONFIG_MGEODEGX1 is not set
+ # CONFIG_MGEODE_LX is not set
+ # CONFIG_MCYRIXIII is not set
+ # CONFIG_MVIAC3_2 is not set
+ # CONFIG_MVIAC7 is not set
# CONFIG_MPSC is not set
-- - -CONFIG_MCORE2=y
-- - -# CONFIG_GENERIC_CPU is not set
++ + +# CONFIG_MCORE2 is not set
++ + +CONFIG_GENERIC_CPU=y
+ CONFIG_X86_CPU=y
-- - -CONFIG_X86_L1_CACHE_BYTES=64
-- - -CONFIG_X86_INTERNODE_CACHE_BYTES=64
++ + +CONFIG_X86_L1_CACHE_BYTES=128
- CONFIG_X86_L1_CACHE_SHIFT=7
++ + +CONFIG_X86_INTERNODE_CACHE_BYTES=128
+ CONFIG_X86_CMPXCHG=y
-- - -CONFIG_X86_L1_CACHE_SHIFT=6
- CONFIG_X86_GOOD_APIC=y
- CONFIG_X86_INTEL_USERCOPY=y
- CONFIG_X86_USE_PPRO_CHECKSUM=y
- CONFIG_X86_P6_NOP=y
+++ + +CONFIG_X86_L1_CACHE_SHIFT=7
+ + CONFIG_X86_WP_WORKS_OK=y
-- -CONFIG_X86_INTEL_USERCOPY=y
-- -CONFIG_X86_USE_PPRO_CHECKSUM=y
-- -CONFIG_X86_P6_NOP=y
CONFIG_X86_TSC=y
- CONFIG_X86_GOOD_APIC=y
- # CONFIG_MICROCODE is not set
- CONFIG_X86_MSR=y
- CONFIG_X86_CPUID=y
- CONFIG_X86_HT=y
- CONFIG_X86_IO_APIC=y
- CONFIG_X86_LOCAL_APIC=y
- CONFIG_MTRR=y
- CONFIG_SMP=y
+ + CONFIG_X86_CMPXCHG64=y
+ CONFIG_X86_CMOV=y
+ CONFIG_X86_MINIMUM_CPU_FAMILY=64
+ CONFIG_X86_DEBUGCTLMSR=y
+ CONFIG_HPET_TIMER=y
+ CONFIG_HPET_EMULATE_RTC=y
+ CONFIG_DMI=y
+ CONFIG_GART_IOMMU=y
+ CONFIG_CALGARY_IOMMU=y
+ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+ + CONFIG_AMD_IOMMU=y
+ CONFIG_SWIOTLB=y
+ CONFIG_IOMMU_HELPER=y
-- -# CONFIG_MAXSMP is not set
-- - -CONFIG_NR_CPUS=4
-- - -# CONFIG_SCHED_SMT is not set
+++ + +CONFIG_NR_CPUS=64
++ + +CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
- CONFIG_PREEMPT_BKL=y
+ CONFIG_X86_LOCAL_APIC=y
+ CONFIG_X86_IO_APIC=y
+ # CONFIG_X86_MCE is not set
+ # CONFIG_I8K is not set
-- - -# CONFIG_MICROCODE is not set
+++ + +CONFIG_MICROCODE=y
+++ + +CONFIG_MICROCODE_OLD_INTERFACE=y
+ CONFIG_X86_MSR=y
+ CONFIG_X86_CPUID=y
CONFIG_NUMA=y
CONFIG_K8_NUMA=y
- CONFIG_NODES_SHIFT=6
CONFIG_X86_64_ACPI_NUMA=y
- CONFIG_NUMA_EMU=y
+ CONFIG_NODES_SPAN_OTHER_NODES=y
+ # CONFIG_NUMA_EMU is not set
+ CONFIG_NODES_SHIFT=6
+ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+ CONFIG_ARCH_SPARSEMEM_ENABLE=y
+ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+ CONFIG_SELECT_MEMORY_MODEL=y
+ # CONFIG_FLATMEM_MANUAL is not set
+ # CONFIG_DISCONTIGMEM_MANUAL is not set
+ CONFIG_SPARSEMEM_MANUAL=y
+ CONFIG_SPARSEMEM=y
CONFIG_NEED_MULTIPLE_NODES=y
+ CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_SPARSEMEM_STATIC is not set
+ CONFIG_SPARSEMEM_EXTREME=y
+ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+ CONFIG_SPARSEMEM_VMEMMAP=y
+
+ #
+ # Memory hotplug is currently incompatible with Software Suspend
+ #
+ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_MIGRATION=y
CONFIG_RESOURCES_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
- CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
- CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
- CONFIG_NR_CPUS=32
- CONFIG_PHYSICAL_ALIGN=0x200000
- CONFIG_HOTPLUG_CPU=y
- CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
- CONFIG_HPET_TIMER=y
- CONFIG_HPET_EMULATE_RTC=y
- CONFIG_GART_IOMMU=y
- # CONFIG_CALGARY_IOMMU is not set
- CONFIG_SWIOTLB=y
- CONFIG_X86_MCE=y
- CONFIG_X86_MCE_INTEL=y
- CONFIG_X86_MCE_AMD=y
- # CONFIG_KEXEC is not set
- # CONFIG_CRASH_DUMP is not set
- # CONFIG_RELOCATABLE is not set
- CONFIG_PHYSICAL_START=0x200000
+ CONFIG_MTRR=y
- # CONFIG_X86_PAT is not set
+ + # CONFIG_MTRR_SANITIZER is not set
-- -# CONFIG_X86_PAT is not set
+++ + +CONFIG_X86_PAT=y
+ CONFIG_EFI=y
CONFIG_SECCOMP=y
- # CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
- CONFIG_HZ_250=y
+ # CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
- # CONFIG_HZ_1000 is not set
- CONFIG_HZ=250
- CONFIG_K8_NB=y
- CONFIG_GENERIC_HARDIRQS=y
- CONFIG_GENERIC_IRQ_PROBE=y
- CONFIG_ISA_DMA_API=y
- CONFIG_GENERIC_PENDING_IRQ=y
+ CONFIG_HZ_1000=y
+ CONFIG_HZ=1000
+ CONFIG_SCHED_HRTICK=y
+ CONFIG_KEXEC=y
+ CONFIG_CRASH_DUMP=y
+ CONFIG_PHYSICAL_START=0x1000000
+ CONFIG_RELOCATABLE=y
+ CONFIG_PHYSICAL_ALIGN=0x200000
+ CONFIG_HOTPLUG_CPU=y
+ # CONFIG_COMPAT_VDSO is not set
+ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+ CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
#
# Power management options
#
+ CONFIG_ARCH_HIBERNATION_HEADER=y
CONFIG_PM=y
- # CONFIG_PM_LEGACY is not set
- # CONFIG_PM_DEBUG is not set
+ CONFIG_PM_DEBUG=y
+ # CONFIG_PM_VERBOSE is not set
+ CONFIG_CAN_PM_TRACE=y
+ CONFIG_PM_TRACE=y
+ CONFIG_PM_TRACE_RTC=y
+ CONFIG_PM_SLEEP_SMP=y
+ CONFIG_PM_SLEEP=y
+ CONFIG_SUSPEND=y
+ + # CONFIG_PM_TEST_SUSPEND is not set
+ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
-
- #
- # ACPI (Advanced Configuration and Power Interface) Support
- #
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
- CONFIG_ACPI_SLEEP_PROC_FS=y
- CONFIG_ACPI_SLEEP_PROC_SLEEP=y
CONFIG_ACPI_PROCFS=y
+ CONFIG_ACPI_PROCFS_POWER=y
+ CONFIG_ACPI_SYSFS_POWER=y
+ CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
@@@@@@@@@@@@ -438,13 -438,13 -441,13 -441,13 -274,15 -438,13 -430,17 -438,13 -438,13 -438,13 -441,13 +438,13 @@@@@@@@@@@@ CONFIG_HOTPLUG_PCI=
# Executable file formats / Emulations
#
CONFIG_BINFMT_ELF=y
- # CONFIG_BINFMT_MISC is not set
+ CONFIG_COMPAT_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=y
CONFIG_IA32_EMULATION=y
- CONFIG_IA32_AOUT=y
+ # CONFIG_IA32_AOUT is not set
CONFIG_COMPAT=y
+ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
- -
- - #
- - # Networking
- - #
CONFIG_NET=y
#
@@@@@@@@@@@@ -461,24 -461,24 -464,24 -464,24 -294,17 -461,24 -457,21 -461,24 -461,24 -461,24 -464,24 +461,24 @@@@@@@@@@@@ CONFIG_XFRM_USER=
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
- # CONFIG_IP_ADVANCED_ROUTER is not set
+ CONFIG_IP_ADVANCED_ROUTER=y
+ CONFIG_ASK_IP_FIB_HASH=y
+ # CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
+ CONFIG_IP_MULTIPLE_TABLES=y
+ CONFIG_IP_ROUTE_MULTIPATH=y
+ CONFIG_IP_ROUTE_VERBOSE=y
- # CONFIG_IP_PNP is not set
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
- # CONFIG_IP_PNP_BOOTP is not set
- # CONFIG_IP_PNP_RARP is not set
+ + CONFIG_IP_PNP_BOOTP=y
+ + CONFIG_IP_PNP_RARP=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
- # CONFIG_IP_MROUTE is not set
+ CONFIG_IP_MROUTE=y
+ CONFIG_IP_PIMSM_V1=y
+ CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
- # CONFIG_SYN_COOKIES is not set
+ CONFIG_SYN_COOKIES=y
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
@@@@@@@@@@@@ -605,52 -605,52 -608,52 -608,52 -352,11 -605,52 -598,53 -605,52 -605,52 -605,52 -608,52 +605,52 @@@@@@@@@@@@ CONFIG_LLC=
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-
- #
- # QoS and/or fair queueing
- #
- # CONFIG_NET_SCHED is not set
+ CONFIG_NET_SCHED=y
+
+ #
+ # Queueing/Scheduling
+ #
+ # CONFIG_NET_SCH_CBQ is not set
+ # CONFIG_NET_SCH_HTB is not set
+ # CONFIG_NET_SCH_HFSC is not set
+ # CONFIG_NET_SCH_PRIO is not set
- # CONFIG_NET_SCH_RR is not set
+ # CONFIG_NET_SCH_RED is not set
+ # CONFIG_NET_SCH_SFQ is not set
+ # CONFIG_NET_SCH_TEQL is not set
+ # CONFIG_NET_SCH_TBF is not set
+ # CONFIG_NET_SCH_GRED is not set
+ # CONFIG_NET_SCH_DSMARK is not set
+ # CONFIG_NET_SCH_NETEM is not set
+ # CONFIG_NET_SCH_INGRESS is not set
+
+ #
+ # Classification
+ #
+ CONFIG_NET_CLS=y
+ # CONFIG_NET_CLS_BASIC is not set
+ # CONFIG_NET_CLS_TCINDEX is not set
+ # CONFIG_NET_CLS_ROUTE4 is not set
+ # CONFIG_NET_CLS_FW is not set
+ # CONFIG_NET_CLS_U32 is not set
+ # CONFIG_NET_CLS_RSVP is not set
+ # CONFIG_NET_CLS_RSVP6 is not set
+ # CONFIG_NET_CLS_FLOW is not set
+ CONFIG_NET_EMATCH=y
+ CONFIG_NET_EMATCH_STACK=32
+ # CONFIG_NET_EMATCH_CMP is not set
+ # CONFIG_NET_EMATCH_NBYTE is not set
+ # CONFIG_NET_EMATCH_U32 is not set
+ # CONFIG_NET_EMATCH_META is not set
+ # CONFIG_NET_EMATCH_TEXT is not set
+ CONFIG_NET_CLS_ACT=y
+ # CONFIG_NET_ACT_POLICE is not set
+ # CONFIG_NET_ACT_GACT is not set
+ # CONFIG_NET_ACT_MIRRED is not set
+ # CONFIG_NET_ACT_IPT is not set
+ # CONFIG_NET_ACT_NAT is not set
+ # CONFIG_NET_ACT_PEDIT is not set
+ # CONFIG_NET_ACT_SIMP is not set
+ CONFIG_NET_SCH_FIFO=y
#
# Network testing
@@@@@@@@@@@@ -672,22 -672,22 -675,22 -675,22 -371,9 -672,22 -666,31 -672,22 -672,22 -672,22 -675,22 +672,22 @@@@@@@@@@@@ CONFIG_FIB_RULES=
#
# Wireless
#
- # CONFIG_CFG80211 is not set
- # CONFIG_WIRELESS_EXT is not set
- # CONFIG_MAC80211 is not set
+ CONFIG_CFG80211=y
+ CONFIG_NL80211=y
+ CONFIG_WIRELESS_EXT=y
+ + CONFIG_WIRELESS_EXT_SYSFS=y
+ CONFIG_MAC80211=y
+
+ #
+ # Rate control algorithm selection
+ #
+ + CONFIG_MAC80211_RC_PID=y
+ CONFIG_MAC80211_RC_DEFAULT_PID=y
- # CONFIG_MAC80211_RC_DEFAULT_NONE is not set
-
- #
- # Selecting 'y' for an algorithm will
- #
-
- #
- # build the algorithm into mac80211.
- #
+ CONFIG_MAC80211_RC_DEFAULT="pid"
- CONFIG_MAC80211_RC_PID=y
+ # CONFIG_MAC80211_MESH is not set
+ CONFIG_MAC80211_LEDS=y
+ # CONFIG_MAC80211_DEBUGFS is not set
- # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
- # CONFIG_MAC80211_DEBUG is not set
+ + # CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_IEEE80211 is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@@@@@@@@@@@ -703,13 -703,13 -706,13 -706,13 -388,10 -703,13 -706,11 -703,13 -703,13 -703,13 -706,13 +703,13 @@@@@@@@@@@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
+ + CONFIG_FIRMWARE_IN_KERNEL=y
+ + CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
- # CONFIG_DEBUG_DEVRES is not set
+ CONFIG_DEBUG_DEVRES=y
# CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
+ CONFIG_CONNECTOR=y
+ CONFIG_PROC_EVENTS=y
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
CONFIG_PNP=y
@@@@@@@@@@@@ -733,31 -733,31 -736,31 -736,31 -415,82 -733,31 -734,26 -733,31 -733,31 -733,31 -736,31 +733,31 @@@@@@@@@@@@ CONFIG_BLK_DEV_LOOP=
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=4096
- CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+ CONFIG_BLK_DEV_RAM_SIZE=16384
+ # CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+ + # CONFIG_BLK_DEV_HD is not set
CONFIG_MISC_DEVICES=y
# CONFIG_IBM_ASM is not set
# CONFIG_PHANTOM is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
+ # CONFIG_ACER_WMI is not set
+ # CONFIG_ASUS_LAPTOP is not set
+ # CONFIG_FUJITSU_LAPTOP is not set
+ # CONFIG_MSI_LAPTOP is not set
+ + # CONFIG_COMPAL_LAPTOP is not set
# CONFIG_SONY_LAPTOP is not set
# CONFIG_THINKPAD_ACPI is not set
- CONFIG_IDE=y
- CONFIG_BLK_DEV_IDE=y
-
- #
- # Please see Documentation/ide.txt for help/info on IDE drives
- #
- # CONFIG_BLK_DEV_IDE_SATA is not set
- # CONFIG_BLK_DEV_HD_IDE is not set
- CONFIG_BLK_DEV_IDEDISK=y
- CONFIG_IDEDISK_MULTI_MODE=y
- CONFIG_BLK_DEV_IDECD=y
- # CONFIG_BLK_DEV_IDETAPE is not set
- # CONFIG_BLK_DEV_IDEFLOPPY is not set
- # CONFIG_BLK_DEV_IDESCSI is not set
- CONFIG_BLK_DEV_IDEACPI=y
- # CONFIG_IDE_TASK_IOCTL is not set
- CONFIG_IDE_PROC_FS=y
-
- #
- # IDE chipset support/bugfixes
- #
- CONFIG_IDE_GENERIC=y
- # CONFIG_BLK_DEV_CMD640 is not set
- # CONFIG_BLK_DEV_IDEPNP is not set
- CONFIG_BLK_DEV_IDEPCI=y
- # CONFIG_IDEPCI_SHARE_IRQ is not set
- CONFIG_IDEPCI_PCIBUS_ORDER=y
- # CONFIG_BLK_DEV_OFFBOARD is not set
- # CONFIG_BLK_DEV_GENERIC is not set
- # CONFIG_BLK_DEV_OPTI621 is not set
- # CONFIG_BLK_DEV_RZ1000 is not set
- CONFIG_BLK_DEV_IDEDMA_PCI=y
- # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
- # CONFIG_IDEDMA_ONLYDISK is not set
- # CONFIG_BLK_DEV_AEC62XX is not set
- # CONFIG_BLK_DEV_ALI15X3 is not set
- CONFIG_BLK_DEV_AMD74XX=y
- CONFIG_BLK_DEV_ATIIXP=y
- # CONFIG_BLK_DEV_CMD64X is not set
- # CONFIG_BLK_DEV_TRIFLEX is not set
- # CONFIG_BLK_DEV_CY82C693 is not set
- # CONFIG_BLK_DEV_CS5520 is not set
- # CONFIG_BLK_DEV_CS5530 is not set
- # CONFIG_BLK_DEV_HPT34X is not set
- # CONFIG_BLK_DEV_HPT366 is not set
- # CONFIG_BLK_DEV_JMICRON is not set
- # CONFIG_BLK_DEV_SC1200 is not set
- CONFIG_BLK_DEV_PIIX=y
- # CONFIG_BLK_DEV_IT8213 is not set
- # CONFIG_BLK_DEV_IT821X is not set
- # CONFIG_BLK_DEV_NS87415 is not set
- # CONFIG_BLK_DEV_PDC202XX_OLD is not set
- CONFIG_BLK_DEV_PDC202XX_NEW=y
- # CONFIG_BLK_DEV_SVWKS is not set
- # CONFIG_BLK_DEV_SIIMAGE is not set
- # CONFIG_BLK_DEV_SIS5513 is not set
- # CONFIG_BLK_DEV_SLC90E66 is not set
- # CONFIG_BLK_DEV_TRM290 is not set
- # CONFIG_BLK_DEV_VIA82CXXX is not set
- # CONFIG_BLK_DEV_TC86C001 is not set
- # CONFIG_IDE_ARM is not set
- CONFIG_BLK_DEV_IDEDMA=y
- # CONFIG_IDEDMA_IVB is not set
- # CONFIG_BLK_DEV_HD is not set
+ # CONFIG_INTEL_MENLOW is not set
+ # CONFIG_ENCLOSURE_SERVICES is not set
+ + # CONFIG_SGI_XP is not set
+ + # CONFIG_HP_ILO is not set
+ + # CONFIG_SGI_GRU is not set
+ CONFIG_HAVE_IDE=y
+ # CONFIG_IDE is not set
#
# SCSI device support
@@@@@@@@@@@@ -793,14 -793,14 -796,14 -796,14 -526,52 -793,14 -789,13 -793,14 -793,14 -793,14 -796,14 +793,14 @@@@@@@@@@@@ CONFIG_SCSI_WAIT_SCAN=
# SCSI Transports
#
CONFIG_SCSI_SPI_ATTRS=y
- CONFIG_SCSI_FC_ATTRS=y
- # CONFIG_SCSI_ISCSI_ATTRS is not set
- CONFIG_SCSI_SAS_ATTRS=y
+ # CONFIG_SCSI_FC_ATTRS is not set
- # CONFIG_SCSI_ISCSI_ATTRS is not set
+ + CONFIG_SCSI_ISCSI_ATTRS=y
+ # CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
-
- #
- # SCSI low-level drivers
- #
- # CONFIG_ISCSI_TCP is not set
- # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
- # CONFIG_SCSI_3W_9XXX is not set
- # CONFIG_SCSI_ACARD is not set
- # CONFIG_SCSI_AACRAID is not set
- # CONFIG_SCSI_AIC7XXX is not set
- # CONFIG_SCSI_AIC7XXX_OLD is not set
- CONFIG_SCSI_AIC79XX=y
- CONFIG_AIC79XX_CMDS_PER_DEVICE=32
- CONFIG_AIC79XX_RESET_DELAY_MS=4000
- # CONFIG_AIC79XX_DEBUG_ENABLE is not set
- CONFIG_AIC79XX_DEBUG_MASK=0
- # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
- # CONFIG_SCSI_AIC94XX is not set
- # CONFIG_SCSI_ARCMSR is not set
- # CONFIG_MEGARAID_NEWGEN is not set
- # CONFIG_MEGARAID_LEGACY is not set
- # CONFIG_MEGARAID_SAS is not set
- # CONFIG_SCSI_HPTIOP is not set
- # CONFIG_SCSI_BUSLOGIC is not set
- # CONFIG_SCSI_DMX3191D is not set
- # CONFIG_SCSI_EATA is not set
- # CONFIG_SCSI_FUTURE_DOMAIN is not set
- # CONFIG_SCSI_GDTH is not set
- # CONFIG_SCSI_IPS is not set
- # CONFIG_SCSI_INITIO is not set
- # CONFIG_SCSI_INIA100 is not set
- # CONFIG_SCSI_STEX is not set
- # CONFIG_SCSI_SYM53C8XX_2 is not set
- # CONFIG_SCSI_IPR is not set
- # CONFIG_SCSI_QLOGIC_1280 is not set
- # CONFIG_SCSI_QLA_FC is not set
- # CONFIG_SCSI_QLA_ISCSI is not set
- # CONFIG_SCSI_LPFC is not set
- # CONFIG_SCSI_DC395x is not set
- # CONFIG_SCSI_DC390T is not set
- # CONFIG_SCSI_DEBUG is not set
- # CONFIG_SCSI_SRP is not set
+ # CONFIG_SCSI_SRP_ATTRS is not set
+ # CONFIG_SCSI_LOWLEVEL is not set
+ # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ + # CONFIG_SCSI_DH is not set
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_ACPI=y
@@@@@@@@@@@@ -862,16 -862,16 -865,16 -865,16 -627,8 -862,16 -857,15 -862,16 -862,16 -862,16 -865,16 +862,16 @@@@@@@@@@@@ CONFIG_PATA_OLDPIIX=
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
+ + CONFIG_PATA_SCH=y
CONFIG_MD=y
- # CONFIG_BLK_DEV_MD is not set
+ CONFIG_BLK_DEV_MD=y
+ # CONFIG_MD_LINEAR is not set
+ # CONFIG_MD_RAID0 is not set
+ # CONFIG_MD_RAID1 is not set
+ # CONFIG_MD_RAID10 is not set
+ # CONFIG_MD_RAID456 is not set
+ # CONFIG_MD_MULTIPATH is not set
+ # CONFIG_MD_FAULTY is not set
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
# CONFIG_DM_CRYPT is not set
@@@@@@@@@@@@ -886,42 -886,42 -889,42 -889,42 -651,45 -886,42 -880,23 -886,42 -886,42 -886,42 -889,42 +886,42 @@@@@@@@@@@@ CONFIG_DM_ZERO=
#
# IEEE 1394 (FireWire) support
#
- # CONFIG_FIREWIRE is not set
- CONFIG_IEEE1394=y
-
- #
- # Subsystem Options
- #
- # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-
- #
- # Controllers
- #
+
+ #
- # Texas Instruments PCILynx requires I2C
+ + # Enable only one of the two stacks, unless you know what you are doing
+ #
- CONFIG_IEEE1394_OHCI1394=y
-
- #
- # Protocols
- #
- # CONFIG_IEEE1394_VIDEO1394 is not set
- # CONFIG_IEEE1394_SBP2 is not set
- # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
- # CONFIG_IEEE1394_ETH1394 is not set
- # CONFIG_IEEE1394_DV1394 is not set
- CONFIG_IEEE1394_RAWIO=y
+ # CONFIG_FIREWIRE is not set
+ # CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
CONFIG_MACINTOSH_DRIVERS=y
- # CONFIG_MAC_EMUMOUSEBTN is not set
+ CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
- CONFIG_NETDEVICES_MULTIQUEUE=y
- # CONFIG_NETDEVICES_MULTIQUEUE is not set
+ # CONFIG_IFB is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
- CONFIG_TUN=y
+ # CONFIG_TUN is not set
+ # CONFIG_VETH is not set
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
- - # CONFIG_PHYLIB is not set
+ + CONFIG_PHYLIB=y
+ +
+ + #
+ + # MII PHY device drivers
+ + #
+ + # CONFIG_MARVELL_PHY is not set
+ + # CONFIG_DAVICOM_PHY is not set
+ + # CONFIG_QSEMI_PHY is not set
+ + # CONFIG_LXT_PHY is not set
+ + # CONFIG_CICADA_PHY is not set
+ + # CONFIG_VITESSE_PHY is not set
+ + # CONFIG_SMSC_PHY is not set
+ + # CONFIG_BROADCOM_PHY is not set
+ + # CONFIG_ICPLUS_PHY is not set
+ + # CONFIG_REALTEK_PHY is not set
+ + # CONFIG_FIXED_PHY is not set
+ + # CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
@@@@@@@@@@@@ -972,24 -972,24 -975,24 -975,24 -738,20 -972,24 -946,25 -972,24 -972,24 -972,24 -975,24 +972,24 @@@@@@@@@@@@ CONFIG_NETDEV_1000=
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
CONFIG_E1000=y
- - # CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+ # CONFIG_E1000E is not set
- # CONFIG_E1000E_ENABLED is not set
+ # CONFIG_IP1000 is not set
+ # CONFIG_IGB is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
- # CONFIG_SKY2 is not set
+ CONFIG_SKY2=y
+ # CONFIG_SKY2_DEBUG is not set
# CONFIG_VIA_VELOCITY is not set
CONFIG_TIGON3=y
- CONFIG_BNX2=y
+ # CONFIG_BNX2 is not set
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
+ + # CONFIG_ATL1E is not set
CONFIG_NETDEV_10000=y
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
@@@@@@@@@@@@ -1012,36 -1012,36 -1015,36 -1015,36 -767,7 -1012,36 -987,35 -1012,36 -1012,36 -1012,36 -1015,36 +1012,36 @@@@@@@@@@@@ CONFIG_TR=
# Wireless LAN
#
# CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
+ CONFIG_WLAN_80211=y
+ # CONFIG_PCMCIA_RAYCS is not set
+ # CONFIG_IPW2100 is not set
+ # CONFIG_IPW2200 is not set
+ # CONFIG_LIBERTAS is not set
+ # CONFIG_AIRO is not set
+ # CONFIG_HERMES is not set
+ # CONFIG_ATMEL is not set
+ # CONFIG_AIRO_CS is not set
+ # CONFIG_PCMCIA_WL3501 is not set
+ # CONFIG_PRISM54 is not set
+ # CONFIG_USB_ZD1201 is not set
+ # CONFIG_USB_NET_RNDIS_WLAN is not set
+ # CONFIG_RTL8180 is not set
+ # CONFIG_RTL8187 is not set
+ # CONFIG_ADM8211 is not set
+ + # CONFIG_MAC80211_HWSIM is not set
+ # CONFIG_P54_COMMON is not set
+ CONFIG_ATH5K=y
+ # CONFIG_ATH5K_DEBUG is not set
- # CONFIG_IWLWIFI is not set
+ + # CONFIG_ATH9K is not set
+ # CONFIG_IWLCORE is not set
+ # CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_IWL4965 is not set
+ + # CONFIG_IWLAGN is not set
+ # CONFIG_IWL3945 is not set
+ # CONFIG_HOSTAP is not set
+ # CONFIG_B43 is not set
+ # CONFIG_B43LEGACY is not set
+ # CONFIG_ZD1211RW is not set
+ # CONFIG_RT2X00 is not set
#
# USB Network Adapters
@@@@@@@@@@@@ -1114,59 -1114,59 -1117,59 -1117,59 -831,11 -1114,59 -1088,56 -1114,59 -1114,59 -1114,59 -1117,59 +1114,59 @@@@@@@@@@@@ CONFIG_MOUSE_PS2_TRACKPOINT=
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_APPLETOUCH is not set
+ + # CONFIG_MOUSE_BCM5974 is not set
# CONFIG_MOUSE_VSXXXAA is not set
- # CONFIG_INPUT_JOYSTICK is not set
- # CONFIG_INPUT_TABLET is not set
- # CONFIG_INPUT_TOUCHSCREEN is not set
- # CONFIG_INPUT_MISC is not set
+ CONFIG_INPUT_JOYSTICK=y
+ # CONFIG_JOYSTICK_ANALOG is not set
+ # CONFIG_JOYSTICK_A3D is not set
+ # CONFIG_JOYSTICK_ADI is not set
+ # CONFIG_JOYSTICK_COBRA is not set
+ # CONFIG_JOYSTICK_GF2K is not set
+ # CONFIG_JOYSTICK_GRIP is not set
+ # CONFIG_JOYSTICK_GRIP_MP is not set
+ # CONFIG_JOYSTICK_GUILLEMOT is not set
+ # CONFIG_JOYSTICK_INTERACT is not set
+ # CONFIG_JOYSTICK_SIDEWINDER is not set
+ # CONFIG_JOYSTICK_TMDC is not set
+ # CONFIG_JOYSTICK_IFORCE is not set
+ # CONFIG_JOYSTICK_WARRIOR is not set
+ # CONFIG_JOYSTICK_MAGELLAN is not set
+ # CONFIG_JOYSTICK_SPACEORB is not set
+ # CONFIG_JOYSTICK_SPACEBALL is not set
+ # CONFIG_JOYSTICK_STINGER is not set
+ # CONFIG_JOYSTICK_TWIDJOY is not set
+ # CONFIG_JOYSTICK_ZHENHUA is not set
+ # CONFIG_JOYSTICK_JOYDUMP is not set
+ # CONFIG_JOYSTICK_XPAD is not set
+ CONFIG_INPUT_TABLET=y
+ # CONFIG_TABLET_USB_ACECAD is not set
+ # CONFIG_TABLET_USB_AIPTEK is not set
+ # CONFIG_TABLET_USB_GTCO is not set
+ # CONFIG_TABLET_USB_KBTAB is not set
+ # CONFIG_TABLET_USB_WACOM is not set
+ CONFIG_INPUT_TOUCHSCREEN=y
+ # CONFIG_TOUCHSCREEN_FUJITSU is not set
+ # CONFIG_TOUCHSCREEN_GUNZE is not set
+ # CONFIG_TOUCHSCREEN_ELO is not set
+ # CONFIG_TOUCHSCREEN_MTOUCH is not set
+ + # CONFIG_TOUCHSCREEN_INEXIO is not set
+ # CONFIG_TOUCHSCREEN_MK712 is not set
+ # CONFIG_TOUCHSCREEN_PENMOUNT is not set
+ # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+ # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+ # CONFIG_TOUCHSCREEN_UCB1400 is not set
+ # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+ + # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+ CONFIG_INPUT_MISC=y
+ # CONFIG_INPUT_PCSPKR is not set
+ # CONFIG_INPUT_APANEL is not set
+ # CONFIG_INPUT_ATLAS_BTNS is not set
+ # CONFIG_INPUT_ATI_REMOTE is not set
+ # CONFIG_INPUT_ATI_REMOTE2 is not set
+ # CONFIG_INPUT_KEYSPAN_REMOTE is not set
+ # CONFIG_INPUT_POWERMATE is not set
+ # CONFIG_INPUT_YEALINK is not set
+ # CONFIG_INPUT_UINPUT is not set
#
# Hardware I/O ports
@@@@@@@@@@@@ -1184,29 -1184,29 -1187,29 -1187,29 -853,10 -1184,29 -1155,28 -1184,29 -1184,29 -1184,29 -1187,29 +1184,29 @@@@@@@@@@@@ CONFIG_SERIO_LIBPS2=
# Character devices
#
CONFIG_VT=y
+ + CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
- # CONFIG_VT_HW_CONSOLE_BINDING is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
+ CONFIG_VT_HW_CONSOLE_BINDING=y
+ CONFIG_DEVKMEM=y
+ CONFIG_SERIAL_NONSTANDARD=y
+ # CONFIG_COMPUTONE is not set
+ # CONFIG_ROCKETPORT is not set
+ # CONFIG_CYCLADES is not set
+ # CONFIG_DIGIEPCA is not set
+ # CONFIG_MOXA_INTELLIO is not set
+ # CONFIG_MOXA_SMARTIO is not set
+ # CONFIG_ISI is not set
+ # CONFIG_SYNCLINK is not set
+ # CONFIG_SYNCLINKMP is not set
+ # CONFIG_SYNCLINK_GT is not set
+ # CONFIG_N_HDLC is not set
+ # CONFIG_RISCOM8 is not set
+ # CONFIG_SPECIALIX is not set
+ # CONFIG_SX is not set
+ # CONFIG_RIO is not set
+ # CONFIG_STALDRV is not set
+ # CONFIG_NOZOMI is not set
#
# Serial drivers
@@@@@@@@@@@@ -1232,267 -1232,267 -1235,267 -1235,267 -877,62 -1232,267 -1202,241 -1232,267 -1232,267 -1232,267 -1235,267 +1232,267 @@@@@@@@@@@@ CONFIG_SERIAL_CORE=
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
- CONFIG_LEGACY_PTYS=y
- CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
- # CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=y
- CONFIG_HW_RANDOM_INTEL=y
- CONFIG_HW_RANDOM_AMD=y
- # CONFIG_NVRAM is not set
- CONFIG_RTC=y
+ # CONFIG_HW_RANDOM_INTEL is not set
+ # CONFIG_HW_RANDOM_AMD is not set
+ CONFIG_NVRAM=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
- CONFIG_AGP=y
- CONFIG_AGP_AMD64=y
- CONFIG_AGP_INTEL=y
- # CONFIG_AGP_SIS is not set
- # CONFIG_AGP_VIA is not set
- # CONFIG_DRM is not set
+
+ #
+ # PCMCIA character devices
+ #
+ # CONFIG_SYNCLINK_CS is not set
+ # CONFIG_CARDMAN_4000 is not set
+ # CONFIG_CARDMAN_4040 is not set
+ # CONFIG_IPWIRELESS is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
- CONFIG_RAW_DRIVER=y
- CONFIG_MAX_RAW_DEVS=256
+ # CONFIG_RAW_DRIVER is not set
CONFIG_HPET=y
- - # CONFIG_HPET_RTC_IRQ is not set
- CONFIG_HPET_MMAP=y
+ # CONFIG_HPET_MMAP is not set
# CONFIG_HANGCHECK_TIMER is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
- # CONFIG_I2C is not set
+ CONFIG_I2C=y
+ CONFIG_I2C_BOARDINFO=y
+ # CONFIG_I2C_CHARDEV is not set
+ + CONFIG_I2C_HELPER_AUTO=y
+
+ #
+ # I2C Hardware Bus support
+ #
+ +
+ + #
+ + # PC SMBus host controller drivers
+ + #
+ # CONFIG_I2C_ALI1535 is not set
+ # CONFIG_I2C_ALI1563 is not set
+ # CONFIG_I2C_ALI15X3 is not set
+ # CONFIG_I2C_AMD756 is not set
+ # CONFIG_I2C_AMD8111 is not set
+ CONFIG_I2C_I801=y
- # CONFIG_I2C_I810 is not set
+ + # CONFIG_I2C_ISCH is not set
+ # CONFIG_I2C_PIIX4 is not set
+ # CONFIG_I2C_NFORCE2 is not set
- # CONFIG_I2C_OCORES is not set
- # CONFIG_I2C_PARPORT_LIGHT is not set
- # CONFIG_I2C_PROSAVAGE is not set
- # CONFIG_I2C_SAVAGE4 is not set
- # CONFIG_I2C_SIMTEC is not set
+ # CONFIG_I2C_SIS5595 is not set
+ # CONFIG_I2C_SIS630 is not set
+ # CONFIG_I2C_SIS96X is not set
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
- # CONFIG_I2C_TINY_USB is not set
+ # CONFIG_I2C_VIA is not set
+ # CONFIG_I2C_VIAPRO is not set
+ +
+ + #
+ + # I2C system bus drivers (mostly embedded / system-on-chip)
+ + #
+ + # CONFIG_I2C_OCORES is not set
+ + # CONFIG_I2C_SIMTEC is not set
+ +
+ + #
+ + # External I2C/SMBus adapter drivers
+ + #
+ + # CONFIG_I2C_PARPORT_LIGHT is not set
+ + # CONFIG_I2C_TAOS_EVM is not set
+ + # CONFIG_I2C_TINY_USB is not set
+ +
+ + #
+ + # Graphics adapter I2C/DDC channel drivers
+ + #
+ # CONFIG_I2C_VOODOO3 is not set
+
+ #
- # SPI support
+ + # Other I2C/SMBus bus drivers
+ #
+ # CONFIG_I2C_PCA_PLATFORM is not set
+ + # CONFIG_I2C_STUB is not set
+
+ #
+ # Miscellaneous I2C Chip support
+ #
+ # CONFIG_DS1682 is not set
+ + # CONFIG_AT24 is not set
+ # CONFIG_SENSORS_EEPROM is not set
+ # CONFIG_SENSORS_PCF8574 is not set
+ # CONFIG_PCF8575 is not set
+ + # CONFIG_SENSORS_PCA9539 is not set
+ # CONFIG_SENSORS_PCF8591 is not set
+ # CONFIG_SENSORS_MAX6875 is not set
+ # CONFIG_SENSORS_TSL2550 is not set
+ # CONFIG_I2C_DEBUG_CORE is not set
+ # CONFIG_I2C_DEBUG_ALGO is not set
+ # CONFIG_I2C_DEBUG_BUS is not set
+ # CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_SPI is not set
- # CONFIG_SPI_MASTER is not set
+ + CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+ + # CONFIG_GPIOLIB is not set
# CONFIG_W1 is not set
- # CONFIG_POWER_SUPPLY is not set
+ CONFIG_POWER_SUPPLY=y
+ # CONFIG_POWER_SUPPLY_DEBUG is not set
+ # CONFIG_PDA_POWER is not set
+ # CONFIG_BATTERY_DS2760 is not set
# CONFIG_HWMON is not set
+ CONFIG_THERMAL=y
+ CONFIG_WATCHDOG=y
+ # CONFIG_WATCHDOG_NOWAYOUT is not set
+
+ #
+ # Watchdog Device Drivers
+ #
+ # CONFIG_SOFT_WATCHDOG is not set
+ # CONFIG_ACQUIRE_WDT is not set
+ # CONFIG_ADVANTECH_WDT is not set
+ # CONFIG_ALIM1535_WDT is not set
+ # CONFIG_ALIM7101_WDT is not set
+ # CONFIG_SC520_WDT is not set
+ # CONFIG_EUROTECH_WDT is not set
+ # CONFIG_IB700_WDT is not set
+ # CONFIG_IBMASR is not set
+ # CONFIG_WAFER_WDT is not set
+ # CONFIG_I6300ESB_WDT is not set
+ # CONFIG_ITCO_WDT is not set
+ # CONFIG_IT8712F_WDT is not set
+ # CONFIG_HP_WATCHDOG is not set
+ # CONFIG_SC1200_WDT is not set
+ # CONFIG_PC87413_WDT is not set
+ # CONFIG_60XX_WDT is not set
+ # CONFIG_SBC8360_WDT is not set
+ # CONFIG_CPU5_WDT is not set
+ # CONFIG_SMSC37B787_WDT is not set
+ # CONFIG_W83627HF_WDT is not set
+ # CONFIG_W83697HF_WDT is not set
+ # CONFIG_W83877F_WDT is not set
+ # CONFIG_W83977F_WDT is not set
+ # CONFIG_MACHZ_WDT is not set
+ # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+ #
+ # PCI-based Watchdog Cards
+ #
+ # CONFIG_PCIPCWATCHDOG is not set
+ # CONFIG_WDTPCI is not set
+
+ #
+ # USB-based Watchdog Cards
+ #
+ # CONFIG_USBPCWATCHDOG is not set
+
+ #
+ # Sonics Silicon Backplane
+ #
+ CONFIG_SSB_POSSIBLE=y
+ # CONFIG_SSB is not set
#
# Multifunction device drivers
#
+ + # CONFIG_MFD_CORE is not set
# CONFIG_MFD_SM501 is not set
+ # CONFIG_HTC_PASIC3 is not set
+ + # CONFIG_MFD_TMIO is not set
#
# Multimedia devices
#
+
+ #
+ # Multimedia core support
+ #
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
+ + # CONFIG_VIDEO_MEDIA is not set
+
+ #
+ # Multimedia drivers
+ #
CONFIG_DAB=y
# CONFIG_USB_DABUSB is not set
#
# Graphics support
#
- # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+ CONFIG_AGP=y
+ CONFIG_AGP_AMD64=y
+ CONFIG_AGP_INTEL=y
+ # CONFIG_AGP_SIS is not set
+ # CONFIG_AGP_VIA is not set
+ CONFIG_DRM=y
+ # CONFIG_DRM_TDFX is not set
+ # CONFIG_DRM_R128 is not set
+ # CONFIG_DRM_RADEON is not set
+ # CONFIG_DRM_I810 is not set
+ # CONFIG_DRM_I830 is not set
+ CONFIG_DRM_I915=y
+ # CONFIG_DRM_MGA is not set
+ # CONFIG_DRM_SIS is not set
+ # CONFIG_DRM_VIA is not set
+ # CONFIG_DRM_SAVAGE is not set
+ # CONFIG_VGASTATE is not set
+ # CONFIG_VIDEO_OUTPUT_CONTROL is not set
+ CONFIG_FB=y
+ # CONFIG_FIRMWARE_EDID is not set
+ # CONFIG_FB_DDC is not set
+ CONFIG_FB_CFB_FILLRECT=y
+ CONFIG_FB_CFB_COPYAREA=y
+ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+ # CONFIG_FB_SYS_FILLRECT is not set
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_FOREIGN_ENDIAN is not set
+ # CONFIG_FB_SYS_FOPS is not set
- CONFIG_FB_DEFERRED_IO=y
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
+ CONFIG_FB_MODE_HELPERS=y
+ CONFIG_FB_TILEBLITTING=y
+
+ #
+ # Frame buffer hardware drivers
+ #
+ # CONFIG_FB_CIRRUS is not set
+ # CONFIG_FB_PM2 is not set
+ # CONFIG_FB_CYBER2000 is not set
+ # CONFIG_FB_ARC is not set
+ # CONFIG_FB_ASILIANT is not set
+ # CONFIG_FB_IMSTT is not set
+ # CONFIG_FB_VGA16 is not set
+ # CONFIG_FB_UVESA is not set
+ # CONFIG_FB_VESA is not set
+ CONFIG_FB_EFI=y
+ # CONFIG_FB_IMAC is not set
+ # CONFIG_FB_N411 is not set
+ # CONFIG_FB_HGA is not set
+ # CONFIG_FB_S1D13XXX is not set
+ # CONFIG_FB_NVIDIA is not set
+ # CONFIG_FB_RIVA is not set
+ # CONFIG_FB_LE80578 is not set
+ # CONFIG_FB_INTEL is not set
+ # CONFIG_FB_MATROX is not set
+ # CONFIG_FB_RADEON is not set
+ # CONFIG_FB_ATY128 is not set
+ # CONFIG_FB_ATY is not set
+ # CONFIG_FB_S3 is not set
+ # CONFIG_FB_SAVAGE is not set
+ # CONFIG_FB_SIS is not set
+ # CONFIG_FB_NEOMAGIC is not set
+ # CONFIG_FB_KYRO is not set
+ # CONFIG_FB_3DFX is not set
+ # CONFIG_FB_VOODOO1 is not set
+ # CONFIG_FB_VT8623 is not set
+ # CONFIG_FB_TRIDENT is not set
+ # CONFIG_FB_ARK is not set
+ # CONFIG_FB_PM3 is not set
+ + # CONFIG_FB_CARMINE is not set
+ # CONFIG_FB_GEODE is not set
+ # CONFIG_FB_VIRTUAL is not set
+ CONFIG_BACKLIGHT_LCD_SUPPORT=y
+ # CONFIG_LCD_CLASS_DEVICE is not set
+ CONFIG_BACKLIGHT_CLASS_DEVICE=y
+ # CONFIG_BACKLIGHT_CORGI is not set
+ # CONFIG_BACKLIGHT_PROGEAR is not set
+ + # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
#
# Display device support
@@@@@@@@@@@@ -1504,125 -1504,125 -1507,125 -1507,125 -946,31 -1504,125 -1448,161 -1504,125 -1504,125 -1504,125 -1507,124 +1504,124 @@@@@@@@@@@@
#
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
- CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
- CONFIG_VIDEO_SELECT=y
+ CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
---- ----- CONFIG_VIDEO_SELECT=y
CONFIG_DUMMY_CONSOLE=y
-
- #
- # Sound
- #
+ # CONFIG_FRAMEBUFFER_CONSOLE is not set
+ CONFIG_LOGO=y
+ # CONFIG_LOGO_LINUX_MONO is not set
+ # CONFIG_LOGO_LINUX_VGA16 is not set
+ CONFIG_LOGO_LINUX_CLUT224=y
-
- #
- # Sound
- #
CONFIG_SOUND=y
- -
- - #
- - # Advanced Linux Sound Architecture
- #
- # CONFIG_SND is not set
-
- #
- # Open Sound System
- - #
- CONFIG_SOUND_PRIME=y
- # CONFIG_SOUND_TRIDENT is not set
- # CONFIG_SOUND_MSNDCLAS is not set
- # CONFIG_SOUND_MSNDPIN is not set
- # CONFIG_SOUND_OSS is not set
+ CONFIG_SND=y
+ CONFIG_SND_TIMER=y
+ CONFIG_SND_PCM=y
+ CONFIG_SND_HWDEP=y
+ CONFIG_SND_SEQUENCER=y
+ CONFIG_SND_SEQ_DUMMY=y
+ CONFIG_SND_OSSEMUL=y
+ CONFIG_SND_MIXER_OSS=y
+ CONFIG_SND_PCM_OSS=y
+ CONFIG_SND_PCM_OSS_PLUGINS=y
+ CONFIG_SND_SEQUENCER_OSS=y
+ CONFIG_SND_DYNAMIC_MINORS=y
+ CONFIG_SND_SUPPORT_OLD_API=y
+ CONFIG_SND_VERBOSE_PROCFS=y
+ # CONFIG_SND_VERBOSE_PRINTK is not set
+ # CONFIG_SND_DEBUG is not set
+ CONFIG_SND_VMASTER=y
-
- #
- # Generic devices
- #
+ + CONFIG_SND_DRIVERS=y
+ # CONFIG_SND_PCSP is not set
+ # CONFIG_SND_DUMMY is not set
+ # CONFIG_SND_VIRMIDI is not set
+ # CONFIG_SND_MTPAV is not set
+ # CONFIG_SND_SERIAL_U16550 is not set
+ # CONFIG_SND_MPU401 is not set
-
- #
- # PCI devices
- #
+ + CONFIG_SND_PCI=y
+ # CONFIG_SND_AD1889 is not set
+ # CONFIG_SND_ALS300 is not set
+ # CONFIG_SND_ALS4000 is not set
+ # CONFIG_SND_ALI5451 is not set
+ # CONFIG_SND_ATIIXP is not set
+ # CONFIG_SND_ATIIXP_MODEM is not set
+ # CONFIG_SND_AU8810 is not set
+ # CONFIG_SND_AU8820 is not set
+ # CONFIG_SND_AU8830 is not set
+ # CONFIG_SND_AW2 is not set
+ # CONFIG_SND_AZT3328 is not set
+ # CONFIG_SND_BT87X is not set
+ # CONFIG_SND_CA0106 is not set
+ # CONFIG_SND_CMIPCI is not set
+ # CONFIG_SND_OXYGEN is not set
+ # CONFIG_SND_CS4281 is not set
+ # CONFIG_SND_CS46XX is not set
+ # CONFIG_SND_CS5530 is not set
+ # CONFIG_SND_DARLA20 is not set
+ # CONFIG_SND_GINA20 is not set
+ # CONFIG_SND_LAYLA20 is not set
+ # CONFIG_SND_DARLA24 is not set
+ # CONFIG_SND_GINA24 is not set
+ # CONFIG_SND_LAYLA24 is not set
+ # CONFIG_SND_MONA is not set
+ # CONFIG_SND_MIA is not set
+ # CONFIG_SND_ECHO3G is not set
+ # CONFIG_SND_INDIGO is not set
+ # CONFIG_SND_INDIGOIO is not set
+ # CONFIG_SND_INDIGODJ is not set
+ # CONFIG_SND_EMU10K1 is not set
+ # CONFIG_SND_EMU10K1X is not set
+ # CONFIG_SND_ENS1370 is not set
+ # CONFIG_SND_ENS1371 is not set
+ # CONFIG_SND_ES1938 is not set
+ # CONFIG_SND_ES1968 is not set
+ # CONFIG_SND_FM801 is not set
+ CONFIG_SND_HDA_INTEL=y
+ CONFIG_SND_HDA_HWDEP=y
+ CONFIG_SND_HDA_CODEC_REALTEK=y
+ CONFIG_SND_HDA_CODEC_ANALOG=y
+ CONFIG_SND_HDA_CODEC_SIGMATEL=y
+ CONFIG_SND_HDA_CODEC_VIA=y
+ CONFIG_SND_HDA_CODEC_ATIHDMI=y
+ CONFIG_SND_HDA_CODEC_CONEXANT=y
+ CONFIG_SND_HDA_CODEC_CMEDIA=y
+ CONFIG_SND_HDA_CODEC_SI3054=y
+ CONFIG_SND_HDA_GENERIC=y
+ # CONFIG_SND_HDA_POWER_SAVE is not set
+ # CONFIG_SND_HDSP is not set
+ # CONFIG_SND_HDSPM is not set
+ # CONFIG_SND_HIFIER is not set
+ # CONFIG_SND_ICE1712 is not set
+ # CONFIG_SND_ICE1724 is not set
+ # CONFIG_SND_INTEL8X0 is not set
+ # CONFIG_SND_INTEL8X0M is not set
+ # CONFIG_SND_KORG1212 is not set
+ # CONFIG_SND_MAESTRO3 is not set
+ # CONFIG_SND_MIXART is not set
+ # CONFIG_SND_NM256 is not set
+ # CONFIG_SND_PCXHR is not set
+ # CONFIG_SND_RIPTIDE is not set
+ # CONFIG_SND_RME32 is not set
+ # CONFIG_SND_RME96 is not set
+ # CONFIG_SND_RME9652 is not set
+ # CONFIG_SND_SONICVIBES is not set
+ # CONFIG_SND_TRIDENT is not set
+ # CONFIG_SND_VIA82XX is not set
+ # CONFIG_SND_VIA82XX_MODEM is not set
+ # CONFIG_SND_VIRTUOSO is not set
+ # CONFIG_SND_VX222 is not set
+ # CONFIG_SND_YMFPCI is not set
-
- #
- # USB devices
- #
+ + CONFIG_SND_USB=y
+ # CONFIG_SND_USB_AUDIO is not set
+ # CONFIG_SND_USB_USX2Y is not set
+ # CONFIG_SND_USB_CAIAQ is not set
-
- #
- # PCMCIA devices
- #
+ + CONFIG_SND_PCMCIA=y
+ # CONFIG_SND_VXPOCKET is not set
+ # CONFIG_SND_PDAUDIOCF is not set
-
- #
- # System on Chip audio support
- #
+ # CONFIG_SND_SOC is not set
-
- #
- # ALSA SoC audio for Freescale SOCs
- #
-
- #
- # SoC Audio for the Texas Instruments OMAP
- #
-
- #
- # Open Sound System
- #
+ # CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
- # CONFIG_HID_DEBUG is not set
+ CONFIG_HID_DEBUG=y
+ CONFIG_HIDRAW=y
#
# USB Input Devices
@@@@@@@@@@@@ -1651,9 -1651,9 -1654,9 -1654,9 -992,9 -1651,9 -1631,8 -1651,9 -1651,9 -1651,9 -1653,9 +1650,9 @@@@@@@@@@@@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
- # CONFIG_USB_SUSPEND is not set
- # CONFIG_USB_PERSIST is not set
+ CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
+ + CONFIG_USB_MON=y
#
# USB Host Controller Drivers
@@@@@@@@@@@@ -1697,11 -1697,11 -1700,11 -1700,11 -1036,8 -1697,11 -1675,10 -1697,11 -1697,11 -1697,11 -1699,11 +1696,11 @@@@@@@@@@@@ CONFIG_USB_STORAGE=
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
+ # CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
- # CONFIG_USB_LIBUSUAL is not set
+ + # CONFIG_USB_STORAGE_SIERRA is not set
+ # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+ CONFIG_USB_LIBUSUAL=y
#
# USB Imaging devices
@@@@@@@@@@@@ -1736,86 -1736,86 -1739,86 -1739,86 -1078,45 -1736,86 -1715,82 -1736,86 -1736,86 -1736,86 -1738,86 +1735,86 @@@@@@@@@@@@
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
+ + # CONFIG_USB_ISIGHTFW is not set
+ # CONFIG_USB_GADGET is not set
+ # CONFIG_MMC is not set
+ # CONFIG_MEMSTICK is not set
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
#
- # USB DSL modem support
+ # LED drivers
#
+ + # CONFIG_LEDS_PCA9532 is not set
+ # CONFIG_LEDS_CLEVO_MAIL is not set
+ + # CONFIG_LEDS_PCA955X is not set
#
- # USB Gadget Support
+ # LED Triggers
#
- # CONFIG_USB_GADGET is not set
- # CONFIG_MMC is not set
+ CONFIG_LEDS_TRIGGERS=y
+ # CONFIG_LEDS_TRIGGER_TIMER is not set
+ # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+ # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+ # CONFIG_ACCESSIBILITY is not set
+ # CONFIG_INFINIBAND is not set
+ CONFIG_EDAC=y
#
- # LED devices
+ # Reporting subsystems
#
- # CONFIG_NEW_LEDS is not set
+ # CONFIG_EDAC_DEBUG is not set
+ # CONFIG_EDAC_MM_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+ # CONFIG_RTC_HCTOSYS is not set
+ # CONFIG_RTC_DEBUG is not set
#
- # LED drivers
+ # RTC interfaces
#
+ CONFIG_RTC_INTF_SYSFS=y
+ CONFIG_RTC_INTF_PROC=y
+ CONFIG_RTC_INTF_DEV=y
+ # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+ # CONFIG_RTC_DRV_TEST is not set
#
- # LED Triggers
+ # I2C RTC drivers
#
- # CONFIG_INFINIBAND is not set
- # CONFIG_EDAC is not set
+ # CONFIG_RTC_DRV_DS1307 is not set
+ # CONFIG_RTC_DRV_DS1374 is not set
+ # CONFIG_RTC_DRV_DS1672 is not set
+ # CONFIG_RTC_DRV_MAX6900 is not set
+ # CONFIG_RTC_DRV_RS5C372 is not set
+ # CONFIG_RTC_DRV_ISL1208 is not set
+ # CONFIG_RTC_DRV_X1205 is not set
+ # CONFIG_RTC_DRV_PCF8563 is not set
+ # CONFIG_RTC_DRV_PCF8583 is not set
+ # CONFIG_RTC_DRV_M41T80 is not set
+ # CONFIG_RTC_DRV_S35390A is not set
+ + # CONFIG_RTC_DRV_FM3130 is not set
#
- # Real Time Clock
+ # SPI RTC drivers
#
- # CONFIG_RTC_CLASS is not set
#
- # DMA Engine support
+ # Platform RTC drivers
#
- # CONFIG_DMA_ENGINE is not set
+ CONFIG_RTC_DRV_CMOS=y
+ # CONFIG_RTC_DRV_DS1511 is not set
+ # CONFIG_RTC_DRV_DS1553 is not set
+ # CONFIG_RTC_DRV_DS1742 is not set
+ # CONFIG_RTC_DRV_STK17TA8 is not set
+ # CONFIG_RTC_DRV_M48T86 is not set
+ # CONFIG_RTC_DRV_M48T59 is not set
+ # CONFIG_RTC_DRV_V3020 is not set
#
- # DMA Clients
+ # on-CPU RTC drivers
#
+ CONFIG_DMADEVICES=y
#
# DMA Devices
@@@@@@@@@@@@ -1827,13 -1827,13 -1830,13 -1830,13 -1133,9 -1827,13 -1802,11 -1827,13 -1827,13 -1827,13 -1829,13 +1826,13 @@@@@@@@@@@@
# Firmware Drivers
#
# CONFIG_EDD is not set
+ + CONFIG_FIRMWARE_MEMMAP=y
+ CONFIG_EFI_VARS=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
CONFIG_DMIID=y
- # CONFIG_ISCSI_IBFT_FIND is not set
+ + CONFIG_ISCSI_IBFT_FIND=y
+ + CONFIG_ISCSI_IBFT=y
#
# File systems
@@@@@@@@@@@@ -1912,28 -1912,28 -1915,28 -1915,28 -1219,33 -1912,28 -1885,15 -1912,28 -1912,28 -1912,28 -1914,28 +1911,28 @@@@@@@@@@@@ CONFIG_HUGETLB_PAGE=
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
+ # CONFIG_MINIX_FS is not set
+ + # CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
+ # CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-
- #
- # Network File Systems
- #
+ CONFIG_NETWORK_FILESYSTEMS=y
- # CONFIG_NFS_FS is not set
+ CONFIG_NFS_FS=y
+ CONFIG_NFS_V3=y
- # CONFIG_NFS_V3_ACL is not set
- # CONFIG_NFS_V4 is not set
- # CONFIG_NFS_DIRECTIO is not set
- CONFIG_NFSD=y
- CONFIG_NFSD_V3=y
- # CONFIG_NFSD_V3_ACL is not set
- # CONFIG_NFSD_V4 is not set
- CONFIG_NFSD_TCP=y
+ + CONFIG_NFS_V3_ACL=y
+ + CONFIG_NFS_V4=y
+ CONFIG_ROOT_NFS=y
+ # CONFIG_NFSD is not set
+ CONFIG_LOCKD=y
+ CONFIG_LOCKD_V4=y
- CONFIG_EXPORTFS=y
+ + CONFIG_NFS_ACL_SUPPORT=y
+ CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
- # CONFIG_SUNRPC_BIND34 is not set
- # CONFIG_RPCSEC_GSS_KRB5 is not set
+ + CONFIG_SUNRPC_GSS=y
+ + CONFIG_RPCSEC_GSS_KRB5=y
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@@@@@@@@@@@ -2007,12 -2007,12 -2010,12 -2010,12 -1318,10 -2007,12 -1967,12 -2007,12 -2007,12 -2007,12 -2009,12 +2006,12 @@@@@@@@@@@@ CONFIG_NLS_UTF8=
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
- - # CONFIG_PRINTK_TIME is not set
- # CONFIG_ENABLE_WARN_DEPRECATED is not set
- - # CONFIG_ENABLE_MUST_CHECK is not set
+ + CONFIG_PRINTK_TIME=y
+ + CONFIG_ENABLE_WARN_DEPRECATED=y
+ + CONFIG_ENABLE_MUST_CHECK=y
+ CONFIG_FRAME_WARN=2048
CONFIG_MAGIC_SYSRQ=y
- CONFIG_UNUSED_SYMBOLS=y
+ # CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
@@@@@@@@@@@@ -2037,179 -2037,179 -2040,179 -2040,179 -1344,30 -2037,179 -1997,164 -2037,179 -2037,179 -2037,179 -2039,179 +2036,179 @@@@@@@@@@@@ CONFIG_TIMER_STATS=
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
+ # CONFIG_DEBUG_WRITECOUNT is not set
+ + CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_LIST is not set
- # CONFIG_FRAME_POINTER is not set
- CONFIG_OPTIMIZE_INLINING=y
+ # CONFIG_DEBUG_SG is not set
+ CONFIG_FRAME_POINTER=y
+ # CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
+ # CONFIG_KPROBES_SANITY_TEST is not set
+ # CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_LKDTM is not set
# CONFIG_FAULT_INJECTION is not set
- # CONFIG_DEBUG_RODATA is not set
- # CONFIG_IOMMU_DEBUG is not set
+ # CONFIG_LATENCYTOP is not set
+ + CONFIG_SYSCTL_SYSCALL_CHECK=y
+ + CONFIG_HAVE_FTRACE=y
+ + CONFIG_HAVE_DYNAMIC_FTRACE=y
+ + # CONFIG_FTRACE is not set
+ + # CONFIG_IRQSOFF_TRACER is not set
+ + # CONFIG_SYSPROF_TRACER is not set
+ + # CONFIG_SCHED_TRACER is not set
+ + # CONFIG_CONTEXT_SWITCH_TRACER is not set
+ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+ # CONFIG_SAMPLES is not set
- # CONFIG_KGDB is not set
+ CONFIG_HAVE_ARCH_KGDB=y
+ + # CONFIG_KGDB is not set
+ # CONFIG_STRICT_DEVMEM is not set
+ + CONFIG_X86_VERBOSE_BOOTUP=y
+ CONFIG_EARLY_PRINTK=y
CONFIG_DEBUG_STACKOVERFLOW=y
- # CONFIG_DEBUG_STACK_USAGE is not set
+ CONFIG_DEBUG_STACK_USAGE=y
+ # CONFIG_DEBUG_PAGEALLOC is not set
+ # CONFIG_DEBUG_PER_CPU_MAPS is not set
+ # CONFIG_X86_PTDUMP is not set
+ CONFIG_DEBUG_RODATA=y
+ # CONFIG_DIRECT_GBPAGES is not set
+ # CONFIG_DEBUG_RODATA_TEST is not set
+ CONFIG_DEBUG_NX_TEST=m
- CONFIG_X86_MPPARSE=y
+ # CONFIG_IOMMU_DEBUG is not set
+ + # CONFIG_MMIOTRACE is not set
+ CONFIG_IO_DELAY_TYPE_0X80=0
+ CONFIG_IO_DELAY_TYPE_0XED=1
+ CONFIG_IO_DELAY_TYPE_UDELAY=2
+ CONFIG_IO_DELAY_TYPE_NONE=3
+ CONFIG_IO_DELAY_0X80=y
+ # CONFIG_IO_DELAY_0XED is not set
+ # CONFIG_IO_DELAY_UDELAY is not set
+ # CONFIG_IO_DELAY_NONE is not set
+ CONFIG_DEFAULT_IO_DELAY_TYPE=0
+ CONFIG_DEBUG_BOOT_PARAMS=y
+ # CONFIG_CPA_DEBUG is not set
-- -# CONFIG_OPTIMIZE_INLINING is not set
+++ + +CONFIG_OPTIMIZE_INLINING=y
#
# Security options
#
- # CONFIG_KEYS is not set
- # CONFIG_SECURITY is not set
- # CONFIG_CRYPTO is not set
+ CONFIG_KEYS=y
+ CONFIG_KEYS_DEBUG_PROC_KEYS=y
+ CONFIG_SECURITY=y
+ CONFIG_SECURITY_NETWORK=y
+ # CONFIG_SECURITY_NETWORK_XFRM is not set
- CONFIG_SECURITY_CAPABILITIES=y
+ CONFIG_SECURITY_FILE_CAPABILITIES=y
+ # CONFIG_SECURITY_ROOTPLUG is not set
+ CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
+ CONFIG_SECURITY_SELINUX=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+ CONFIG_SECURITY_SELINUX_DISABLE=y
+ CONFIG_SECURITY_SELINUX_DEVELOP=y
+ CONFIG_SECURITY_SELINUX_AVC_STATS=y
+ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+ # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+ # CONFIG_SECURITY_SMACK is not set
+ CONFIG_CRYPTO=y
+
+ #
+ # Crypto core or helper
+ #
+ CONFIG_CRYPTO_ALGAPI=y
+ CONFIG_CRYPTO_AEAD=y
+ CONFIG_CRYPTO_BLKCIPHER=y
+ CONFIG_CRYPTO_HASH=y
+ CONFIG_CRYPTO_MANAGER=y
+ # CONFIG_CRYPTO_GF128MUL is not set
+ # CONFIG_CRYPTO_NULL is not set
+ # CONFIG_CRYPTO_CRYPTD is not set
+ CONFIG_CRYPTO_AUTHENC=y
+ # CONFIG_CRYPTO_TEST is not set
+
+ #
+ # Authenticated Encryption with Associated Data
+ #
+ # CONFIG_CRYPTO_CCM is not set
+ # CONFIG_CRYPTO_GCM is not set
+ # CONFIG_CRYPTO_SEQIV is not set
+
+ #
+ # Block modes
+ #
+ CONFIG_CRYPTO_CBC=y
+ # CONFIG_CRYPTO_CTR is not set
+ # CONFIG_CRYPTO_CTS is not set
+ CONFIG_CRYPTO_ECB=y
+ # CONFIG_CRYPTO_LRW is not set
+ # CONFIG_CRYPTO_PCBC is not set
+ # CONFIG_CRYPTO_XTS is not set
+
+ #
+ # Hash modes
+ #
+ CONFIG_CRYPTO_HMAC=y
+ # CONFIG_CRYPTO_XCBC is not set
+
+ #
+ # Digest
+ #
+ # CONFIG_CRYPTO_CRC32C is not set
+ # CONFIG_CRYPTO_MD4 is not set
+ CONFIG_CRYPTO_MD5=y
+ # CONFIG_CRYPTO_MICHAEL_MIC is not set
+ + # CONFIG_CRYPTO_RMD128 is not set
+ + # CONFIG_CRYPTO_RMD160 is not set
+ + # CONFIG_CRYPTO_RMD256 is not set
+ + # CONFIG_CRYPTO_RMD320 is not set
+ CONFIG_CRYPTO_SHA1=y
+ # CONFIG_CRYPTO_SHA256 is not set
+ # CONFIG_CRYPTO_SHA512 is not set
+ # CONFIG_CRYPTO_TGR192 is not set
+ # CONFIG_CRYPTO_WP512 is not set
+
+ #
+ # Ciphers
+ #
+ CONFIG_CRYPTO_AES=y
+ # CONFIG_CRYPTO_AES_X86_64 is not set
+ # CONFIG_CRYPTO_ANUBIS is not set
+ CONFIG_CRYPTO_ARC4=y
+ # CONFIG_CRYPTO_BLOWFISH is not set
+ # CONFIG_CRYPTO_CAMELLIA is not set
+ # CONFIG_CRYPTO_CAST5 is not set
+ # CONFIG_CRYPTO_CAST6 is not set
+ CONFIG_CRYPTO_DES=y
+ # CONFIG_CRYPTO_FCRYPT is not set
+ # CONFIG_CRYPTO_KHAZAD is not set
+ # CONFIG_CRYPTO_SALSA20 is not set
+ # CONFIG_CRYPTO_SALSA20_X86_64 is not set
+ # CONFIG_CRYPTO_SEED is not set
+ # CONFIG_CRYPTO_SERPENT is not set
+ # CONFIG_CRYPTO_TEA is not set
+ # CONFIG_CRYPTO_TWOFISH is not set
+ # CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+
+ #
+ # Compression
+ #
+ # CONFIG_CRYPTO_DEFLATE is not set
+ # CONFIG_CRYPTO_LZO is not set
+ CONFIG_CRYPTO_HW=y
+ # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+ CONFIG_HAVE_KVM=y
+ CONFIG_VIRTUALIZATION=y
+ # CONFIG_KVM is not set
+ # CONFIG_VIRTIO_PCI is not set
+ # CONFIG_VIRTIO_BALLOON is not set
#
# Library routines
#
CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_FIRST_BIT=y
+ CONFIG_GENERIC_FIND_NEXT_BIT=y
# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
+ + CONFIG_CRC_T10DIF=y
# CONFIG_CRC_ITU_T is not set
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
diff --cc arch/x86/kernel/Makefile
index c9be69fedb70,7b655b5bb9ab,3db651fc8ec5,f891996f6849,5e618c3b4720,c9be69fedb70,3db651fc8ec5,c9be69fedb70,c9be69fedb70,c9be69fedb70,3db651fc8ec5..5098585f87ce
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@@@@@@@@@@ -6,13 -6,13 -6,13 -6,13 -6,6 -6,13 -6,13 -6,13 -6,13 -6,13 -6,13 +6,13 @@@@@@@@@@@@ extra-y := head_$(BITS).
CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
+ ifdef CONFIG_FTRACE
+ # Do not profile debug and lowlevel utilities
+ CFLAGS_REMOVE_tsc.o = -pg
+ CFLAGS_REMOVE_rtc.o = -pg
- -- ------CFLAGS_REMOVE_paravirt.o = -pg
+ +++++++++CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
+ endif
+
#
# vsyscalls (which work on the user stack) should have
# no stack-protector checks:
@@@@@@@@@@@@ -90,8 -90,8 -89,8 -88,8 -81,7 -90,8 -89,8 -90,8 -90,8 -90,8 -89,8 +89,8 @@@@@@@@@@@@ obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.
obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
obj-$(CONFIG_KVM_GUEST) += kvm.o
obj-$(CONFIG_KVM_CLOCK) += kvmclock.o
- ---------obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
+ +++++++++obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o paravirt-spinlocks.o
+ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o
obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
@@@@@@@@@@@@ -103,10 -103,10 -102,8 -106,8 -93,7 -103,10 -102,8 -103,10 -103,10 -103,10 -102,8 +107,10 @@@@@@@@@@@@ obj-$(CONFIG_MICROCODE) += microcode.
###
# 64 bit specific files
ifeq ($(CONFIG_X86_64),y)
- obj-y += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o
+ obj-y += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
+ obj-y += bios_uv.o
+++ + + obj-y += genx2apic_cluster.o
+++ + + obj-y += genx2apic_phys.o
obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o
obj-$(CONFIG_AUDIT) += audit_64.o
diff --cc arch/x86/kernel/ptrace.c
index e375b658efc3,42ec4421e10b,e37dccce85db,e37dccce85db,a7835f282936,e375b658efc3,e37dccce85db,e375b658efc3,4e1ef66c2ea4,e375b658efc3,e37dccce85db..0a6d8c12e10d
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@@@@@@@@@@@ -555,87 -555,87 -554,18 -554,18 -554,18 -555,87 -554,18 -555,87 -557,110 -555,87 -554,18 +557,110 @@@@@@@@@@@@ static int ptrace_set_debugreg(struct t
return 0;
}
--- - -#ifdef X86_BTS
++++++++ ++/*
++++++++ ++ * These access the current or another (stopped) task's io permission
++++++++ ++ * bitmap for debugging or core dump.
++++++++ ++ */
++++++++ ++static int ioperm_active(struct task_struct *target,
++++++++ ++ const struct user_regset *regset)
++++++++ ++{
++++++++ ++ return target->thread.io_bitmap_max / regset->size;
++++++++ ++}
++ + + +
--- - -static int ptrace_bts_get_size(struct task_struct *child)
++++++++ ++static int ioperm_get(struct task_struct *target,
++++++++ ++ const struct user_regset *regset,
++++++++ ++ unsigned int pos, unsigned int count,
++++++++ ++ void *kbuf, void __user *ubuf)
++ + + + {
--- - - if (!child->thread.ds_area_msr)
++++++++ ++ if (!target->thread.io_bitmap_ptr)
++ + + + return -ENXIO;
++ + + +
--- - - return ds_get_bts_index((void *)child->thread.ds_area_msr);
++++++++ ++ return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
++++++++ ++ target->thread.io_bitmap_ptr,
++++++++ ++ 0, IO_BITMAP_BYTES);
++++++++ ++}
++++++++ ++
+++ + +#ifdef CONFIG_X86_PTRACE_BTS
+++ + +/*
+++ + + * The configuration for a particular BTS hardware implementation.
+++ + + */
+++ + +struct bts_configuration {
+++ + + /* the size of a BTS record in bytes; at most BTS_MAX_RECORD_SIZE */
+++ + + unsigned char sizeof_bts;
+++ + + /* the size of a field in the BTS record in bytes */
+++ + + unsigned char sizeof_field;
+++ + + /* a bitmask to enable/disable BTS in DEBUGCTL MSR */
+++ + + unsigned long debugctl_mask;
+++ + +};
+++ + +static struct bts_configuration bts_cfg;
+++ + +
+++ + +#define BTS_MAX_RECORD_SIZE (8 * 3)
+++ + +
+++ + +
+++ + +/*
+++ + + * Branch Trace Store (BTS) uses the following format. Different
+++ + + * architectures vary in the size of those fields.
+++ + + * - source linear address
+++ + + * - destination linear address
+++ + + * - flags
+++ + + *
+++ + + * Later architectures use 64bit pointers throughout, whereas earlier
+++ + + * architectures use 32bit pointers in 32bit mode.
+++ + + *
+++ + + * We compute the base address for the first 8 fields based on:
+++ + + * - the field size stored in the DS configuration
+++ + + * - the relative field position
+++ + + *
+++ + + * In order to store additional information in the BTS buffer, we use
+++ + + * a special source address to indicate that the record requires
+++ + + * special interpretation.
+++ + + *
+++ + + * Netburst indicated via a bit in the flags field whether the branch
+++ + + * was predicted; this is ignored.
+++ + + */
+++ + +
+++ + +enum bts_field {
+++ + + bts_from = 0,
+++ + + bts_to,
+++ + + bts_flags,
+++ + +
+++ + + bts_escape = (unsigned long)-1,
+++ + + bts_qual = bts_to,
+++ + + bts_jiffies = bts_flags
+++ + +};
+++ + +
+++ + +static inline unsigned long bts_get(const char *base, enum bts_field field)
+++ + +{
+++ + + base += (bts_cfg.sizeof_field * field);
+++ + + return *(unsigned long *)base;
+++ + +}
+++ + +
+++ + +static inline void bts_set(char *base, enum bts_field field, unsigned long val)
+++ + +{
+++ + + base += (bts_cfg.sizeof_field * field);;
+++ + + (*(unsigned long *)base) = val;
+++ + +}
+++ + +
+++ + +/*
+++ + + * Translate a BTS record from the raw format into the bts_struct format
+++ + + *
+++ + + * out (out): bts_struct interpretation
+++ + + * raw: raw BTS record
+++ + + */
+++ + +static void ptrace_bts_translate_record(struct bts_struct *out, const void *raw)
+++ + +{
+++ + + memset(out, 0, sizeof(*out));
+++ + + if (bts_get(raw, bts_from) == bts_escape) {
+++ + + out->qualifier = bts_get(raw, bts_qual);
+++ + + out->variant.jiffies = bts_get(raw, bts_jiffies);
+++ + + } else {
+++ + + out->qualifier = BTS_BRANCH;
+++ + + out->variant.lbr.from_ip = bts_get(raw, bts_from);
+++ + + out->variant.lbr.to_ip = bts_get(raw, bts_to);
+++ + + }
}
--- - -static int ptrace_bts_read_record(struct task_struct *child,
--- - - long index,
+++ + +static int ptrace_bts_read_record(struct task_struct *child, size_t index,
struct bts_struct __user *out)
{
struct bts_struct ret;
@@@@@@@@@@@@ -715,49 -715,49 -647,41 -647,41 -647,41 -715,49 -647,41 -715,49 -740,49 -715,49 -647,41 +740,49 @@@@@@@@@@@@ static int ptrace_bts_config(struct tas
const struct ptrace_bts_config __user *ucfg)
{
struct ptrace_bts_config cfg;
--- - - int bts_size, ret = 0;
--- - - void *ds;
+++ + + int error = 0;
+
+++ + + error = -EOPNOTSUPP;
+++ + + if (!bts_cfg.sizeof_bts)
+++ + + goto errout;
++ + +
+++ + + error = -EIO;
if (cfg_size < sizeof(cfg))
--- - - return -EIO;
+++ + + goto errout;
+++ + + error = -EFAULT;
if (copy_from_user(&cfg, ucfg, sizeof(cfg)))
--- - - return -EFAULT;
+++ + + goto errout;
--- - - if ((int)cfg.size < 0)
--- - - return -EINVAL;
+++ + + error = -EINVAL;
+++ + + if ((cfg.flags & PTRACE_BTS_O_SIGNAL) &&
+++ + + !(cfg.flags & PTRACE_BTS_O_ALLOC))
+++ + + goto errout;
--- - - bts_size = 0;
--- - - ds = (void *)child->thread.ds_area_msr;
--- - - if (ds) {
--- - - bts_size = ds_get_bts_size(ds);
--- - - if (bts_size < 0)
--- - - return bts_size;
--- - - }
--- - - cfg.size = PAGE_ALIGN(cfg.size);
+++ + + if (cfg.flags & PTRACE_BTS_O_ALLOC) {
+++ + + ds_ovfl_callback_t ovfl = NULL;
+++ + + unsigned int sig = 0;
+++ + +
+++ + + /* we ignore the error in case we were not tracing child */
+++ + + (void)ds_release_bts(child);
++ + +
- if (bts_size != cfg.size) {
- ret = ptrace_bts_realloc(child, cfg.size,
- cfg.flags & PTRACE_BTS_O_CUT_SIZE);
- if (ret < 0)
+++ + + if (cfg.flags & PTRACE_BTS_O_SIGNAL) {
+++ + + if (!cfg.signal)
+++ + + goto errout;
+++ + +
+++ + + sig = cfg.signal;
+++ + + ovfl = ptrace_bts_ovfl;
+++ + + }
+
-- - - if (bts_size != cfg.size) {
-- - - ret = ptrace_bts_realloc(child, cfg.size,
-- - - cfg.flags & PTRACE_BTS_O_CUT_SIZE);
-- - - if (ret < 0)
+++ + + error = ds_request_bts(child, /* base = */ NULL, cfg.size, ovfl);
+++ + + if (error < 0)
goto errout;
--- - - ds = (void *)child->thread.ds_area_msr;
+++ + + child->thread.bts_ovfl_signal = sig;
}
--- - - if (cfg.flags & PTRACE_BTS_O_SIGNAL)
--- - - ret = ds_set_overflow(ds, DS_O_SIGNAL);
--- - - else
--- - - ret = ds_set_overflow(ds, DS_O_WRAP);
--- - - if (ret < 0)
+++ + + error = -EINVAL;
+++ + + if (!child->thread.ds_ctx && cfg.flags)
goto errout;
if (cfg.flags & PTRACE_BTS_O_TRACE)
@@@@@@@@@@@@ -834,35 -834,35 -747,86 -747,86 -747,86 -834,35 -747,86 -834,35 -859,35 -834,35 -747,86 +859,35 @@@@@@@@@@@@ static int ptrace_bts_status(struct tas
static int ptrace_bts_write_record(struct task_struct *child,
const struct bts_struct *in)
{
--- - - int retval;
+++ + + unsigned char bts_record[BTS_MAX_RECORD_SIZE];
--- - - if (!child->thread.ds_area_msr)
--- - - return -ENXIO;
+++ + + BUG_ON(BTS_MAX_RECORD_SIZE < bts_cfg.sizeof_bts);
--- - - retval = ds_write_bts((void *)child->thread.ds_area_msr, in);
--- - - if (retval)
--- - - return retval;
+++ + + memset(bts_record, 0, bts_cfg.sizeof_bts);
+++ + + switch (in->qualifier) {
+++ + + case BTS_INVALID:
+++ + + break;
--- - - return sizeof(*in);
--- - -}
+++ + + case BTS_BRANCH:
+++ + + bts_set(bts_record, bts_from, in->variant.lbr.from_ip);
+++ + + bts_set(bts_record, bts_to, in->variant.lbr.to_ip);
+++ + + break;
--- - -static int ptrace_bts_realloc(struct task_struct *child,
--- - - int size, int reduce_size)
--- - -{
--- - - unsigned long rlim, vm;
--- - - int ret, old_size;
+++ + + case BTS_TASK_ARRIVES:
+++ + + case BTS_TASK_DEPARTS:
+++ + + bts_set(bts_record, bts_from, bts_escape);
+++ + + bts_set(bts_record, bts_qual, in->qualifier);
+++ + + bts_set(bts_record, bts_jiffies, in->variant.jiffies);
+++ + + break;
--- - - if (size < 0)
+++ + + default:
return -EINVAL;
--- - -
--- - - old_size = ds_get_bts_size((void *)child->thread.ds_area_msr);
--- - - if (old_size < 0)
--- - - return old_size;
--- - -
--- - - ret = ds_free((void **)&child->thread.ds_area_msr);
--- - - if (ret < 0)
--- - - goto out;
--- - -
--- - - size >>= PAGE_SHIFT;
--- - - old_size >>= PAGE_SHIFT;
--- - -
--- - - current->mm->total_vm -= old_size;
--- - - current->mm->locked_vm -= old_size;
--- - -
--- - - if (size == 0)
--- - - goto out;
--- - -
--- - - rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
--- - - vm = current->mm->total_vm + size;
--- - - if (rlim < vm) {
--- - - ret = -ENOMEM;
--- - -
--- - - if (!reduce_size)
--- - - goto out;
--- - -
--- - - size = rlim - current->mm->total_vm;
-- - - if (size <= 0)
-- - - goto out;
-- - - }
-- - -
-- - - rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
-- - - vm = current->mm->locked_vm + size;
-- - - if (rlim < vm) {
-- - - ret = -ENOMEM;
-- - -
-- - - if (!reduce_size)
-- - - goto out;
-- - -
-- - - size = rlim - current->mm->locked_vm;
--- - - if (size <= 0)
--- - - goto out;
}
- rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
- vm = current->mm->locked_vm + size;
- if (rlim < vm) {
- ret = -ENOMEM;
-
- if (!reduce_size)
- goto out;
-
- size = rlim - current->mm->locked_vm;
- if (size <= 0)
- goto out;
- }
-
--- - - ret = ds_allocate((void **)&child->thread.ds_area_msr,
--- - - size << PAGE_SHIFT);
--- - - if (ret < 0)
--- - - goto out;
--- - -
--- - - current->mm->total_vm += size;
--- - - current->mm->locked_vm += size;
--- - -
--- - -out:
--- - - if (child->thread.ds_area_msr)
--- - - set_tsk_thread_flag(child, TIF_DS_AREA_MSR);
--- - - else
--- - - clear_tsk_thread_flag(child, TIF_DS_AREA_MSR);
--- - -
--- - - return ret;
+++ + + /* The writing task will be the switched-to task on a context
+++ + + * switch. It needs to write into the switched-from task's BTS
+++ + + * buffer. */
+++ + + return ds_unchecked_write_bts(child, bts_record, bts_cfg.sizeof_bts);
}
void ptrace_bts_take_timestamp(struct task_struct *tsk,
@@@@@@@@@@@@ -1452,7 -1452,8 -1357,7 -1357,7 -1357,9 -1452,7 -1357,7 -1452,7 -1489,7 -1452,7 -1357,7 +1489,8 @@@@@@@@@@@@ const struct user_regset_view *task_use
#endif
}
- #ifdef CONFIG_X86_32
-
- ---------void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
+ +++++++++void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+ +++++++++ int error_code, int si_code)
{
struct siginfo info;
@@@@@@@@@@@@ -1470,45 -1471,45 -1375,68 -1375,68 -1377,121 -1470,45 -1375,68 -1470,45 -1507,45 -1470,45 -1375,68 +1508,45 @@@@@@@@@@@@
force_sig_info(SIGTRAP, &info, tsk);
}
-- - -static void syscall_trace(struct pt_regs *regs)
- /* notification of system call entry/exit
- * - triggered by current->work.syscall_trace
- */
- int do_syscall_trace(struct pt_regs *regs, int entryexit)
--- - -{
-- - - if (!(current->ptrace & PT_PTRACED))
-- - - return;
-- - -
-- - -#if 0
-- - - printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n",
-- - - current->comm,
-- - - regs->ip, regs->sp, regs->ax, regs->orig_ax, __builtin_return_address(0),
-- - - current_thread_info()->flags, current->ptrace);
-- - -#endif
-- - -
-- - - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-- - - ? 0x80 : 0));
- int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU);
--- - - /*
-- - - * this isn't the same as continuing with a signal, but it will do
-- - - * for normal use. strace only continues with a signal if the
-- - - * stopping signal is not SIGTRAP. -brl
- * With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall
- * interception
--- - - */
-- - - if (current->exit_code) {
-- - - send_sig(current->exit_code, current, 1);
-- - - current->exit_code = 0;
-- - - }
-- - -}
- int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP);
- int ret = 0;
- /* do the secure computing check first */
- if (!entryexit)
- secure_computing(regs->orig_ax);
-
- if (unlikely(current->audit_context)) {
- if (entryexit)
- audit_syscall_exit(AUDITSC_RESULT(regs->ax),
- regs->ax);
- /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
- * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
- * not used, entry.S will call us only on syscall exit, not
- * entry; so when TIF_SYSCALL_AUDIT is used we must avoid
- * calling send_sigtrap() on syscall entry.
- *
- * Note that when PTRACE_SYSEMU_SINGLESTEP is used,
- * is_singlestep is false, despite his name, so we will still do
- * the correct thing.
- */
- else if (is_singlestep)
- goto out;
- }
-
- if (!(current->ptrace & PT_PTRACED))
- goto out;
-
- /* If a process stops on the 1st tracepoint with SYSCALL_TRACE
- * and then is resumed with SYSEMU_SINGLESTEP, it will come in
- * here. We have to check this and return */
- if (is_sysemu && entryexit)
- return 0;
-
- /* Fake a debug trap */
- if (is_singlestep)
- send_sigtrap(current, regs, 0);
-
- if (!test_thread_flag(TIF_SYSCALL_TRACE) && !is_sysemu)
- goto out;
-
- /* the 0x80 provides a way for the tracing parent to distinguish
- between a syscall stop and SIGTRAP delivery */
- /* Note that the debugger could change the result of test_thread_flag!*/
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80:0));
-
- /*
- * this isn't the same as continuing with a signal, but it will do
- * for normal use. strace only continues with a signal if the
- * stopping signal is not SIGTRAP. -brl
- */
- if (current->exit_code) {
- send_sig(current->exit_code, current, 1);
- current->exit_code = 0;
- }
- ret = is_sysemu;
- out:
- if (unlikely(current->audit_context) && !entryexit)
- audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_ax,
- regs->bx, regs->cx, regs->dx, regs->si);
- if (ret == 0)
- return 0;
-
- regs->orig_ax = -1; /* force skip of syscall restarting */
- if (unlikely(current->audit_context))
- audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
- return 1;
- }
-
- #else /* CONFIG_X86_64 */
+ #ifdef CONFIG_X86_32
+ # define IS_IA32 1
+ #elif defined CONFIG_IA32_EMULATION
+ # define IS_IA32 test_thread_flag(TIF_IA32)
+ #else
+ # define IS_IA32 0
+ #endif
- static void syscall_trace(struct pt_regs *regs)
+ /*
+ * We must return the syscall number to actually look up in the table.
+ * This can be -1L to skip running any syscall at all.
+ */
+ asmregparm long syscall_trace_enter(struct pt_regs *regs)
{
+ long ret = 0;
- #if 0
- printk("trace %s ip %lx sp %lx ax %d origrax %d caller %lx tiflags %x ptrace %x\n",
- current->comm,
- regs->ip, regs->sp, regs->ax, regs->orig_ax, __builtin_return_address(0),
- current_thread_info()->flags, current->ptrace);
- #endif
-
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
- ? 0x80 : 0));
/*
- * this isn't the same as continuing with a signal, but it will do
- * for normal use. strace only continues with a signal if the
- * stopping signal is not SIGTRAP. -brl
+ * If we stepped into a sysenter/syscall insn, it trapped in
+ * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
+ * If user-mode had set TF itself, then it's still clear from
+ * do_debug() and we need to set it again to restore the user
+ * state. If we entered on the slow path, TF was already set.
*/
- if (current->exit_code) {
- send_sig(current->exit_code, current, 1);
- current->exit_code = 0;
- }
- }
+ if (test_thread_flag(TIF_SINGLESTEP))
+ regs->flags |= X86_EFLAGS_TF;
- asmlinkage void syscall_trace_enter(struct pt_regs *regs)
- {
/* do the secure computing check first */
secure_computing(regs->orig_ax);
- if (test_thread_flag(TIF_SYSCALL_TRACE)
- && (current->ptrace & PT_PTRACED))
- syscall_trace(regs);
+ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
+ ret = -1L;
+
-- - - if (ret || test_thread_flag(TIF_SYSCALL_TRACE))
-- - - syscall_trace(regs);
+++ + + if ((ret || test_thread_flag(TIF_SYSCALL_TRACE)) &&
+++ + + tracehook_report_syscall_entry(regs))
+++ + + ret = -1L;
if (unlikely(current->audit_context)) {
- if (test_thread_flag(TIF_IA32)) {
+ if (IS_IA32)
audit_syscall_entry(AUDIT_ARCH_I386,
regs->orig_ax,
regs->bx, regs->cx,
@@@@@@@@@@@@ -1530,23 -1531,23 -1458,23 -1458,23 -1510,10 -1530,23 -1458,23 -1530,23 -1567,23 -1530,23 -1458,23 +1568,23 @@@@@@@@@@@@ asmregparm void syscall_trace_leave(str
if (unlikely(current->audit_context))
audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
- if ((test_thread_flag(TIF_SYSCALL_TRACE)
- || test_thread_flag(TIF_SINGLESTEP))
- && (current->ptrace & PT_PTRACED))
- syscall_trace(regs);
- }
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
-- - - syscall_trace(regs);
+++ + + tracehook_report_syscall_exit(regs, 0);
- #endif /* CONFIG_X86_32 */
+ /*
+ * If TIF_SYSCALL_EMU is set, we only get here because of
+ * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP).
+ * We already reported this syscall instruction in
+ * syscall_trace_enter(), so don't do any more now.
+ */
+ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
+ return;
+
+ /*
+ * If we are single-stepping, synthesize a trap to follow the
+ * system call instruction.
+ */
+ if (test_thread_flag(TIF_SINGLESTEP) &&
-- - - (current->ptrace & PT_PTRACED))
-- - - send_sigtrap(current, regs, 0);
+++ + + tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL))
- - --- send_sigtrap(current, regs, 0);
+ +++++++++ send_sigtrap(current, regs, 0, TRAP_BRKPT);
+ }
diff --cc arch/x86/mm/ioremap.c
index 10b52309aefd,10b52309aefd,d4b6e6a29ae3,d4b6e6a29ae3,9dd3cb905971,6ab3196d12b4,016f335bbeea,6ab3196d12b4,6ab3196d12b4,6ab3196d12b4,d4b6e6a29ae3..8cbeda15cd29
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@@@@@@@@@@ -440,7 -440,7 -421,7 -421,7 -400,9 -440,7 -421,7 -440,7 -440,7 -440,7 -421,7 +459,7 @@@@@@@@@@@@ void unxlate_dev_mem_ptr(unsigned long
return;
}
- #ifdef CONFIG_X86_32
-
--- - -int __initdata early_ioremap_debug;
+++ + +static int __initdata early_ioremap_debug;
static int __init early_ioremap_debug_setup(char *str)
{
diff --cc drivers/video/Kconfig
index d85a74c64b54,d85a74c64b54,70d135e0cc47,70d135e0cc47,002b61b4f0f6,d85a74c64b54,70d135e0cc47,d85a74c64b54,d85a74c64b54,d85a74c64b54,3773d7d89243..f79c2040758b
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@@@@@@@@@@ -1969,22 -1969,22 -1974,35 -1974,35 -1937,18 -1969,22 -1974,35 -1969,22 -1969,22 -1969,22 -1972,35 +1967,22 @@@@@@@@@@@@ config FB_XILIN
framebuffer. ML300 carries a 640*480 LCD display on the board,
ML403 uses a standard DB15 VGA connector.
--- - -config FB_AM200EPD
--- - - tristate "AM-200 E-Ink EPD devkit support"
--- - - depends on FB && ARCH_PXA && MMU
--- - - select FB_SYS_FILLRECT
--- - - select FB_SYS_COPYAREA
--- - - select FB_SYS_IMAGEBLIT
--- - - select FB_SYS_FOPS
--- - - select FB_DEFERRED_IO
--- - - select FB_METRONOME
-- - - help
-- - - This enables support for the Metronome display controller used on
-- - - the E-Ink AM-200 EPD devkit.
-- - -
+ config FB_COBALT
+ tristate "Cobalt server LCD frame buffer support"
+ depends on FB && MIPS_COBALT
+
+ config FB_SH7760
+ bool "SH7760/SH7763 LCDC support"
+ depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763)
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
help
- This enables support for the Metronome display controller used on
- the E-Ink AM-200 EPD devkit.
+ Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller.
+ Supports display resolutions up to 1024x1024 pixel, grayscale and
+ color operation, with depths ranging from 1 bpp to 8 bpp monochrome
+ and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
+ panels <= 320 pixel horizontal resolution.
config FB_VIRTUAL
tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
diff --cc include/asm-x86/boot.h
index 825de5dc867c,825de5dc867c,2faed7ecb092,2faed7ecb092,2faed7ecb092,825de5dc867c,2faed7ecb092,825de5dc867c,825de5dc867c,825de5dc867c,7b287df4ab55..1d63bd5d5946
--- a/include/asm-x86/boot.h
+++ b/include/asm-x86/boot.h
@@@@@@@@@@@@ -1,10 -1,10 -1,10 -1,10 -1,10 -1,10 -1,10 -1,10 -1,10 -1,10 -1,8 +1,8 @@@@@@@@@@@@
--- - -#ifndef _ASM_BOOT_H
--- - -#define _ASM_BOOT_H
+++ + +#ifndef ASM_X86__BOOT_H
+++ + +#define ASM_X86__BOOT_H
/* Don't touch these, unless you really know what you're doing. */
---------- #define DEF_INITSEG 0x9000
#define DEF_SYSSEG 0x1000
---------- #define DEF_SETUPSEG 0x9020
#define DEF_SYSSIZE 0x7F00
/* Internal svga startup constants */
diff --cc include/asm-x86/page_32.h
index 72f7305682c6,72f7305682c6,ab8528793f08,ab8528793f08,71a2e424e584,72f7305682c6,ab8528793f08,72f7305682c6,72f7305682c6,72f7305682c6,ab8528793f08..9c5a737a9af9
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@@@@@@@@@@@ -89,13 -89,13 -89,15 -89,15 -85,8 -89,13 -89,15 -89,13 -89,13 -89,13 -89,15 +94,13 @@@@@@@@@@@@ extern int nx_enabled
extern unsigned int __VMALLOC_RESERVE;
extern int sysctl_legacy_va_layout;
--- - -#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
--- - -#define MAXMEM (-__PAGE_OFFSET - __VMALLOC_RESERVE)
-- - -
+ extern void find_low_pfn_range(void);
+ extern unsigned long init_memory_mapping(unsigned long start,
+ unsigned long end);
+ extern void initmem_init(unsigned long, unsigned long);
+++ + +extern void free_initmem(void);
+ extern void setup_bootmem_allocator(void);
+
#ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h>
diff --cc include/asm-x86/processor.h
index c7d35464a4bb,c7d35464a4bb,4df3e2f6fb56,c63a47651890,559105220a47,c7d35464a4bb,5f58da401b43,c7d35464a4bb,c7d35464a4bb,c7d35464a4bb,4df3e2f6fb56..ee7cbb30773a
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@@@@@@@@@@@ -156,9 -156,9 -153,7 -153,7 -153,7 -156,9 -153,7 -156,9 -156,9 -156,9 -153,7 +156,9 @@@@@@@@@@@@ static inline int hlt_works(int cpu
extern void cpu_detect(struct cpuinfo_x86 *c);
- extern void identify_cpu(struct cpuinfo_x86 *);
+++ + +extern struct pt_regs *idle_regs(struct pt_regs *);
+++ + +
+ extern void early_cpu_init(void);
extern void identify_boot_cpu(void);
extern void identify_secondary_cpu(struct cpuinfo_x86 *);
extern void print_cpu_info(struct cpuinfo_x86 *);
@@@@@@@@@@@@ -750,32 -750,32 -725,32 -690,32 -730,9 -750,32 -725,9 -750,32 -750,32 -750,32 -725,32 +715,32 @@@@@@@@@@@@ extern void mwait_idle_with_hints(unsig
extern void select_idle_routine(const struct cpuinfo_x86 *c);
extern unsigned long boot_option_idle_override;
+ extern unsigned long idle_halt;
+ extern unsigned long idle_nomwait;
+
+ + /*
+ + * on systems with caches, caches must be flashed as the absolute
+ + * last instruction before going into a suspended halt. Otherwise,
+ + * dirty data can linger in the cache and become stale on resume,
+ + * leading to strange errors.
+ + *
+ + * perform a variety of operations to guarantee that the compiler
+ + * will not reorder instructions. wbinvd itself is serializing
+ + * so the processor will not reorder.
+ + *
+ + * Systems without cache can just go into halt.
+ + */
+ + static inline void wbinvd_halt(void)
+ + {
+ + mb();
+ + /* check for clflush to determine if wbinvd is legal */
+ + if (cpu_has_clflush)
+ + asm volatile("cli; wbinvd; 1: hlt; jmp 1b" : : : "memory");
+ + else
+ + while (1)
+ + halt();
+ + }
+
extern void enable_sep_cpu(void);
extern int sysenter_setup(void);
diff --cc include/linux/mm.h
index 72a15dc26bbf,4194bf8e4f6c,72a15dc26bbf,72a15dc26bbf,3414a8813e97,72a15dc26bbf,d87a5a5fe87d,72a15dc26bbf,72a15dc26bbf,72a15dc26bbf,72a15dc26bbf..c61ba10768ea
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@@@@@@@@@@ -1023,10 -1023,10 -1023,10 -1023,10 -1003,9 -1023,10 -1009,11 -1023,10 -1023,10 -1023,10 -1023,10 +1018,10 @@@@@@@@@@@@ extern unsigned long absent_pages_in_ra
extern void get_pfn_range_for_nid(unsigned int nid,
unsigned long *start_pfn, unsigned long *end_pfn);
extern unsigned long find_min_pfn_with_active_regions(void);
- - extern unsigned long find_max_pfn_with_active_regions(void);
extern void free_bootmem_with_active_regions(int nid,
unsigned long max_low_pfn);
+ typedef int (*work_fn_t)(unsigned long, unsigned long, void *);
+ extern void work_with_active_regions(int nid, work_fn_t work_fn, void *data);
extern void sparse_memory_present_with_active_regions(int nid);
#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
extern int early_pfn_to_nid(unsigned long pfn);
diff --cc lib/Kconfig.debug
index ce697e0b319e,ce697e0b319e,0b504814e378,0b504814e378,9d9dc0ddf13a,ce697e0b319e,e1d4764435ed,ce697e0b319e,ce697e0b319e,ce697e0b319e,0b504814e378..aa81d2848448
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@@@@@@@@@@ -580,36 -580,36 -580,23 -580,23 -550,6 -580,36 -580,23 -580,36 -580,36 -580,36 -580,23 +589,36 @@@@@@@@@@@@ config RCU_TORTURE_TES
Say M if you want the RCU torture tests to build as a module.
Say N if you are unsure.
+ config RCU_TORTURE_TEST_RUNNABLE
+ bool "torture tests for RCU runnable by default"
+ depends on RCU_TORTURE_TEST = y
+ default n
+ help
+ This option provides a way to build the RCU torture tests
+ directly into the kernel without them starting up at boot
+ time. You can use /proc/sys/kernel/rcutorture_runnable
+ to manually override this setting. This /proc file is
+ available only when the RCU torture tests have been built
+ into the kernel.
+
+ Say Y here if you want the RCU torture tests to start during
+ boot (you probably don't).
+ Say N here if you want the RCU torture tests to start only
+ after being manually enabled via /proc.
+
+++ + +config RCU_CPU_STALL_DETECTOR
+++ + + bool "Check for stalled CPUs delaying RCU grace periods"
+++ + + depends on CLASSIC_RCU
+++ + + default n
+++ + + help
+++ + + This option causes RCU to printk information on which
+++ + + CPUs are delaying the current grace period, but only when
+++ + + the grace period extends for excessive time periods.
+++ + +
+++ + + Say Y if you want RCU to perform such checks.
+++ + +
+++ + + Say N if you are unsure.
+++ + +
config KPROBES_SANITY_TEST
bool "Kprobes sanity tests"
depends on DEBUG_KERNEL
@@@@@@@@@@@@ -632,33 -632,33 -619,11 -619,11 -572,8 -632,33 -619,11 -632,33 -632,33 -632,33 -619,11 +641,33 @@@@@@@@@@@@ config BACKTRACE_SELF_TES
for distributions or general kernels, but only for kernel
developers working on architecture code.
+ Note that if you want to also test saved backtraces, you will
+ have to enable STACKTRACE as well.
+
+ Say N if you are unsure.
+
+++ + +config DEBUG_BLOCK_EXT_DEVT
+++ + + bool "Force extended block device numbers and spread them"
+++ + + depends on DEBUG_KERNEL
+++ + + depends on BLOCK
+++ + + default n
+++ + + help
+++ + + Conventionally, block device numbers are allocated from
+++ + + predetermined contiguous area. However, extended block area
+++ + + may introduce non-contiguous block device numbers. This
+++ + + option forces most block device numbers to be allocated from
+++ + + the extended space and spreads them to discover kernel or
+++ + + userland code paths which assume predetermined contiguous
+++ + + device number allocation.
+++ + +
+++ + + Note that turning on this debug option shuffles all the
+++ + + device numbers for all IDE and SCSI devices including libata
+++ + + ones, so root partition specified using device number
+++ + + directly (via rdev or root=MAJ:MIN) won't work anymore.
+++ + + Textual device names (root=/dev/sdXn) will continue to work.
+++ + +
++ + + Say N if you are unsure.
++ + +
config LKDTM
tristate "Linux Kernel Dump Test Tool Module"
depends on DEBUG_KERNEL
@@@@@@@@@@@@ -739,16 -739,16 -693,16 -693,16 -643,6 -739,16 -693,8 -739,16 -739,16 -739,16 -693,16 +748,16 @@@@@@@@@@@@ config LATENCYTO
Enable this option if you want to use the LatencyTOP tool
to find out which userspace is blocking on what kernel operations.
+ + config SYSCTL_SYSCALL_CHECK
+ + bool "Sysctl checks"
+ + depends on SYSCTL_SYSCALL
+ + ---help---
+ + sys_sysctl uses binary paths that have been found challenging
+ + to properly maintain and use. This enables checks that help
+ + you to keep things correct.
+ +
+ source kernel/trace/Kconfig
+
config PROVIDE_OHCI1394_DMA_INIT
bool "Remote debugging over FireWire early on boot"
depends on PCI && X86
commit 1db5fff9aeab18566eb380e354629fdbbe7792f0
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 15:40:45 2008 +0200
x86: make processor type select depend on CONFIG_EMBEDDED
deselecting one of the CPU type CONFIG_CPU_SUP_* config options
can render a kernel unbootable. Make sure this option is only
available if CONFIG_EMBEDDED is enabled.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index a2ea1488b37e..c5f101360520 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -420,7 +420,6 @@ config X86_DEBUGCTLMSR
depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)
menuconfig PROCESSOR_SELECT
- default y
bool "Supported processor vendors" if EMBEDDED
help
This lets you choose what x86 vendor support code your kernel
commit b7b3a42533e1e41297fe517533375f9f8f7b92d0
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 15:36:24 2008 +0200
x86: extend processor type select help text
extend the help text of the CONFIG_CPU_SUP_* config options to
express what it does and what effects it has.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index f8843c3ae77d..a2ea1488b37e 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -430,48 +430,97 @@ config CPU_SUP_INTEL
default y
bool "Support Intel processors" if PROCESSOR_SELECT
help
- This enables extended support for Intel processors
+ This enables detection, tunings and quirks for Intel processors
+
+ You need this enabled if you want your kernel to run on an
+ Intel CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on an Intel
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_CYRIX_32
default y
bool "Support Cyrix processors" if PROCESSOR_SELECT
depends on !64BIT
help
- This enables extended support for Cyrix processors
+ This enables detection, tunings and quirks for Cyrix processors
+
+ You need this enabled if you want your kernel to run on a
+ Cyrix CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on a Cyrix
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_AMD
default y
bool "Support AMD processors" if PROCESSOR_SELECT
help
- This enables extended support for AMD processors
+ This enables detection, tunings and quirks for AMD processors
+
+ You need this enabled if you want your kernel to run on an
+ AMD CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on an AMD
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_CENTAUR_32
default y
bool "Support Centaur processors" if PROCESSOR_SELECT
depends on !64BIT
help
- This enables extended support for Centaur processors
+ This enables detection, tunings and quirks for Centaur processors
+
+ You need this enabled if you want your kernel to run on a
+ Centaur CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on a Centaur
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_CENTAUR_64
default y
bool "Support Centaur processors" if PROCESSOR_SELECT
depends on 64BIT
help
- This enables extended support for Centaur processors
+ This enables detection, tunings and quirks for Centaur processors
+
+ You need this enabled if you want your kernel to run on a
+ Centaur CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on a Centaur
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_TRANSMETA_32
default y
bool "Support Transmeta processors" if PROCESSOR_SELECT
depends on !64BIT
help
- This enables extended support for Transmeta processors
+ This enables detection, tunings and quirks for Transmeta processors
+
+ You need this enabled if you want your kernel to run on a
+ Transmeta CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on a Transmeta
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config CPU_SUP_UMC_32
default y
bool "Support UMC processors" if PROCESSOR_SELECT
depends on !64BIT
help
- This enables extended support for UMC processors
+ This enables detection, tunings and quirks for UMC processors
+
+ You need this enabled if you want your kernel to run on a
+ UMC CPU. Disabling this option on other types of CPUs
+ makes the kernel a tiny bit smaller. Disabling it on a UMC
+ CPU might render the kernel unbootable.
+
+ If unsure, say N.
config X86_DS
bool "Debug Store support"
commit 8a66712ba0969aea5580b9e312badfc2490fc614
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 15:24:53 2008 +0200
x86, amd-iommu: propagate PCI device enabling error
propagate an error in enabling the PCI device.
Also eliminates this warning:
arch/x86/kernel/amd_iommu_init.c: In function ‘init_iommu_one’:
arch/x86/kernel/amd_iommu_init.c:726: warning: ignoring return value of ‘pci_enable_device’, declared with attribute warn_unused_result
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 148fcfe22f17..4cd8083c58be 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -723,9 +723,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)
init_iommu_from_acpi(iommu, h);
init_iommu_devices(iommu);
- pci_enable_device(iommu->dev);
-
- return 0;
+ return pci_enable_device(iommu->dev);
}
/*
commit d562353a4533c4671af683499191707c9a77c406
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Oct 12 15:22:22 2008 +0200
warnings: fix arch/x86/kernel/io_apic_64.c
fix:
arch/x86/kernel/io_apic_64.c: In function ‘print_local_APIC’:
arch/x86/kernel/io_apic_64.c:1284: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’
arch/x86/kernel/io_apic_64.c:1285: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’
We want to print the two halves of 'icr' at 32 bit width.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index a1bec2969c6a..02063ae042f7 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1281,8 +1281,8 @@ __apicdebuginit(void) print_local_APIC(void *dummy)
printk(KERN_DEBUG "... APIC ESR: %08x\n", v);
icr = apic_icr_read();
- printk(KERN_DEBUG "... APIC ICR: %08x\n", icr);
- printk(KERN_DEBUG "... APIC ICR2: %08x\n", icr >> 32);
+ printk(KERN_DEBUG "... APIC ICR: %08x\n", (u32)icr);
+ printk(KERN_DEBUG "... APIC ICR2: %08x\n", (u32)(icr >> 32));
v = apic_read(APIC_LVTT);
printk(KERN_DEBUG "... APIC LVTT: %08x\n", v);