rpms/kernel/F-8 linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch, NONE, 1.1 linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch, NONE, 1.1 linux-2.6-alsa-hda-codec-add-AD1884A.patch, NONE, 1.1 linux-2.6-utrace.patch, 1.67, 1.68 linux-2.6.25.tar.bz2.sign, NONE, 1.1 patch-2.6.25.4.bz2.sign, NONE, 1.1 .cvsignore, 1.721, 1.722 config-debug, 1.6, 1.7 config-generic, 1.64, 1.65 config-i586, 1.4, 1.5 config-i686, 1.2, 1.3 config-ia64-generic, 1.5, 1.6 config-nodebug, 1.8, 1.9 config-powerpc-generic, 1.12, 1.13 config-powerpc32-generic, 1.4, 1.5 config-powerpc64, 1.7, 1.8 config-s390x, 1.3, 1.4 config-sparc64-generic, 1.9, 1.10 config-x86-generic, 1.20, 1.21 config-x86_64-generic, 1.21, 1.22 kernel.spec, 1.440, 1.441 sources, 1.682, 1.683 upstream, 1.603, 1.604 linux-2.6-alsa-drivers-set-device-links.patch, 1.1, NONE linux-2.6-alsa-hda-fix-waitloop.patch, 1.1, NONE linux-2.6-alsa-hda-stac-add-delay.patch, 1.1, NONE linux-2.6-alsa-hda-stac-dmic.patch, 1.1, NONE linux-2.6-alsa-support-sis7019.patch, 1.1, NONE linux-2.6-utrace-core.patch, 1.10, NONE linux-2.6-utrace-ptrace-compat-avr32.patch, 1.4, NONE linux-2.6-utrace-ptrace-compat-ia64.patch, 1.5, NONE linux-2.6-utrace-ptrace-compat-s390.patch, 1.3, NONE linux-2.6-utrace-ptrace-compat-sparc64.patch, 1.2, NONE linux-2.6-utrace-ptrace-compat.patch, 1.11, NONE linux-2.6-utrace-regset-avr32.patch, 1.4, NONE linux-2.6-utrace-regset-ia64.patch, 1.5, NONE linux-2.6-utrace-regset-s390.patch, 1.4, NONE linux-2.6-utrace-regset-sparc64.patch, 1.3, NONE linux-2.6-utrace-regset.patch, 1.10, NONE linux-2.6-utrace-tracehook-avr32.patch, 1.3, NONE linux-2.6-utrace-tracehook-ia64.patch, 1.5, NONE linux-2.6-utrace-tracehook-s390.patch, 1.3, NONE linux-2.6-utrace-tracehook-sparc64.patch, 1.2, NONE linux-2.6-utrace-tracehook-um.patch, 1.4, NONE linux-2.6-utrace-tracehook.patch, 1.20, NONE linux-2.6.24.tar.bz2.sign, 1.1, NONE linux-x86-mtrr-013d23e1567c4cebee0a2db5c8fa97b91b34ac2a.patch, 1.1, NONE linux-x86-mtrr-04e1ba852132c9ad006affcd5b8c8606295170b0.patch, 1.1, NONE linux-x86-mtrr-093af8d7f0ba3c6be1485973508584ef081e9f93.patch, 1.1, NONE linux-x86-mtrr-0b9c99b6f21c2e9e00938e9c57942ed71bfe4d21.patch, 1.1, NONE linux-x86-mtrr-16c02ed74361433a4fc5d8bd5f67abbac6e1c5ca.patch, 1.1, NONE linux-x86-mtrr-20651af9ac60fd6e31360688ad44861a7d05256a.patch, 1.1, NONE linux-x86-mtrr-2b16a2353814a513cdb5c5c739b76a19d7ea39ce.patch, 1.1, NONE linux-x86-mtrr-2d2ee8de5f6d26ef2942e0b449aa68d9236d5777.patch, 1.1, NONE linux-x86-mtrr-2f36fa13ce49ffd000249feaedfcbefbcc83a72f.patch, 1.1, NONE linux-x86-mtrr-31183ba8fd05b6ddc67ab4d726167cbc52e1b346.patch, 1.1, NONE linux-x86-mtrr-53756d3722172815f52272b28c6d5d5e9639adde.patch, 1.1, NONE linux-x86-mtrr-5548fecdff5617ba3a2f09f0e585e1ac6e1bd25c.patch, 1.1, NONE linux-x86-mtrr-5dca6a1bb014875a17289fdaae8c31e0a3641c99.patch, 1.1, NONE linux-x86-mtrr-7b11fb51567dedeaf6dc03f0135c0a8bb2399818.patch, 1.1, NONE linux-x86-mtrr-8c61b900ebb8ec5918ffd776ba1a61a5f022566d.patch, 1.1, NONE linux-x86-mtrr-99fc8d424bc5d803fe92cad56c068fe64e73747a.patch, 1.1, NONE linux-x86-mtrr-9a6b344ea967efa0bb5ca4cb5405f840652b66c4.patch, 1.1, NONE linux-x86-mtrr-a860b63c41f241c685245127a3d32f352cb04c12.patch, 1.1, NONE linux-x86-mtrr-aaf230424204864e2833dcc1da23e2cb0b9f39cd.patch, 1.1, NONE linux-x86-mtrr-c140df973c07ac328aafd19d4f4c413f2f8902df.patch, 1.1, NONE linux-x86-mtrr-c9cce83dd1d59f52e2c8f8c7d265ba4854c40785.patch, 1.1, NONE linux-x86-mtrr-cd7d72bb27a8c7502a602bdc299f1bb0a9357975.patch, 1.1, NONE linux-x86-mtrr-f5106d91f2bf9153d6420f9ebb8114f73f9ce66a.patch, 1.1, NONE patch-2.6.24.7.bz2.sign, 1.1, NONE

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Wed May 21 20:42:55 UTC 2008 

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19357

Modified Files:
	.cvsignore config-debug config-generic config-i586 config-i686 
	config-ia64-generic config-nodebug config-powerpc-generic 
	config-powerpc32-generic config-powerpc64 config-s390x 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic kernel.spec sources upstream 
Added Files:
	linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch 
	linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch 
	linux-2.6-alsa-hda-codec-add-AD1884A.patch 
	linux-2.6-utrace.patch linux-2.6.25.tar.bz2.sign 
	patch-2.6.25.4.bz2.sign 
Removed Files:
	linux-2.6-alsa-drivers-set-device-links.patch 
	linux-2.6-alsa-hda-fix-waitloop.patch 
	linux-2.6-alsa-hda-stac-add-delay.patch 
	linux-2.6-alsa-hda-stac-dmic.patch 
	linux-2.6-alsa-support-sis7019.patch 
	linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat-avr32.patch 
	linux-2.6-utrace-ptrace-compat-ia64.patch 
	linux-2.6-utrace-ptrace-compat-s390.patch 
	linux-2.6-utrace-ptrace-compat-sparc64.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset-avr32.patch 
	linux-2.6-utrace-regset-ia64.patch 
	linux-2.6-utrace-regset-s390.patch 
	linux-2.6-utrace-regset-sparc64.patch 
	linux-2.6-utrace-regset.patch 
	linux-2.6-utrace-tracehook-avr32.patch 
	linux-2.6-utrace-tracehook-ia64.patch 
	linux-2.6-utrace-tracehook-s390.patch 
	linux-2.6-utrace-tracehook-sparc64.patch 
	linux-2.6-utrace-tracehook-um.patch 
	linux-2.6-utrace-tracehook.patch linux-2.6.24.tar.bz2.sign 
	linux-x86-mtrr-013d23e1567c4cebee0a2db5c8fa97b91b34ac2a.patch 
	linux-x86-mtrr-04e1ba852132c9ad006affcd5b8c8606295170b0.patch 
	linux-x86-mtrr-093af8d7f0ba3c6be1485973508584ef081e9f93.patch 
	linux-x86-mtrr-0b9c99b6f21c2e9e00938e9c57942ed71bfe4d21.patch 
	linux-x86-mtrr-16c02ed74361433a4fc5d8bd5f67abbac6e1c5ca.patch 
	linux-x86-mtrr-20651af9ac60fd6e31360688ad44861a7d05256a.patch 
	linux-x86-mtrr-2b16a2353814a513cdb5c5c739b76a19d7ea39ce.patch 
	linux-x86-mtrr-2d2ee8de5f6d26ef2942e0b449aa68d9236d5777.patch 
	linux-x86-mtrr-2f36fa13ce49ffd000249feaedfcbefbcc83a72f.patch 
	linux-x86-mtrr-31183ba8fd05b6ddc67ab4d726167cbc52e1b346.patch 
	linux-x86-mtrr-53756d3722172815f52272b28c6d5d5e9639adde.patch 
	linux-x86-mtrr-5548fecdff5617ba3a2f09f0e585e1ac6e1bd25c.patch 
	linux-x86-mtrr-5dca6a1bb014875a17289fdaae8c31e0a3641c99.patch 
	linux-x86-mtrr-7b11fb51567dedeaf6dc03f0135c0a8bb2399818.patch 
	linux-x86-mtrr-8c61b900ebb8ec5918ffd776ba1a61a5f022566d.patch 
	linux-x86-mtrr-99fc8d424bc5d803fe92cad56c068fe64e73747a.patch 
	linux-x86-mtrr-9a6b344ea967efa0bb5ca4cb5405f840652b66c4.patch 
	linux-x86-mtrr-a860b63c41f241c685245127a3d32f352cb04c12.patch 
	linux-x86-mtrr-aaf230424204864e2833dcc1da23e2cb0b9f39cd.patch 
	linux-x86-mtrr-c140df973c07ac328aafd19d4f4c413f2f8902df.patch 
	linux-x86-mtrr-c9cce83dd1d59f52e2c8f8c7d265ba4854c40785.patch 
	linux-x86-mtrr-cd7d72bb27a8c7502a602bdc299f1bb0a9357975.patch 
	linux-x86-mtrr-f5106d91f2bf9153d6420f9ebb8114f73f9ce66a.patch 
	patch-2.6.24.7.bz2.sign 
Log Message:
* Wed May 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-1
- Initial commit of kernel 2.6.25.4; does not build yet.


linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch:

--- NEW FILE linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch ---

# HG changeset patch
# User Takashi Iwai <tiwai at suse.de>
# Date 1209031211 -7200
# Node ID 1d5092ed14d824b517de8ae7c34d4178581f1121
# Parent 1cfed8b97c8b27440b632e3222a588ddc616b37c
[ALSA] hda-codec - Add model=mobile for AD1884A & co

Added the new model mobile for AD1884A and compatible codecs.
It's a reduced version of model=laptop.

Signed-off-by: Takashi Iwai <tiwai at suse.de>

committer: Takashi Iwai <tiwai at suse.de>

--- a/Documentation/sound/alsa/ALSA-Configuration.txt	Thu Apr 24 12:00:11 2008 +0200
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt	Thu Apr 24 12:00:11 2008 +0200
@@ -915,6 +915,7 @@ Prior to version 0.9.0rc4 options had a 
 	AD1884A / AD1883 / AD1984A / AD1984B
 	  desktop	3-stack desktop (default)
 	  laptop	laptop with HP jack sensing
+	  mobile	mobile devices with HP jack sensing
 
 	AD1884
 	  N/A
--- a/sound/pci/hda/patch_analog.c	Thu Apr 24 12:00:11 2008 +0200
+++ b/sound/pci/hda/patch_analog.c	Thu Apr 24 12:00:11 2008 +0200
@@ -3623,6 +3623,36 @@ static struct snd_kcontrol_new ad1884a_l
 	{ } /* end */
 };
 
+static struct hda_input_mux ad1884a_mobile_capture_source = {
+	.num_items = 2,
+	.items = {
+		{ "Mic", 0x1 }, /* port-C */
+		{ "Mix", 0x3 },
+	},
+};
+
+static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Boost", 0x15, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name = "Capture Source",
+		.info = ad198x_mux_enum_info,
+		.get = ad198x_mux_enum_get,
+		.put = ad198x_mux_enum_put,
+	},
+	{ } /* end */
+};
+
 /* mute internal speaker if HP is plugged */
 static void ad1884a_hp_automute(struct hda_codec *codec)
 {
@@ -3677,12 +3707,19 @@ enum {
 enum {
 	AD1884A_DESKTOP,
 	AD1884A_LAPTOP,
+	AD1884A_MOBILE,
 	AD1884A_MODELS
 };
 
 static const char *ad1884a_models[AD1884A_MODELS] = {
 	[AD1884A_DESKTOP]	= "desktop",
 	[AD1884A_LAPTOP]	= "laptop",
+	[AD1884A_MOBILE]	= "mobile",
+};
+
+static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
+	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
+	{}
 };
 
 static int patch_ad1884a(struct hda_codec *codec)
@@ -3717,13 +3754,22 @@ static int patch_ad1884a(struct hda_code
 
 	/* override some parameters */
 	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS,
-						  ad1884a_models, NULL);
+						  ad1884a_models,
+						  ad1884a_cfg_tbl);
 	switch (board_config) {
 	case AD1884A_LAPTOP:
 		spec->mixers[0] = ad1884a_laptop_mixers;
 		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
 		spec->multiout.dig_out_nid = 0;
 		spec->input_mux = &ad1884a_laptop_capture_source;
+		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
+		codec->patch_ops.init = ad1884a_hp_init;
+		break;
+	case AD1884A_MOBILE:
+		spec->mixers[0] = ad1884a_mobile_mixers;
+		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
+		spec->multiout.dig_out_nid = 0;
+		spec->input_mux = &ad1884a_mobile_capture_source;
 		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
 		codec->patch_ops.init = ad1884a_hp_init;
 		break;


linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch:

--- NEW FILE linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f081374b607f2656ca79a94d96d99cd5a2f60b68
Commit:     f081374b607f2656ca79a94d96d99cd5a2f60b68
Parent:     c0bbf48db35fec29c39c8a7826ca271069537e57
Author:     Takashi Iwai <tiwai at suse.de>
AuthorDate: Tue Mar 18 12:13:03 2008 +0100
Committer:  Takashi Iwai <tiwai at suse.de>
CommitDate: Thu Apr 24 12:00:27 2008 +0200

    [ALSA] hda-codec - Support of Lenovo Thinkpad X300
    
    Added the model thinkpad for Lenovo Thinkpad X300 with AD1984A codec.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 Documentation/sound/alsa/ALSA-Configuration.txt |    1 +
 sound/pci/hda/patch_analog.c                    |   94 +++++++++++++++++++++++
 2 files changed, 95 insertions(+), 0 deletions(-)

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index b024043..42dd8f5 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -923,6 +923,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 	  desktop	3-stack desktop (default)
 	  laptop	laptop with HP jack sensing
 	  mobile	mobile devices with HP jack sensing
+	  thinkpad	Lenovo Thinkpad X300
 
 	AD1884
 	  N/A
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 220784b..2befeeb 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -3702,12 +3702,95 @@ static struct hda_verb ad1884a_laptop_verbs[] = {
 };
 
 /*
+ * Thinkpad X300
+ * 0x11 - HP
+ * 0x12 - speaker
+ * 0x14 - mic-in
+ * 0x17 - built-in mic
+ */
+
+static struct hda_verb ad1984a_thinkpad_verbs[] = {
+	/* HP unmute */
+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+	/* analog mix */
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+	/* turn on EAPD */
+	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
+	/* unsolicited event for pin-sense */
+	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
+	/* internal mic - dmic */
+	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+	{ } /* end */
+};
+
+static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name = "Capture Source",
+		.info = ad198x_mux_enum_info,
+		.get = ad198x_mux_enum_get,
+		.put = ad198x_mux_enum_put,
+	},
+	{ } /* end */
+};
+
+static struct hda_input_mux ad1984a_thinkpad_capture_source = {
+	.num_items = 3,
+	.items = {
+		{ "Mic", 0x0 },
+		{ "Internal Mic", 0x5 },
+		{ "Mix", 0x3 },
+	},
+};
+
+/* mute internal speaker if HP is plugged */
+static void ad1984a_thinkpad_automute(struct hda_codec *codec)
+{
+	unsigned int present;
+
+	present = snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0)
+		& AC_PINSENSE_PRESENCE;
+	snd_hda_codec_amp_stereo(codec, 0x12, HDA_OUTPUT, 0,
+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+}
+
+/* unsolicited event for HP jack sensing */
+static void ad1984a_thinkpad_unsol_event(struct hda_codec *codec,
+					 unsigned int res)
+{
+	if ((res >> 26) != AD1884A_HP_EVENT)
+		return;
+	ad1984a_thinkpad_automute(codec);
+}
+
+/* initialize jack-sensing, too */
+static int ad1984a_thinkpad_init(struct hda_codec *codec)
+{
+	ad198x_init(codec);
+	ad1984a_thinkpad_automute(codec);
+	return 0;
+}
+
+/*
  */
 
 enum {
 	AD1884A_DESKTOP,
 	AD1884A_LAPTOP,
 	AD1884A_MOBILE,
+	AD1884A_THINKPAD,
 	AD1884A_MODELS
 };
 
@@ -3715,10 +3798,12 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
 	[AD1884A_DESKTOP]	= "desktop",
 	[AD1884A_LAPTOP]	= "laptop",
 	[AD1884A_MOBILE]	= "mobile",
+	[AD1884A_THINKPAD]	= "thinkpad",
 };
 
 static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
+	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
 	{}
 };
 
@@ -3773,6 +3858,15 @@ static int patch_ad1884a(struct hda_codec *codec)
 		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
 		codec->patch_ops.init = ad1884a_hp_init;
 		break;
+	case AD1884A_THINKPAD:
+		spec->mixers[0] = ad1984a_thinkpad_mixers;
+		spec->init_verbs[spec->num_init_verbs++] =
+			ad1984a_thinkpad_verbs;
+		spec->multiout.dig_out_nid = 0;
+		spec->input_mux = &ad1984a_thinkpad_capture_source;
+		codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;
+		codec->patch_ops.init = ad1984a_thinkpad_init;
+		break;
 	}
 
 	return 0;


linux-2.6-alsa-hda-codec-add-AD1884A.patch:

--- NEW FILE linux-2.6-alsa-hda-codec-add-AD1884A.patch ---

# HG changeset patch
# User Takashi Iwai <tiwai at suse.de>
# Date 1209031211 -7200
# Node ID 1cfed8b97c8b27440b632e3222a588ddc616b37c
# Parent 7c9b73a176850a60fe13524f64830cfdeeb147cc
[ALSA] hda-codec - Add support of AD1883/1884A/1984A/1984B

Added the support of new AD codecs: AD1883, AD1884A, AD1984A and AD1984B.
These are almost compatible except for additional digital pins, etc.

Signed-off-by: Takashi Iwai <tiwai at suse.de>

committer: Takashi Iwai <tiwai at suse.de>

--- a/Documentation/sound/alsa/ALSA-Configuration.txt	Thu Apr 24 12:00:11 2008 +0200
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt	Thu Apr 24 12:00:11 2008 +0200
@@ -911,6 +911,10 @@ Prior to version 0.9.0rc4 options had a 
 	AD1882
 	  3stack	3-stack mode (default)
 	  6stack	6-stack mode
+
+	AD1884A / AD1883 / AD1984A / AD1984B
+	  desktop	3-stack desktop (default)
+	  laptop	laptop with HP jack sensing
 
 	AD1884
 	  N/A
--- a/sound/pci/hda/patch_analog.c	Thu Apr 24 12:00:11 2008 +0200
+++ b/sound/pci/hda/patch_analog.c	Thu Apr 24 12:00:11 2008 +0200
@@ -3411,6 +3411,329 @@ static int patch_ad1984(struct hda_codec
 
 
 /*
+ * AD1883 / AD1884A / AD1984A / AD1984B
+ *
+ * port-B (0x14) - front mic-in
+ * port-E (0x1c) - rear mic-in
+ * port-F (0x16) - CD / ext out
+ * port-C (0x15) - rear line-in
+ * port-D (0x12) - rear line-out
+ * port-A (0x11) - front hp-out
+ *
+ * AD1984A = AD1884A + digital-mic
+ * AD1883 = equivalent with AD1984A
+ * AD1984B = AD1984A + extra SPDIF-out
+ *
+ * FIXME:
+ * We share the single DAC for both HP and line-outs (see AD1884/1984).
+ */
+
+static hda_nid_t ad1884a_dac_nids[1] = {
+	0x03,
+};
+
+#define ad1884a_adc_nids	ad1884_adc_nids
+#define ad1884a_capsrc_nids	ad1884_capsrc_nids
+
+#define AD1884A_SPDIF_OUT	0x02
+
+static struct hda_input_mux ad1884a_capture_source = {
+	.num_items = 5,
+	.items = {
+		{ "Front Mic", 0x0 },
+		{ "Mic", 0x4 },
+		{ "Line", 0x1 },
+		{ "CD", 0x2 },
+		{ "Mix", 0x3 },
+	},
+};
+
+static struct snd_kcontrol_new ad1884a_base_mixers[] = {
+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
+	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),
+	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),
+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		/* The multiple "Capture Source" controls confuse alsamixer
+		 * So call somewhat different..
+		 */
+		/* .name = "Capture Source", */
+		.name = "Input Source",
+		.count = 2,
+		.info = ad198x_mux_enum_info,
+		.get = ad198x_mux_enum_get,
+		.put = ad198x_mux_enum_put,
+	},
+	/* SPDIF controls */
+	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
+		/* identical with ad1983 */
+		.info = ad1983_spdif_route_info,
+		.get = ad1983_spdif_route_get,
+		.put = ad1983_spdif_route_put,
+	},
+	{ } /* end */
+};
+
+/*
+ * initialization verbs
+ */
+static struct hda_verb ad1884a_init_verbs[] = {
+	/* DACs; unmute as default */
+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
+	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
+	/* Port-A (HP) mixer - route only from analog mixer */
+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+	/* Port-A pin */
+	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Port-D (Line-out) mixer - route only from analog mixer */
+	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+	/* Port-D pin */
+	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Mono-out mixer - route only from analog mixer */
+	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+	/* Mono-out pin */
+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Port-B (front mic) pin */
+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Port-C (rear line-in) pin */
+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Port-E (rear mic) pin */
+	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* no boost */
+	/* Port-F (CD) pin */
+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* Analog mixer; mute as default */
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, /* aux */
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+	/* Analog Mix output amp */
+	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* capture sources */
+	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},
+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},
+	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* SPDIF output amp */
+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
+	{ } /* end */
+};
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1884a_loopbacks[] = {
+	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */
+	{ 0x20, HDA_INPUT, 1 }, /* Mic */
+	{ 0x20, HDA_INPUT, 2 }, /* CD */
+	{ 0x20, HDA_INPUT, 4 }, /* Docking */
+	{ } /* end */
+};
+#endif
+
+/*
+ * Laptop model
+ *
+ * Port A: Headphone jack
+ * Port B: MIC jack
+ * Port C: Internal MIC
+ * Port D: Dock Line Out (if enabled)
+ * Port E: Dock Line In (if enabled)
+ * Port F: Internal speakers
+ */
+
+static struct hda_input_mux ad1884a_laptop_capture_source = {
+	.num_items = 4,
+	.items = {
+		{ "Mic", 0x0 },		/* port-B */
+		{ "Internal Mic", 0x1 }, /* port-C */
+		{ "Dock Mic", 0x4 },	/* port-E */
+		{ "Mix", 0x3 },
+	},
+};
+
+static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Dock Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
+	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
+	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
+	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
+	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),
+	HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
+	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),
+	{
+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+		/* The multiple "Capture Source" controls confuse alsamixer
+		 * So call somewhat different..
+		 */
+		/* .name = "Capture Source", */
+		.name = "Input Source",
+		.count = 2,
+		.info = ad198x_mux_enum_info,
+		.get = ad198x_mux_enum_get,
+		.put = ad198x_mux_enum_put,
+	},
+	{ } /* end */
+};
+
+/* mute internal speaker if HP is plugged */
+static void ad1884a_hp_automute(struct hda_codec *codec)
+{
+	unsigned int present;
+
+	present = snd_hda_codec_read(codec, 0x11, 0,
+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE,
+			    present ? 0x00 : 0x02);
+}
+
+#define AD1884A_HP_EVENT		0x37
+
+/* unsolicited event for HP jack sensing */
+static void ad1884a_hp_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+	if ((res >> 26) != AD1884A_HP_EVENT)
+		return;
+	ad1884a_hp_automute(codec);
+}
+
+/* initialize jack-sensing, too */
+static int ad1884a_hp_init(struct hda_codec *codec)
+{
+	ad198x_init(codec);
+	ad1884a_hp_automute(codec);
+	return 0;
+}
+
+/* additional verbs for laptop model */
+static struct hda_verb ad1884a_laptop_verbs[] = {
+	/* Port-A (HP) pin - always unmuted */
+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+	/* Port-F (int speaker) mixer - route only from analog mixer */
+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+	/* Port-F pin */
+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+	/* analog mix */
+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+	/* unsolicited event for pin-sense */
+	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
+	{ } /* end */
+};
+
+/*
+ */
+
+enum {
+	AD1884A_DESKTOP,
+	AD1884A_LAPTOP,
+	AD1884A_MODELS
+};
+
+static const char *ad1884a_models[AD1884A_MODELS] = {
+	[AD1884A_DESKTOP]	= "desktop",
+	[AD1884A_LAPTOP]	= "laptop",
+};
+
+static int patch_ad1884a(struct hda_codec *codec)
+{
+	struct ad198x_spec *spec;
+	int board_config;
+
+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+	if (spec == NULL)
+		return -ENOMEM;
+
+	mutex_init(&spec->amp_mutex);
+	codec->spec = spec;
+
+	spec->multiout.max_channels = 2;
+	spec->multiout.num_dacs = ARRAY_SIZE(ad1884a_dac_nids);
+	spec->multiout.dac_nids = ad1884a_dac_nids;
+	spec->multiout.dig_out_nid = AD1884A_SPDIF_OUT;
+	spec->num_adc_nids = ARRAY_SIZE(ad1884a_adc_nids);
+	spec->adc_nids = ad1884a_adc_nids;
+	spec->capsrc_nids = ad1884a_capsrc_nids;
+	spec->input_mux = &ad1884a_capture_source;
+	spec->num_mixers = 1;
+	spec->mixers[0] = ad1884a_base_mixers;
+	spec->num_init_verbs = 1;
+	spec->init_verbs[0] = ad1884a_init_verbs;
+	spec->spdif_route = 0;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+	spec->loopback.amplist = ad1884a_loopbacks;
+#endif
+	codec->patch_ops = ad198x_patch_ops;
+
+	/* override some parameters */
+	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS,
+						  ad1884a_models, NULL);
+	switch (board_config) {
+	case AD1884A_LAPTOP:
+		spec->mixers[0] = ad1884a_laptop_mixers;
+		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
+		spec->multiout.dig_out_nid = 0;
+		spec->input_mux = &ad1884a_laptop_capture_source;
+		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
+		codec->patch_ops.init = ad1884a_hp_init;
+		break;
+	}
+
+	return 0;
+}
+
+
+/*
  * AD1882
  *
  * port-A - front hp-out
@@ -3709,8 +4032,12 @@ static int patch_ad1882(struct hda_codec
  * patch entries
  */
 struct hda_codec_preset snd_hda_preset_analog[] = {
+	{ .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a },
 	{ .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 },
+	{ .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a },
 	{ .id = 0x11d41884, .name = "AD1884", .patch = patch_ad1884 },
+	{ .id = 0x11d4194a, .name = "AD1984A", .patch = patch_ad1884a },
+	{ .id = 0x11d4194b, .name = "AD1984B", .patch = patch_ad1884a },
 	{ .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },
 	{ .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 },
 	{ .id = 0x11d41984, .name = "AD1984", .patch = patch_ad1984 },


linux-2.6-utrace.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.67 -r 1.68 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: linux-2.6-utrace.patch
diff -N linux-2.6-utrace.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-utrace.patch	21 May 2008 20:42:11 -0000	1.68
@@ -0,0 +1,9357 @@
+ Documentation/DocBook/Makefile      |    2 +-
+ Documentation/DocBook/utrace.tmpl   |   23 +
+ Documentation/utrace.txt            |  579 +++++++++
+ arch/mips/kernel/irixelf.c          |    2 -
+ arch/powerpc/kernel/asm-offsets.c   |    4 -
+ arch/powerpc/kernel/process.c       |    5 -
+ arch/powerpc/kernel/ptrace.c        |   35 +-
+ arch/powerpc/kernel/ptrace32.c      |    2 +-
+ arch/powerpc/kernel/signal.c        |    8 +-
+ arch/powerpc/kernel/signal_32.c     |   19 +-
+ arch/powerpc/kernel/sys_ppc32.c     |    5 -
+ arch/sparc64/kernel/binfmt_aout32.c |    2 -
+ arch/sparc64/kernel/process.c       |   23 +-
+ arch/sparc64/kernel/ptrace.c        |   28 +-
+ arch/sparc64/kernel/sys_sparc32.c   |   41 +-
+ arch/x86/ia32/ia32_aout.c           |    6 -
+ arch/x86/ia32/ia32_signal.c         |   10 -
+ arch/x86/ia32/ia32entry.S           |   14 +-
+ arch/x86/ia32/sys_ia32.c            |    5 -
+ arch/x86/kernel/entry_64.S          |    8 +-
+ arch/x86/kernel/ptrace.c            |  157 +--
+ arch/x86/kernel/signal_32.c         |   37 +-
+ arch/x86/kernel/signal_64.c         |   33 +-
+ arch/x86/kernel/vm86_32.c           |    9 +-
+ fs/binfmt_aout.c                    |    6 -
+ fs/binfmt_elf.c                     |    6 -
+ fs/binfmt_elf_fdpic.c               |    7 -
+ fs/binfmt_flat.c                    |    3 -
+ fs/binfmt_som.c                     |    2 -
+ fs/compat.c                         |    6 +-
+ fs/eventpoll.c                      |    3 +-
+ fs/exec.c                           |   12 +-
+ fs/proc/array.c                     |    9 +-
+ fs/proc/base.c                      |   43 +-
+ fs/select.c                         |    4 +-
+ include/asm-alpha/ptrace.h          |    1 +
+ include/asm-ia64/ptrace.h           |    1 +
+ include/asm-ia64/thread_info.h      |    2 +-
+ include/asm-powerpc/ptrace.h        |    1 +
+ include/asm-s390/thread_info.h      |    2 +-
+ include/asm-sparc64/ptrace.h        |    2 +
+ include/asm-x86/ptrace.h            |    2 +
+ include/linux/init_task.h           |    3 -
+ include/linux/ptrace.h              |   71 +-
+ include/linux/sched.h               |   46 +-
+ include/linux/thread_info.h         |   10 +-
+ include/linux/tracehook.h           |  493 ++++++++
+ include/linux/utrace.h              |  544 ++++++++
+ init/Kconfig                        |   29 +
+ kernel/Makefile                     |    1 +
+ kernel/compat.c                     |    3 +-
+ kernel/exit.c                       |  371 +++---
+ kernel/fork.c                       |   72 +-
+ kernel/ptrace.c                     | 2112 +++++++++++++++++++++++++-------
+ kernel/signal.c                     |  288 +----
+ kernel/sys_ni.c                     |    4 +
+ kernel/utrace.c                     | 2377 +++++++++++++++++++++++++++++++++++
+ mm/nommu.c                          |    4 +-
+ security/selinux/hooks.c            |   59 +-
+ security/selinux/include/objsec.h   |    1 -
+ 58 files changed, 6306 insertions(+), 1287 deletions(-)
+
+diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
+index 300e170..7cf3afc 100644  
+--- a/Documentation/DocBook/Makefile
++++ b/Documentation/DocBook/Makefile
+@@ -7,7 +7,7 @@
+ # list of DOCBOOKS.
+ 
+ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
+-	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
++	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \
+ 	    procfs-guide.xml writing_usb_driver.xml networking.xml \
+ 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
+ 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
+new file mode 100644
+index ...f185043 100644  
+--- /dev/null
++++ b/Documentation/DocBook/utrace.tmpl
+@@ -0,0 +1,23 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
++
++<book id="utrace">
++ <bookinfo>
++  <title>The utrace User Debugging Infrastructure</title>
++ </bookinfo>
++
++<toc></toc>
++
++<chapter><title>The utrace core API</title>
++!Iinclude/linux/utrace.h
++!Ekernel/utrace.c
++    </chapter>
++
++<chapter><title>Machine state access via utrace</title>
++!Finclude/linux/regset.h struct user_regset
++!Finclude/linux/regset.h struct user_regset_view
++!Finclude/linux/regset.h task_user_regset_view
++    </chapter>
++
++</book>
+diff --git a/Documentation/utrace.txt b/Documentation/utrace.txt
+new file mode 100644
+index ...4d24c33 100644  
+--- /dev/null
++++ b/Documentation/utrace.txt
+@@ -0,0 +1,579 @@
++DRAFT DRAFT DRAFT	WORK IN PROGRESS	DRAFT DRAFT DRAFT
++
++This is work in progress and likely to change.
++
++
++	Roland McGrath <roland at redhat.com>
++
++---
++
++		User Debugging Data & Event Rendezvous
++		---- --------- ---- - ----- ----------
++
++See linux/utrace.h for all the declarations used here.
++See also linux/tracehook.h for the utrace_regset declarations.
++
++The UTRACE is infrastructure code for tracing and controlling user
++threads.  This is the foundation for writing tracing engines, which
++can be loadable kernel modules.  The UTRACE interfaces provide three
++basic facilities:
++
++* Thread event reporting
++
++  Tracing engines can request callbacks for events of interest in
++  the thread: signals, system calls, exit, exec, clone, etc.
++
++* Core thread control
++
++  Tracing engines can prevent a thread from running (keeping it in
++  TASK_TRACED state), or make it single-step or block-step (when
++  hardware supports it).  Engines can cause a thread to abort system
++  calls, they change the behaviors of signals, and they can inject
++  signal-style actions at will.
++
++* Thread machine state access
++
++  Tracing engines can read and write a thread's registers and
++  similar per-thread CPU state.
++
++
++	Tracing engines
++	------- -------
++
++The basic actors in UTRACE are the thread and the tracing engine.
++A tracing engine is some body of code that calls into the utrace_*
++interfaces, represented by a struct utrace_engine_ops.  (Usually it's a
++kernel module, though the legacy ptrace support is a tracing engine
++that is not in a kernel module.)  The UTRACE interface operates on
++individual threads (struct task_struct).  If an engine wants to
++treat several threads as a group, that is up to its higher-level
++code.  Using the UTRACE starts out by attaching an engine to a thread.
++
++	struct utrace_attached_engine *
++	utrace_attach(struct task_struct *target, int flags,
++		      const struct utrace_engine_ops *ops, void *data);
++
++Calling utrace_attach is what sets up a tracing engine to trace a
++thread.  Use UTRACE_ATTACH_CREATE in flags, and pass your engine's ops.
++Check the return value with IS_ERR.  If successful, it returns a
++struct pointer that is the handle used in all other utrace_* calls.
++The data argument is stored in the utrace_attached_engine structure,
++for your code to use however it wants.
++
++	int utrace_detach(struct task_struct *target,
++			  struct utrace_attached_engine *engine);
++
++The utrace_detach call removes an engine from a thread.
++No more callbacks will be made after this returns success.
++
++
++An attached engine does nothing by default.
++An engine makes something happen by setting its flags.
++
++	int utrace_set_flags(struct task_struct *target,
++			     struct utrace_attached_engine *engine,
++			     unsigned long flags);
++
++The synchronization issues related to these two calls
++are discussed further below in "Teardown Races".
++
++
++	Action Flags
++	------ -----
++
[...8964 lines suppressed...]
++								      current);
++				if (ret)
++					break;
++			}
++		}
++	}
++	rcu_read_unlock();
++
++	return ret;
++}
++
++/*
++ * Called on the current task to return LSM_UNSAFE_* bits implied by tracing.
++ * Called with task_lock() held.
++ */
++int
++utrace_unsafe_exec(struct task_struct *tsk)
++{
++	struct utrace *utrace = tsk->utrace;
++	struct list_head *pos, *next;
++	struct utrace_attached_engine *engine;
++	const struct utrace_engine_ops *ops;
++	int unsafe = 0;
++
++	/* XXX must change for sharing */
++	list_for_each_safe_rcu(pos, next, &utrace->engines) {
++		engine = list_entry(pos, struct utrace_attached_engine, entry);
++		ops = rcu_dereference(engine->ops);
++		if (ops->unsafe_exec)
++			unsafe |= (*ops->unsafe_exec)(engine, tsk);
++	}
++
++	return unsafe;
++}
+diff --git a/mm/nommu.c b/mm/nommu.c
+index 5d8ae08..515beac 100644  
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -22,7 +22,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/slab.h>
+ #include <linux/vmalloc.h>
+-#include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/blkdev.h>
+ #include <linux/backing-dev.h>
+ #include <linux/mount.h>
+@@ -734,7 +734,7 @@ static unsigned long determine_vm_flags(
+ 	 * it's being traced - otherwise breakpoints set in it may interfere
+ 	 * with another untraced process
+ 	 */
+-	if ((flags & MAP_PRIVATE) && (current->ptrace & PT_PTRACED))
++	if ((flags & MAP_PRIVATE) && tracehook_expect_breakpoints(current))
+ 		vm_flags &= ~VM_MAYSHARE;
+ 
+ 	return vm_flags;
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index 41a049f..44b756b 100644  
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -24,7 +24,7 @@
+ 
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+-#include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+ #include <linux/security.h>
+@@ -162,7 +162,7 @@ static int task_alloc_security(struct ta
+ 		return -ENOMEM;
+ 
+ 	tsec->task = task;
+-	tsec->osid = tsec->sid = tsec->ptrace_sid = SECINITSID_UNLABELED;
++	tsec->osid = tsec->sid = SECINITSID_UNLABELED;
+ 	task->security = tsec;
+ 
+ 	return 0;
+@@ -1638,19 +1638,13 @@ static inline u32 file_to_av(struct file
+ 
+ static int selinux_ptrace(struct task_struct *parent, struct task_struct *child)
+ {
+-	struct task_security_struct *psec = parent->security;
+-	struct task_security_struct *csec = child->security;
+ 	int rc;
+ 
+ 	rc = secondary_ops->ptrace(parent,child);
+ 	if (rc)
+ 		return rc;
+ 
+-	rc = task_has_perm(parent, child, PROCESS__PTRACE);
+-	/* Save the SID of the tracing process for later use in apply_creds. */
+-	if (!(child->ptrace & PT_PTRACED) && !rc)
+-		csec->ptrace_sid = psec->sid;
+-	return rc;
++	return task_has_perm(parent, child, PROCESS__PTRACE);
+ }
+ 
+ static int selinux_capget(struct task_struct *target, kernel_cap_t *effective,
+@@ -2119,12 +2113,25 @@ static void selinux_bprm_apply_creds(str
+ 		/* Check for ptracing, and update the task SID if ok.
+ 		   Otherwise, leave SID unchanged and kill. */
+ 		if (unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
+-			rc = avc_has_perm(tsec->ptrace_sid, sid,
+-					  SECCLASS_PROCESS, PROCESS__PTRACE,
+-					  NULL);
+-			if (rc) {
+-				bsec->unsafe = 1;
+-				return;
++			struct task_struct *tracer;
++			struct task_security_struct *sec;
++			u32 ptsid = 0;
++
++			rcu_read_lock();
++			tracer = tracehook_tracer_task(current);
++			if (likely(tracer != NULL)) {
++				sec = tracer->security;
++				ptsid = sec->sid;
++			}
++			rcu_read_unlock();
++
++			if (ptsid != 0) {
++				rc = avc_has_perm(ptsid, sid, SECCLASS_PROCESS,
++						  PROCESS__PTRACE, NULL);
++				if (rc) {
++					bsec->unsafe = 1;
++					return;
++				}
+ 			}
+ 		}
+ 		tsec->sid = sid;
+@@ -2207,7 +2214,7 @@ static void selinux_bprm_post_apply_cred
+ 
+ 	/* Wake up the parent if it is waiting so that it can
+ 	   recheck wait permission to the new task SID. */
+-	wake_up_interruptible(&current->parent->signal->wait_chldexit);
++	wake_up_interruptible(&current->real_parent->signal->wait_chldexit);
+ }
+ 
+ /* superblock security operations */
+@@ -3080,11 +3087,6 @@ static int selinux_task_alloc_security(s
+ 	tsec2->keycreate_sid = tsec1->keycreate_sid;
+ 	tsec2->sockcreate_sid = tsec1->sockcreate_sid;
+ 
+-	/* Retain ptracer SID across fork, if any.
+-	   This will be reset by the ptrace hook upon any
+-	   subsequent ptrace_attach operations. */
+-	tsec2->ptrace_sid = tsec1->ptrace_sid;
+-
+ 	return 0;
+ }
+ 
+@@ -5050,6 +5052,7 @@ static int selinux_setprocattr(struct ta
+ 			       char *name, void *value, size_t size)
+ {
+ 	struct task_security_struct *tsec;
++	struct task_struct *tracer;
+ 	u32 sid = 0;
+ 	int error;
+ 	char *str = value;
+@@ -5138,18 +5141,24 @@ static int selinux_setprocattr(struct ta
+ 		/* Check for ptracing, and update the task SID if ok.
+ 		   Otherwise, leave SID unchanged and fail. */
+ 		task_lock(p);
+-		if (p->ptrace & PT_PTRACED) {
+-			error = avc_has_perm_noaudit(tsec->ptrace_sid, sid,
++		rcu_read_lock();
++		tracer = tracehook_tracer_task(p);
++		if (tracer != NULL) {
++			struct task_security_struct *ptsec = tracer->security;
++			u32 ptsid = ptsec->sid;
++			rcu_read_unlock();
++			error = avc_has_perm_noaudit(ptsid, sid,
+ 						     SECCLASS_PROCESS,
+ 						     PROCESS__PTRACE, 0, &avd);
+ 			if (!error)
+ 				tsec->sid = sid;
+ 			task_unlock(p);
+-			avc_audit(tsec->ptrace_sid, sid, SECCLASS_PROCESS,
++			avc_audit(ptsid, sid, SECCLASS_PROCESS,
+ 				  PROCESS__PTRACE, &avd, error, NULL);
+ 			if (error)
+ 				return error;
+ 		} else {
++			rcu_read_unlock();
+ 			tsec->sid = sid;
+ 			task_unlock(p);
+ 		}
+diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
+index c6c2bb4..1db31c2 100644  
+--- a/security/selinux/include/objsec.h
++++ b/security/selinux/include/objsec.h
+@@ -35,7 +35,6 @@ struct task_security_struct {
+ 	u32 create_sid;      /* fscreate SID */
+ 	u32 keycreate_sid;   /* keycreate SID */
+ 	u32 sockcreate_sid;  /* fscreate SID */
+-	u32 ptrace_sid;      /* SID of ptrace parent */
+ };
+ 
+ struct inode_security_struct {


--- NEW FILE linux-2.6.25.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIBsKGyGugalF9Dw4RAoBHAJ98cpucznFWEivkSLsEqyiMujJxWACfa3Qx
L6U28yAL2s2Dty9AOH5R4gs=
=948A
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.25.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBILFHNyGugalF9Dw4RApSkAJ9oyTd8ydd4QxkrbLMAKy1GKwY5DwCdHi6+
aDb9eyTvToMp6cKNvmF96Mw=
=BsBT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/.cvsignore,v
retrieving revision 1.721
retrieving revision 1.722
diff -u -r1.721 -r1.722
--- .cvsignore	7 May 2008 04:45:40 -0000	1.721
+++ .cvsignore	21 May 2008 20:42:11 -0000	1.722
@@ -1,6 +1,6 @@
 clog
 kernel-2.6.*.config
 temp-*
-kernel-2.6.24
-linux-2.6.24.tar.bz2
-patch-2.6.24.7.bz2
+kernel-2.6.25
+linux-2.6.25.tar.bz2
+patch-2.6.25.4.bz2


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-debug,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-debug	27 Mar 2008 15:39:37 -0000	1.6
+++ config-debug	21 May 2008 20:42:11 -0000	1.7
@@ -29,4 +29,6 @@
 
 CONFIG_DEBUG_SG=y
 
+# CONFIG_DEBUG_PAGEALLOC is not set
+
 CONFIG_USB_DEBUG=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- config-generic	19 May 2008 21:52:37 -0000	1.64
+++ config-generic	21 May 2008 20:42:11 -0000	1.65
@@ -41,7 +41,10 @@
 CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_USER_NS=y
-# CONFIG_PID_NS is not set
+CONFIG_PID_NS=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
@@ -49,6 +52,7 @@
 CONFIG_PREEMPT_BKL=y
 
 CONFIG_SLUB=y
+# CONFIG_SLUB_STATS is not set
 
 CONFIG_MISC_DEVICES=y
 
@@ -59,11 +63,8 @@
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -74,6 +75,8 @@
 CONFIG_PCI_MSI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_PCI_LEGACY=y
@@ -125,6 +128,8 @@
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
 
 #
 # Executable file formats
@@ -397,18 +402,25 @@
 CONFIG_BLK_DEV_VIA82CXXX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_HD is not set
+
+CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_NET=m
 
 #
 # SCSI device support
 #
 CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
 
-CONFIG_SCSI_TGT=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_PROC_FS=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_TGT=m
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -436,6 +448,7 @@
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_RAID_ATTRS=m
 
 CONFIG_ISCSI_TCP=m
@@ -516,14 +529,14 @@
 CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
-CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_NINJA32=m
 CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_WINBOND_VLB is not set
 CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTI=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PCMCIA=m
@@ -536,6 +549,7 @@
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_SIS=m
+CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
 
@@ -629,6 +643,8 @@
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 
 #
 # IEEE 1394 (FireWire) support
@@ -695,7 +711,6 @@
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
 
 #
 # IP: Virtual Server Configuration
@@ -743,6 +758,8 @@
 # CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NF_CONNTRACK=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
@@ -755,8 +772,10 @@
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -768,15 +787,18 @@
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -889,9 +911,10 @@
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_XFRM=y
-CONFIG_XFRM_USER=y
-CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_USER=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -947,39 +970,40 @@
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_RR=m
+CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_U32=m
 
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
@@ -1065,7 +1089,7 @@
 CONFIG_BROADCOM_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_DAVICOM_PHY=m
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FIXED_MII_10_FDX=y
 CONFIG_FIXED_MII_100_FDX=y
 CONFIG_FIXED_MII_1000_FDX=y
@@ -1075,6 +1099,7 @@
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_VITESSE_PHY=m
 
@@ -1223,8 +1248,10 @@
 
 CONFIG_MAC80211=m
 CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
 CONFIG_MAC80211_RC_DEFAULT="pid"
 CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_SIMPLE=y
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
@@ -1235,6 +1262,8 @@
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_CFG80211=m
 CONFIG_NL80211=y
 
@@ -1244,11 +1273,13 @@
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
 CONFIG_ATMEL=m
+# CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
+# CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -1276,15 +1307,18 @@
 CONFIG_IWL4965=m
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWL4965_SENSITIVITY=y
 CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y
 CONFIG_IWL4965_RUN_TIME_CALIB=y
-CONFIG_IWL4965_LEDS=y
+CONFIG_IWL4965_QOS=y
 CONFIG_IWL4965_HT=y
+CONFIG_IWL4965_LEDS=y
 CONFIG_IWL5000=y
 CONFIG_IWL5000_RUN_TIME_CALIB=y
 CONFIG_IWL3945=m
 CONFIG_IWL3945_DEBUG=y
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL3945_QOS=y
 CONFIG_IWL3945_LEDS=y
 CONFIG_NORTEL_HERMES=m
 CONFIG_P54_COMMON=m
@@ -1365,6 +1399,7 @@
 CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
+# CONFIG_CAN is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 CONFIG_MKISS=m
@@ -1803,7 +1838,9 @@
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
@@ -1858,6 +1895,7 @@
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
@@ -1931,21 +1969,21 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-CONFIG_RTC=y
+# CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 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_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_EP93XX is not set
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_M41T80=m
@@ -1961,6 +1999,7 @@
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_STK17TA8=m
+# CONFIG_RTC_DRV_S35390A is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2041,6 +2080,7 @@
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_CX25840=m
 CONFIG_VIDEO_CX2341X=m
@@ -2052,6 +2092,7 @@
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_IVTV=m
@@ -2061,6 +2102,8 @@
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y
+CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y
 CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
@@ -2099,6 +2142,8 @@
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_VP27SMPX=m
 CONFIG_TUNER_3036=m
 # CONFIG_TUNER_TEA5761 is not set
 
@@ -2126,6 +2171,7 @@
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
 CONFIG_DVB_BT8XX=m
+CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_LGDT330X=m
@@ -2136,7 +2182,9 @@
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_SP8870=m
 CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_TUA6100=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
@@ -2234,7 +2282,7 @@
 # CONFIG_FB_ASILIANT is not set
 CONFIG_FB_CIRRUS=m
 # CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_CYBLA=m
+# CONFIG_FB_CYBLA is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
@@ -2341,11 +2389,11 @@
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_MTS64=m
-# CONFIG_SND_SERIAL_U16550 is not set
+CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
 
 #
 # ISA devices
@@ -2397,6 +2445,7 @@
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
@@ -2408,21 +2457,23 @@
 CONFIG_SND_MIRO=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
+CONFIG_SND_OXYGEN=m
 CONFIG_SND_RME32=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
 CONFIG_SND_SC6000=m
+CONFIG_SND_SIS7019=m
 CONFIG_SND_SONICVIBES=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_SIS7019=m
 
 #
 # ALSA USB devices
@@ -2447,7 +2498,6 @@
 #
 CONFIG_USB=y
 CONFIG_USB_SUPPORT=y
-# CONFIG_USB_DEBUG is not set
 
 # DEPRECATED: See bug 362221. Fix udev.
 # CONFIG_USB_DEVICE_CLASS is not set
@@ -2609,6 +2659,7 @@
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_IUU=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -2652,51 +2703,55 @@
 #
 # USB Miscellaneous drivers
 #
-CONFIG_USB_EMI26=m
+
 CONFIG_USB_ADUTUX=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_ATM=m
 CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LCD=m
 CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_IOWARRIOR=m
-# CONFIG_USB_TEST is not set
+CONFIG_USB_CXACRU=m
+# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_EMI26=m
+CONFIG_USB_ETH=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
 # CONFIG_USB_GADGETFS is not set
-CONFIG_USB_W9968CF=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_ALI_M5632=y
-# CONFIG_USB_CYTHERM is not set
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_MON=y
 CONFIG_USB_PHIDGET=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_U132_HCD=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_RIO500=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_USB_SL811_HCD=m
-CONFIG_USB_MON=y
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ATM=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_LD=m
+CONFIG_USB_SI470X=m
+CONFIG_USB_STKWEBCAM=m
+# CONFIG_USB_TEST is not set
 CONFIG_USB_TRANCEVIBRATOR=m
-
-CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_UVCVIDEO=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_USB_W9968CF=m
+CONFIG_USB_XUSBATM=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_ZERO=m
+
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
 # Sonics Silicon Backplane
@@ -2725,7 +2780,7 @@
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4DEV_FS=m
 CONFIG_EXT4DEV_FS_XATTR=y
 CONFIG_EXT4DEV_FS_POSIX_ACL=y
 CONFIG_EXT4DEV_FS_SECURITY=y
@@ -2856,6 +2911,7 @@
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -2960,11 +3016,12 @@
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_POINTER=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_HEADERS_CHECK=y
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
 # CONFIG_LKDTM is not set
 
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -2983,6 +3040,10 @@
 CONFIG_DEBUG_DEVRES=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DEBUG_BOOT_PARAMS=y
+
 #
 # Security options
 #
@@ -3000,6 +3061,8 @@
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 
@@ -3019,27 +3082,32 @@
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
@@ -3048,7 +3116,8 @@
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
-
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 
 #
 # Library routines
@@ -3083,17 +3152,24 @@
 
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
-# CONFIG_FAIR_GROUP_SCHED is not set
+CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_GROUP_SCHED=n
+# with GROUP_SCHED disabled these three have no effect
+# CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED=y
+# CONFIG_CGROUP_SCHED=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
 CONFIG_PROC_PID_CPUSET=y
 
-CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 
 CONFIG_RELAY=y
 # CONFIG_PRINTK_TIME is not set
@@ -3144,6 +3220,7 @@
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_MVSAS=m
 
 # CONFIG_EL1 is not set
 # CONFIG_EL2 is not set
@@ -3296,7 +3373,7 @@
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y
 
-# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_UNUSED_SYMBOLS=y
 
 CONFIG_UTRACE=y
 CONFIG_PTRACE=y
@@ -3332,7 +3409,7 @@
 CONFIG_UIO_CIF=m
 
 CONFIG_INSTRUMENTATION=y
-# CONFIG_MARKERS is not set
+CONFIG_MARKERS=y
 # CONFIG_CRC7 is not set
 
 CONFIG_DEFAULT_RELATIME=y
@@ -3358,7 +3435,46 @@
 
 # CONFIG_SAMPLES is not set
 
-# CONFIG_WRITABLE_DEVMEM is not set
-# CONFIG_WRITABLE_DEVKMEM is not set
+# CONFIG_DEVKMEM is not set
+
+CONFIG_PM_TRACE_RTC=y
+CONFIG_R6040=m
+CONFIG_IGB=m
+CONFIG_BNX2X=m
+CONFIG_NOZOMI=m
+CONFIG_PCF8575=m
+# CONFIG_TPS65010 is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_LATENCYTOP=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+
+# FIXME: Move to arch
+CONFIG_ACPI_WMI=m
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
+
+#FIXME: x86 generic?
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_I8K=m
+CONFIG_ACER_WMI=m
+CONFIG_EDAC_I3000=m
+CONFIG_INPUT_APANEL=m
+
+# CONFIG_INTEL_MENLOW is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_IPWIRELESS=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_CGROUP_MEM_CONT=y
+CONFIG_TC1100_WMI=m
+
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_MEMSTICK=m
+CONFIG_MEMSTICK_DEBUG=y
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
 
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set


Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-i586,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-i586	8 Oct 2007 18:39:10 -0000	1.4
+++ config-i586	21 May 2008 20:42:11 -0000	1.5
@@ -5,3 +5,5 @@
 # CONFIG_HIGHMEM64G is not set
 
 CONFIG_X86_POWERNOW_K6=m
+
+# CONFIG_KVM is not set


Index: config-i686
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-i686,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i686	2 Apr 2008 23:04:19 -0000	1.2
+++ config-i686	21 May 2008 20:42:11 -0000	1.3
@@ -5,3 +5,4 @@
 
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-ia64-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-ia64-generic	18 Feb 2008 02:29:40 -0000	1.5
+++ config-ia64-generic	21 May 2008 20:42:11 -0000	1.6
@@ -115,7 +115,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_SYSFS_POWER is not set
+CONFIG_ACPI_SYSFS_POWER=y
 # CONFIG_ACPI_BAY is not set
 # CONFIG_ACPI_BATTERY is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-nodebug,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-nodebug	3 Apr 2008 03:48:13 -0000	1.8
+++ config-nodebug	21 May 2008 20:42:11 -0000	1.9
@@ -1,7 +1,7 @@
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DEBUG_DETECT is not set
-# CONFIG_SND_PCM_XRUN_DEBUG is not set
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+CONFIG_SND_DEBUG_DETECT=y
+CONFIG_SND_PCM_XRUN_DEBUG=y
 
 # CONFIG_DEBUG_IGNORE_QUIET is not set
 # CONFIG_DEBUG_MUTEXES is not set
@@ -28,4 +28,6 @@
 
 # CONFIG_DEBUG_SG is not set
 
+# CONFIG_DEBUG_PAGEALLOC is not set
+
 # CONFIG_USB_DEBUG is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-powerpc-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-powerpc-generic	23 Feb 2008 04:15:10 -0000	1.12
+++ config-powerpc-generic	21 May 2008 20:42:11 -0000	1.13
@@ -33,7 +33,7 @@
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 # CONFIG_RTC is not set
-CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC_X is not set
 CONFIG_RTC_DRV_PPC=y
 CONFIG_PROC_DEVICETREE=y
@@ -76,7 +76,7 @@
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
 
 CONFIG_XMON=y
-CONFIG_XMON_DEFAULT=y
+# CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
 
 CONFIG_BOOTX_TEXT=y
@@ -205,3 +205,18 @@
 CONFIG_AXON_RAM=m
 CONFIG_OPROFILE_CELL=y
 
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+
+# CONFIG_MPC5121_ADS is not set
+CONFIG_MTD_OF_PARTS=m
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+CONFIG_THERMAL=y
+
+# CONFIG_MEMORY_HOTREMOVE is not set
+
+CONFIG_DMADEVICES=y
+# CONFIG_FSL_DMA is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-powerpc32-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc32-generic	15 Feb 2008 23:58:52 -0000	1.4
+++ config-powerpc32-generic	21 May 2008 20:42:11 -0000	1.5
@@ -9,7 +9,14 @@
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_PPC_CHRP=y
 CONFIG_PPC_PMAC=y
-# CONFIG_PPC_PREP is not set
+CONFIG_PPC_MPC52xx=y
+CONFIG_PPC_PREP=y
+
+# CONFIG_PPC_MPC5200_SIMPLE is not set
+CONFIG_SATA_FSL=m
+CONFIG_GIANFAR=m
+CONFIG_GFAR_NAPI=y
+CONFIG_USB_EHCI_FSL=y
 
 CONFIG_PMAC_APM_EMU=y
 CONFIG_PMAC_BACKLIGHT=y


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-powerpc64,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-powerpc64	15 Feb 2008 23:58:52 -0000	1.7
+++ config-powerpc64	21 May 2008 20:42:11 -0000	1.8
@@ -1,5 +1,6 @@
 CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
+CONFIG_WINDFARM_PM121=y
 CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
 CONFIG_PPC_SYSTEMSIM=y
@@ -29,6 +30,7 @@
 CONFIG_PS3_DISK=m
 CONFIG_PS3_ROM=m
 CONFIG_PS3_FLASH=m
+CONFIG_PS3_LPM=y
 CONFIG_SND_PS3=m
 CONFIG_SND_PS3_DEFAULT_START_DELAY=1000
 CONFIG_GELIC_NET=m
@@ -149,3 +151,7 @@
 CONFIG_ELECTRA_CF=m
 
 CONFIG_SPARSEMEM_VMEMMAP=y
+
+CONFIG_SPU_TRACE=m
+CONFIG_MTD_NAND_PASEMI=m
+CONFIG_EDAC_CELL=m


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-s390x,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-s390x	15 Feb 2008 23:58:52 -0000	1.3
+++ config-s390x	21 May 2008 20:42:11 -0000	1.4
@@ -196,3 +196,5 @@
 
 CONFIG_S390_VMUR=m
 
+# CONFIG_THERMAL is not set
+# CONFIG_DEBUG_PAGEALLOC is not set


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-sparc64-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-sparc64-generic	15 Feb 2008 23:58:52 -0000	1.9
+++ config-sparc64-generic	21 May 2008 20:42:11 -0000	1.10
@@ -1,7 +1,12 @@
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
 CONFIG_SECCOMP=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
 
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
 CONFIG_CPU_FREQ_DEBUG=y
@@ -18,8 +23,6 @@
 CONFIG_US2E_FREQ=m
 
 CONFIG_SUN_LDOMS=y
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_CRASH is not set
@@ -28,7 +31,7 @@
 CONFIG_HUGETLB_PAGE_SIZE_4MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_512K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64K is not set
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=64
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 CONFIG_SUN_OPENPROMFS=m
@@ -44,13 +47,29 @@
 CONFIG_WATCHDOG_CP1XXX=m
 CONFIG_WATCHDOG_RIO=m
 # CONFIG_CMDLINE_BOOL is not set
-CONFIG_FB_BW2=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_PARPORT is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_LIRC_PVR150 is not set
+# CONFIG_LIRC_PARALLEL is not set
+# CONFIG_I2C_NFORCE2 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_VOODOO3 is not set
+CONFIG_I2C_ALI1535=m
+# CONFIG_VGASTATE is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BW2 is not set
 CONFIG_FB_CG3=y
 CONFIG_FB_CG6=y
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 CONFIG_FB_ATY=y
+# 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_3DFX is not set
@@ -65,6 +84,14 @@
 # CONFIG_FB_LEO is not set
 CONFIG_FB_XVR500=y
 CONFIG_FB_XVR2500=y
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_KYRO is not set
+
+# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_MDA_CONSOLE is not set
 # CONFIG_PROM_CONSOLE is not set
 CONFIG_FONTS=y
@@ -73,10 +100,12 @@
 # CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 CONFIG_FONT_SUN8x16=y
 CONFIG_FONT_SUN12x22=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_SUNZILOG=y
 CONFIG_SERIAL_SUNZILOG_CONSOLE=y
@@ -129,9 +158,9 @@
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
 # CONFIG_SOUND_PRIME is not set
-CONFIG_SND_SUN_AMD7930=m
+# CONFIG_SND_SUN_AMD7930 is not set
 CONFIG_SND_SUN_CS4231=m
-CONFIG_SND_SUN_DBRI=m
+# CONFIG_SND_SUN_DBRI is not set
 CONFIG_PARPORT_SUNBPP=m
 CONFIG_LOGO_SUN_CLUT224=y
 CONFIG_SUN_BPP=m
@@ -142,11 +171,15 @@
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_IEEE1394_SBP2 is not set
 # CONFIG_USB_NET2280 is not set
-# CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_DCFLUSH is not set
 # CONFIG_DEBUG_BOOTMEM is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOCKDEP is not set
 # CONFIG_STACK_DEBUG is not set
 
 CONFIG_SPARSEMEM_VMEMMAP=y
+
+# CONFIG_THERMAL is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-x86-generic	18 Feb 2008 02:29:40 -0000	1.20
+++ config-x86-generic	21 May 2008 20:42:11 -0000	1.21
@@ -77,7 +77,7 @@
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
-CONFIG_FB_IMAC=y
+CONFIG_FB_EFI=y
 
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -126,7 +126,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_SYSFS_POWER is not set
+CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=1999
@@ -170,7 +170,7 @@
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 # CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
@@ -216,7 +216,6 @@
 
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_MMCONFIG_OFF_BY_DEFAULT=y
 CONFIG_PCI_BIOS=y
 CONFIG_DMAR=y
 CONFIG_DMAR_GFX_WA=y
@@ -343,6 +342,7 @@
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
+CONFIG_THINKPAD_ACPI_VIDEO=y
 
 CONFIG_MACINTOSH_DRIVERS=y
 
@@ -360,3 +360,8 @@
 CONFIG_INTEL_IOATDMA=m
 
 CONFIG_SENSORS_I5K_AMB=m
+
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+
+CONFIG_HP_WATCHDOG=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86_64-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-x86_64-generic	23 Apr 2008 00:56:09 -0000	1.21
+++ config-x86_64-generic	21 May 2008 20:42:11 -0000	1.22
@@ -12,7 +12,8 @@
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NR_CPUS=64
-CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8_ACPI=y
 # CONFIG_X86_P4_CLOCKMOD is not set
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
@@ -26,13 +27,13 @@
 CONFIG_EDD=m
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_MMCONFIG_OFF_BY_DEFAULT=y
 CONFIG_DMAR=y
 CONFIG_DMAR_GFX_WA=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
+CONFIG_FB_EFI=y
 
 CONFIG_I2O=m
 CONFIG_I2O_BLOCK=m
@@ -72,7 +73,7 @@
 CONFIG_ACPI_AC=m
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_SYSFS_POWER is not set
+CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -105,6 +106,7 @@
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
+CONFIG_THINKPAD_ACPI_VIDEO=y
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -139,7 +141,7 @@
 CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
-
+CONFIG_CRYPTO_SALSA20_X86_64=m
 
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -185,10 +187,10 @@
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-
 # CONFIG_HW_RANDOM_GEODE is not set
 
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_NMI_TIMEOUT=5
 
@@ -247,3 +249,11 @@
 CONFIG_INTEL_IOATDMA=m
 
 CONFIG_SENSORS_I5K_AMB=m
+
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_CPA_DEBUG is not set
+
+CONFIG_HP_WATCHDOG=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- kernel.spec	19 May 2008 21:52:37 -0000	1.440
+++ kernel.spec	21 May 2008 20:42:11 -0000	1.441
@@ -22,18 +22,18 @@
 #
 # Bah. Have to set this to a negative for the moment to fix rpm ordering after
 # moving the spec file. cvs sucks. Should be sure to fix this once 2.6.23 is out.
-%define fedora_cvs_origin 346
+%define fedora_cvs_origin 440
 %define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 24
+%define base_sublevel 25
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 7
+%define stable_update 4
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -564,23 +564,7 @@
 # revert upstream changes we get from elsewhere
 Patch05: linux-2.6-upstream-reverts.patch
 
-Patch21: linux-2.6-utrace-tracehook.patch
-Patch22: linux-2.6-utrace-tracehook-ia64.patch
-Patch23: linux-2.6-utrace-tracehook-sparc64.patch
-Patch24: linux-2.6-utrace-tracehook-s390.patch
-Patch25: linux-2.6-utrace-tracehook-um.patch
-Patch26: linux-2.6-utrace-tracehook-avr32.patch
-Patch27: linux-2.6-utrace-regset.patch
-Patch28: linux-2.6-utrace-regset-ia64.patch
-Patch29: linux-2.6-utrace-regset-sparc64.patch
-Patch30: linux-2.6-utrace-regset-s390.patch
-Patch31: linux-2.6-utrace-regset-avr32.patch
-Patch32: linux-2.6-utrace-core.patch
-Patch33: linux-2.6-utrace-ptrace-compat.patch
-Patch34: linux-2.6-utrace-ptrace-compat-ia64.patch
-Patch35: linux-2.6-utrace-ptrace-compat-sparc64.patch
-Patch36: linux-2.6-utrace-ptrace-compat-s390.patch
-Patch37: linux-2.6-utrace-ptrace-compat-avr32.patch
+Patch21: linux-2.6-utrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch60: linux-2.6-x86-tune-generic.patch
@@ -591,11 +575,9 @@
 Patch77: linux-2.6-x86-clear-df-for-signals.patch
 Patch78: linux-2.6-x86-asmlinkage_protect-sys_io_getevents.patch
 
-Patch86: linux-2.6-alsa-support-sis7019.patch
-Patch87: linux-2.6-alsa-hda-stac-dmic.patch
-Patch88: linux-2.6-alsa-drivers-set-device-links.patch
-Patch89: linux-2.6-alsa-hda-fix-waitloop.patch
-Patch90: linux-2.6-alsa-hda-stac-add-delay.patch
+Patch85: linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
+Patch86: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
+Patch87: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch91: linux-2.6-alsa-kill-annoying-messages.patch
 
 # Patch100: linux-2.6-libata-pegasos-fix.patch
@@ -734,30 +716,6 @@
 Patch2400: linux-2.6-uvcvideo.patch
 
 
-Patch3010: linux-x86-mtrr-2d2ee8de5f6d26ef2942e0b449aa68d9236d5777.patch
-Patch3020: linux-x86-mtrr-99fc8d424bc5d803fe92cad56c068fe64e73747a.patch
-Patch3030: linux-x86-mtrr-2f36fa13ce49ffd000249feaedfcbefbcc83a72f.patch
-Patch3040: linux-x86-mtrr-013d23e1567c4cebee0a2db5c8fa97b91b34ac2a.patch
-Patch3050: linux-x86-mtrr-c9cce83dd1d59f52e2c8f8c7d265ba4854c40785.patch
-Patch3060: linux-x86-mtrr-04e1ba852132c9ad006affcd5b8c8606295170b0.patch
-Patch3070: linux-x86-mtrr-8c61b900ebb8ec5918ffd776ba1a61a5f022566d.patch
-Patch3080: linux-x86-mtrr-a860b63c41f241c685245127a3d32f352cb04c12.patch
-Patch3090: linux-x86-mtrr-7b11fb51567dedeaf6dc03f0135c0a8bb2399818.patch
-Patch3100: linux-x86-mtrr-0b9c99b6f21c2e9e00938e9c57942ed71bfe4d21.patch
-Patch3110: linux-x86-mtrr-5548fecdff5617ba3a2f09f0e585e1ac6e1bd25c.patch
-Patch3120: linux-x86-mtrr-53756d3722172815f52272b28c6d5d5e9639adde.patch
-Patch3130: linux-x86-mtrr-2b16a2353814a513cdb5c5c739b76a19d7ea39ce.patch
-Patch3140: linux-x86-mtrr-093af8d7f0ba3c6be1485973508584ef081e9f93.patch
-Patch3150: linux-x86-mtrr-cd7d72bb27a8c7502a602bdc299f1bb0a9357975.patch
-Patch3160: linux-x86-mtrr-9a6b344ea967efa0bb5ca4cb5405f840652b66c4.patch
-Patch3170: linux-x86-mtrr-16c02ed74361433a4fc5d8bd5f67abbac6e1c5ca.patch
-Patch3180: linux-x86-mtrr-20651af9ac60fd6e31360688ad44861a7d05256a.patch
-Patch3190: linux-x86-mtrr-f5106d91f2bf9153d6420f9ebb8114f73f9ce66a.patch
-Patch3200: linux-x86-mtrr-c140df973c07ac328aafd19d4f4c413f2f8902df.patch
-Patch3210: linux-x86-mtrr-31183ba8fd05b6ddc67ab4d726167cbc52e1b346.patch
-Patch3220: linux-x86-mtrr-aaf230424204864e2833dcc1da23e2cb0b9f39cd.patch
-Patch3230: linux-x86-mtrr-5dca6a1bb014875a17289fdaae8c31e0a3641c99.patch
-
 # Patch up paranoid iret
 Patch3240: linux-2.6-paranoid-iret-crash-fix.patch
 # Return kcore access policy to upstream behavior (bz 241362)
@@ -1058,41 +1016,11 @@
 ApplyPatch linux-2.6-upstream-reverts.patch -R
 
 # Roland's utrace ptrace replacement.
-# Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-tracehook.patch
-# Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-tracehook-ia64.patch
-ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch
-ApplyPatch linux-2.6-utrace-tracehook-s390.patch
-ApplyPatch linux-2.6-utrace-tracehook-um.patch
-ApplyPatch linux-2.6-utrace-tracehook-avr32.patch
-# Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-regset.patch
-# Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-regset-ia64.patch
-ApplyPatch linux-2.6-utrace-regset-sparc64.patch
-ApplyPatch linux-2.6-utrace-regset-s390.patch
-ApplyPatch linux-2.6-utrace-regset-avr32.patch
-# Core patch has no machine dependencies.
-ApplyPatch linux-2.6-utrace-core.patch
-# Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-ptrace-compat.patch
-# Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
-
-# support SiS 7019 audio (for K12LTSP thin client)
-ApplyPatch linux-2.6-alsa-support-sis7019.patch
-# ALSA enhancments for 2.6.25
-ApplyPatch linux-2.6-alsa-hda-stac-dmic.patch
-# Fix missing controls on some devices caused by missing sysfs links
-ApplyPatch linux-2.6-alsa-drivers-set-device-links.patch
-# Fix wait loop so devices don't go into polling mode
-ApplyPatch linux-2.6-alsa-hda-fix-waitloop.patch
-# some STAC codecs need longer delay
-ApplyPatch linux-2.6-alsa-hda-stac-add-delay.patch
+
+# ALSA Thinkpad X300 support
+ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A.patch
+ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
+ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 # kill annoying messages
 ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
 
@@ -1396,30 +1324,6 @@
 ApplyPatch linux-2.6-uvcvideo.patch
 
 # ---------- below all scheduled for 2.6.25 -----------------
-# Backport of MTRR fixes from 2.6.25
-ApplyPatch linux-x86-mtrr-2d2ee8de5f6d26ef2942e0b449aa68d9236d5777.patch
-ApplyPatch linux-x86-mtrr-99fc8d424bc5d803fe92cad56c068fe64e73747a.patch
-ApplyPatch linux-x86-mtrr-2f36fa13ce49ffd000249feaedfcbefbcc83a72f.patch
-ApplyPatch linux-x86-mtrr-013d23e1567c4cebee0a2db5c8fa97b91b34ac2a.patch
-ApplyPatch linux-x86-mtrr-c9cce83dd1d59f52e2c8f8c7d265ba4854c40785.patch
-ApplyPatch linux-x86-mtrr-04e1ba852132c9ad006affcd5b8c8606295170b0.patch
-ApplyPatch linux-x86-mtrr-8c61b900ebb8ec5918ffd776ba1a61a5f022566d.patch
-ApplyPatch linux-x86-mtrr-a860b63c41f241c685245127a3d32f352cb04c12.patch
-ApplyPatch linux-x86-mtrr-7b11fb51567dedeaf6dc03f0135c0a8bb2399818.patch
-ApplyPatch linux-x86-mtrr-0b9c99b6f21c2e9e00938e9c57942ed71bfe4d21.patch
-ApplyPatch linux-x86-mtrr-5548fecdff5617ba3a2f09f0e585e1ac6e1bd25c.patch
-ApplyPatch linux-x86-mtrr-53756d3722172815f52272b28c6d5d5e9639adde.patch
-ApplyPatch linux-x86-mtrr-2b16a2353814a513cdb5c5c739b76a19d7ea39ce.patch
-ApplyPatch linux-x86-mtrr-093af8d7f0ba3c6be1485973508584ef081e9f93.patch
-ApplyPatch linux-x86-mtrr-cd7d72bb27a8c7502a602bdc299f1bb0a9357975.patch
-ApplyPatch linux-x86-mtrr-9a6b344ea967efa0bb5ca4cb5405f840652b66c4.patch
-ApplyPatch linux-x86-mtrr-16c02ed74361433a4fc5d8bd5f67abbac6e1c5ca.patch
-ApplyPatch linux-x86-mtrr-20651af9ac60fd6e31360688ad44861a7d05256a.patch
-ApplyPatch linux-x86-mtrr-f5106d91f2bf9153d6420f9ebb8114f73f9ce66a.patch
-ApplyPatch linux-x86-mtrr-c140df973c07ac328aafd19d4f4c413f2f8902df.patch
-ApplyPatch linux-x86-mtrr-31183ba8fd05b6ddc67ab4d726167cbc52e1b346.patch
-ApplyPatch linux-x86-mtrr-aaf230424204864e2833dcc1da23e2cb0b9f39cd.patch
-ApplyPatch linux-x86-mtrr-5dca6a1bb014875a17289fdaae8c31e0a3641c99.patch
 
 # Patch up paranoid iret (#431314)
 ApplyPatch linux-2.6-paranoid-iret-crash-fix.patch
@@ -2020,6 +1924,9 @@
 
 
 %changelog
+* Wed May 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-1
+- Initial commit of kernel 2.6.25.4; does not build yet.
+
 * Mon May 19 2008 Dave Jones <davej at redhat.com>
 - Disable PATA_ISAPNP (it's busted).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/sources,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- sources	7 May 2008 04:45:40 -0000	1.682
+++ sources	21 May 2008 20:42:11 -0000	1.683
@@ -1,2 +1,2 @@
-3f23ad4b69d0a552042d1ed0f4399857  linux-2.6.24.tar.bz2
-0c1c5d6d8cd82e18d62406d2f34d1d38  patch-2.6.24.7.bz2
+db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
+f12f43dd78b765f3d1402aa9d2170cf5  patch-2.6.25.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/upstream,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -r1.603 -r1.604
--- upstream	7 May 2008 04:45:40 -0000	1.603
+++ upstream	21 May 2008 20:42:11 -0000	1.604
@@ -1,2 +1,2 @@
-linux-2.6.24.tar.bz2
-patch-2.6.24.7.bz2
+linux-2.6.25.tar.bz2
+patch-2.6.25.4.bz2


--- linux-2.6-alsa-drivers-set-device-links.patch DELETED ---


--- linux-2.6-alsa-hda-fix-waitloop.patch DELETED ---


--- linux-2.6-alsa-hda-stac-add-delay.patch DELETED ---


--- linux-2.6-alsa-hda-stac-dmic.patch DELETED ---


--- linux-2.6-alsa-support-sis7019.patch DELETED ---


--- linux-2.6-utrace-core.patch DELETED ---


--- linux-2.6-utrace-ptrace-compat-avr32.patch DELETED ---


--- linux-2.6-utrace-ptrace-compat-ia64.patch DELETED ---


--- linux-2.6-utrace-ptrace-compat-s390.patch DELETED ---


--- linux-2.6-utrace-ptrace-compat-sparc64.patch DELETED ---


--- linux-2.6-utrace-ptrace-compat.patch DELETED ---


--- linux-2.6-utrace-regset-avr32.patch DELETED ---


--- linux-2.6-utrace-regset-ia64.patch DELETED ---


--- linux-2.6-utrace-regset-s390.patch DELETED ---


--- linux-2.6-utrace-regset-sparc64.patch DELETED ---


--- linux-2.6-utrace-regset.patch DELETED ---


--- linux-2.6-utrace-tracehook-avr32.patch DELETED ---


--- linux-2.6-utrace-tracehook-ia64.patch DELETED ---


--- linux-2.6-utrace-tracehook-s390.patch DELETED ---


--- linux-2.6-utrace-tracehook-sparc64.patch DELETED ---


--- linux-2.6-utrace-tracehook-um.patch DELETED ---


--- linux-2.6-utrace-tracehook.patch DELETED ---


--- linux-2.6.24.tar.bz2.sign DELETED ---


--- linux-x86-mtrr-013d23e1567c4cebee0a2db5c8fa97b91b34ac2a.patch DELETED ---


--- linux-x86-mtrr-04e1ba852132c9ad006affcd5b8c8606295170b0.patch DELETED ---


--- linux-x86-mtrr-093af8d7f0ba3c6be1485973508584ef081e9f93.patch DELETED ---


--- linux-x86-mtrr-0b9c99b6f21c2e9e00938e9c57942ed71bfe4d21.patch DELETED ---


--- linux-x86-mtrr-16c02ed74361433a4fc5d8bd5f67abbac6e1c5ca.patch DELETED ---


--- linux-x86-mtrr-20651af9ac60fd6e31360688ad44861a7d05256a.patch DELETED ---


--- linux-x86-mtrr-2b16a2353814a513cdb5c5c739b76a19d7ea39ce.patch DELETED ---


--- linux-x86-mtrr-2d2ee8de5f6d26ef2942e0b449aa68d9236d5777.patch DELETED ---


--- linux-x86-mtrr-2f36fa13ce49ffd000249feaedfcbefbcc83a72f.patch DELETED ---


--- linux-x86-mtrr-31183ba8fd05b6ddc67ab4d726167cbc52e1b346.patch DELETED ---


--- linux-x86-mtrr-53756d3722172815f52272b28c6d5d5e9639adde.patch DELETED ---


--- linux-x86-mtrr-5548fecdff5617ba3a2f09f0e585e1ac6e1bd25c.patch DELETED ---


--- linux-x86-mtrr-5dca6a1bb014875a17289fdaae8c31e0a3641c99.patch DELETED ---


--- linux-x86-mtrr-7b11fb51567dedeaf6dc03f0135c0a8bb2399818.patch DELETED ---


--- linux-x86-mtrr-8c61b900ebb8ec5918ffd776ba1a61a5f022566d.patch DELETED ---


--- linux-x86-mtrr-99fc8d424bc5d803fe92cad56c068fe64e73747a.patch DELETED ---


--- linux-x86-mtrr-9a6b344ea967efa0bb5ca4cb5405f840652b66c4.patch DELETED ---


--- linux-x86-mtrr-a860b63c41f241c685245127a3d32f352cb04c12.patch DELETED ---


--- linux-x86-mtrr-aaf230424204864e2833dcc1da23e2cb0b9f39cd.patch DELETED ---


--- linux-x86-mtrr-c140df973c07ac328aafd19d4f4c413f2f8902df.patch DELETED ---


--- linux-x86-mtrr-c9cce83dd1d59f52e2c8f8c7d265ba4854c40785.patch DELETED ---


--- linux-x86-mtrr-cd7d72bb27a8c7502a602bdc299f1bb0a9357975.patch DELETED ---


--- linux-x86-mtrr-f5106d91f2bf9153d6420f9ebb8114f73f9ce66a.patch DELETED ---


--- patch-2.6.24.7.bz2.sign DELETED ---

More information about the fedora-extras-commits mailing list