rpms/kernel/devel git-linus.diff, 1.13, 1.14 kernel.spec, 1.1231, 1.1232 linux-2.6.28-sunrpc-ipv6-rpcbind.patch, 1.1, 1.2
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 26 21:46:34 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20312
Modified Files:
git-linus.diff kernel.spec
linux-2.6.28-sunrpc-ipv6-rpcbind.patch
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
- Update git-linus.diff to bf50c903faba4ec7686ee8a570ac384b0f20814d.
- drm-next.patch merged.
- linux-2.6.28-sunrpc-ipv6-rpcbind.patch: update for Kconfig moves.
git-linus.diff:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-linus.diff 6 Oct 2008 14:26:12 -0000 1.13
+++ git-linus.diff 26 Jan 2009 21:46:32 -0000 1.14
@@ -0,0 +1,91654 @@
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index 8511d35..d8362cf 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
+ a memory unit (amount[KMG]). See also
+ Documentation/kdump/kdump.txt for a example.
+
+- cs4232= [HW,OSS]
+- Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
+-
+ cs89x0_dma= [HW,NET]
+ Format: <dma>
+
+@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file
+ Default value is 0.
+ Value can be changed at runtime via /selinux/enforce.
+
+- es1371= [HW,OSS]
+- Format: <spdif>,[<nomix>,[<amplifier>]]
+- See also header of sound/oss/es1371.c.
+-
+ ether= [HW,NET] Ethernet cards parameters
+ This option is obsoleted by the "netdev=" option, which
+ has equivalent usage. See its documentation for details.
+diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
+index 64eb110..0f5d26b 100644
+--- a/Documentation/sound/alsa/HD-Audio-Models.txt
++++ b/Documentation/sound/alsa/HD-Audio-Models.txt
+@@ -349,6 +349,7 @@ STAC92HD73*
+ STAC92HD83*
+ ===========
+ ref Reference board
++ mic-ref Reference board with power managment for ports
+
+ STAC9872
+ ========
+diff --git a/Makefile b/Makefile
+index 207303d..93b81bc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -213,6 +213,10 @@ endif
+ # Where to locate arch specific headers
+ hdr-arch := $(SRCARCH)
+
++ifeq ($(ARCH),m68knommu)
++ hdr-arch := m68k
++endif
++
+ KCONFIG_CONFIG ?= .config
+
+ # SHELL used by kbuild
+diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/plat-mxc/include/mach/ipu.h
+new file mode 100644
+index 0000000..a9221f1
+--- /dev/null
++++ b/arch/arm/plat-mxc/include/mach/ipu.h
+@@ -0,0 +1,181 @@
++/*
++ * Copyright (C) 2008
++ * Guennadi Liakhovetski, DENX Software Engineering, <lg at denx.de>
++ *
++ * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef _IPU_H_
++#define _IPU_H_
++
++#include <linux/types.h>
++#include <linux/dmaengine.h>
++
++/* IPU DMA Controller channel definitions. */
++enum ipu_channel {
++ IDMAC_IC_0 = 0, /* IC (encoding task) to memory */
++ IDMAC_IC_1 = 1, /* IC (viewfinder task) to memory */
++ IDMAC_ADC_0 = 1,
++ IDMAC_IC_2 = 2,
++ IDMAC_ADC_1 = 2,
++ IDMAC_IC_3 = 3,
++ IDMAC_IC_4 = 4,
++ IDMAC_IC_5 = 5,
++ IDMAC_IC_6 = 6,
++ IDMAC_IC_7 = 7, /* IC (sensor data) to memory */
++ IDMAC_IC_8 = 8,
++ IDMAC_IC_9 = 9,
++ IDMAC_IC_10 = 10,
++ IDMAC_IC_11 = 11,
++ IDMAC_IC_12 = 12,
++ IDMAC_IC_13 = 13,
++ IDMAC_SDC_0 = 14, /* Background synchronous display data */
++ IDMAC_SDC_1 = 15, /* Foreground data (overlay) */
++ IDMAC_SDC_2 = 16,
++ IDMAC_SDC_3 = 17,
++ IDMAC_ADC_2 = 18,
++ IDMAC_ADC_3 = 19,
++ IDMAC_ADC_4 = 20,
++ IDMAC_ADC_5 = 21,
++ IDMAC_ADC_6 = 22,
++ IDMAC_ADC_7 = 23,
++ IDMAC_PF_0 = 24,
++ IDMAC_PF_1 = 25,
++ IDMAC_PF_2 = 26,
++ IDMAC_PF_3 = 27,
++ IDMAC_PF_4 = 28,
++ IDMAC_PF_5 = 29,
++ IDMAC_PF_6 = 30,
++ IDMAC_PF_7 = 31,
++};
++
++/* Order significant! */
++enum ipu_channel_status {
++ IPU_CHANNEL_FREE,
++ IPU_CHANNEL_INITIALIZED,
++ IPU_CHANNEL_READY,
++ IPU_CHANNEL_ENABLED,
++};
++
++#define IPU_CHANNELS_NUM 32
++
++enum pixel_fmt {
++ /* 1 byte */
++ IPU_PIX_FMT_GENERIC,
++ IPU_PIX_FMT_RGB332,
++ IPU_PIX_FMT_YUV420P,
++ IPU_PIX_FMT_YUV422P,
++ IPU_PIX_FMT_YUV420P2,
++ IPU_PIX_FMT_YVU422P,
++ /* 2 bytes */
++ IPU_PIX_FMT_RGB565,
++ IPU_PIX_FMT_RGB666,
++ IPU_PIX_FMT_BGR666,
++ IPU_PIX_FMT_YUYV,
++ IPU_PIX_FMT_UYVY,
++ /* 3 bytes */
++ IPU_PIX_FMT_RGB24,
++ IPU_PIX_FMT_BGR24,
++ /* 4 bytes */
++ IPU_PIX_FMT_GENERIC_32,
++ IPU_PIX_FMT_RGB32,
++ IPU_PIX_FMT_BGR32,
++ IPU_PIX_FMT_ABGR32,
++ IPU_PIX_FMT_BGRA32,
++ IPU_PIX_FMT_RGBA32,
++};
++
++enum ipu_color_space {
++ IPU_COLORSPACE_RGB,
++ IPU_COLORSPACE_YCBCR,
++ IPU_COLORSPACE_YUV
++};
++
++/*
++ * Enumeration of IPU rotation modes
++ */
++enum ipu_rotate_mode {
++ /* Note the enum values correspond to BAM value */
++ IPU_ROTATE_NONE = 0,
++ IPU_ROTATE_VERT_FLIP = 1,
++ IPU_ROTATE_HORIZ_FLIP = 2,
++ IPU_ROTATE_180 = 3,
++ IPU_ROTATE_90_RIGHT = 4,
++ IPU_ROTATE_90_RIGHT_VFLIP = 5,
++ IPU_ROTATE_90_RIGHT_HFLIP = 6,
++ IPU_ROTATE_90_LEFT = 7,
++};
++
++struct ipu_platform_data {
++ unsigned int irq_base;
++};
++
++/*
++ * Enumeration of DI ports for ADC.
++ */
++enum display_port {
++ DISP0,
++ DISP1,
++ DISP2,
++ DISP3
++};
++
++struct idmac_video_param {
++ unsigned short in_width;
++ unsigned short in_height;
++ uint32_t in_pixel_fmt;
++ unsigned short out_width;
++ unsigned short out_height;
++ uint32_t out_pixel_fmt;
[...91263 lines suppressed...]
+ static hda_nid_t stac92hd83xxx_amp_nids[1] = {
+@@ -841,10 +842,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
+ };
+
+ static struct hda_verb stac92hd83xxx_core_init[] = {
+- /* start of config #1 */
+- { 0xe, AC_VERB_SET_CONNECT_SEL, 0x3},
+-
+- /* start of config #2 */
+ { 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
+ { 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
+ { 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
+@@ -885,8 +882,8 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {
+ static struct hda_verb stac925x_core_init[] = {
+ /* set dac0mux for dac converter */
+ { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
+- /* unmute and set max the selector */
+- { 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f },
++ /* mute the master volume */
++ { 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+ {}
+ };
+
+@@ -1138,6 +1135,8 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
+ };
+
+ static struct snd_kcontrol_new stac925x_mixer[] = {
++ HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
+ STAC_INPUT_SOURCE(1),
+ HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
+ HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
+@@ -1736,10 +1735,12 @@ static unsigned int ref92hd83xxx_pin_configs[14] = {
+
+ static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
+ [STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
++ [STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
+ };
+
+ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
+ [STAC_92HD83XXX_REF] = "ref",
++ [STAC_92HD83XXX_PWR_REF] = "mic-ref",
+ };
+
+ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
+@@ -1799,6 +1800,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
+ "HP dv5", STAC_HP_M4),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
+ "HP dv7", STAC_HP_M4),
++ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
++ "HP dv4", STAC_HP_DV5),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
+ "HP dv7", STAC_HP_M4),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
+@@ -3573,13 +3576,12 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
+ err = stac92xx_auto_fill_dac_nids(codec);
+ if (err < 0)
+ return err;
++ err = stac92xx_auto_create_multi_out_ctls(codec,
++ &spec->autocfg);
++ if (err < 0)
++ return err;
+ }
+
+- err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
+-
+- if (err < 0)
+- return err;
+-
+ /* setup analog beep controls */
+ if (spec->anabeep_nid > 0) {
+ err = stac92xx_auto_create_beep_ctls(codec,
+@@ -4753,7 +4755,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = {
+ static int patch_stac92hd83xxx(struct hda_codec *codec)
+ {
+ struct sigmatel_spec *spec;
++ hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
+ int err;
++ int num_dacs;
+
+ spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+ if (spec == NULL)
+@@ -4772,15 +4776,16 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
+ spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
+ spec->multiout.dac_nids = spec->dac_nids;
+
+- spec->init = stac92hd83xxx_core_init;
+- switch (codec->vendor_id) {
+- case 0x111d7605:
+- break;
+- default:
+- spec->num_pwrs--;
+- spec->init++; /* switch to config #2 */
+- }
+
++ /* set port 0xe to select the last DAC
++ */
++ num_dacs = snd_hda_get_connections(codec, 0x0e,
++ conn, STAC92HD83_DAC_COUNT + 1) - 1;
++
++ snd_hda_codec_write_cache(codec, 0xe, 0,
++ AC_VERB_SET_CONNECT_SEL, num_dacs);
++
++ spec->init = stac92hd83xxx_core_init;
+ spec->mixer = stac92hd83xxx_mixer;
+ spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
+ spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
+@@ -4806,6 +4811,15 @@ again:
+ return err;
+ }
+
++ switch (codec->vendor_id) {
++ case 0x111d7604:
++ case 0x111d7605:
++ if (spec->board_config == STAC_92HD83XXX_PWR_REF)
++ break;
++ spec->num_pwrs = 0;
++ break;
++ }
++
+ err = stac92xx_parse_auto_config(codec, 0x1d, 0);
+ if (!err) {
+ if (spec->board_config < 0) {
+diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
+index e9e829e..18c7c91 100644
+--- a/sound/pci/oxygen/virtuoso.c
++++ b/sound/pci/oxygen/virtuoso.c
+@@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip)
+ if (chip->uart_input_count >= 2 &&
+ chip->uart_input[chip->uart_input_count - 2] == 'O' &&
+ chip->uart_input[chip->uart_input_count - 1] == 'K') {
+- printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:");
++ printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n");
+ print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+ chip->uart_input, chip->uart_input_count);
+ chip->uart_input_count = 0;
+@@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = {
+ .dac_channels = 8,
+ .dac_volume_min = 0x0f,
+ .dac_volume_max = 0xff,
++ .misc_flags = OXYGEN_MISC_MIDI,
+ .function_flags = OXYGEN_FUNCTION_2WIRE,
+ .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+ .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
+index 1fac5ef..3dcdc4e 100644
+--- a/sound/soc/atmel/atmel-pcm.c
++++ b/sound/soc/atmel/atmel-pcm.c
+@@ -44,8 +44,6 @@
+ #include <sound/pcm_params.h>
+ #include <sound/soc.h>
+
+-#include <mach/hardware.h>
+-
+ #include "atmel-pcm.h"
+
+
+diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
+index bcec3f6..acf39a6 100644
+--- a/sound/soc/fsl/mpc8610_hpcd.c
++++ b/sound/soc/fsl/mpc8610_hpcd.c
+@@ -183,16 +183,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
+ };
+
+ /**
+- * mpc8610_hpcd_machine: ASoC machine data
+- */
+-static struct snd_soc_card mpc8610_hpcd_machine = {
+- .probe = mpc8610_hpcd_machine_probe,
+- .remove = mpc8610_hpcd_machine_remove,
+- .name = "MPC8610 HPCD",
+- .num_links = 1,
+-};
+-
+-/**
+ * mpc8610_hpcd_probe: OF probe function for the fabric driver
+ *
+ * This function gets called when an SSI node is found in the device tree.
+@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
+ machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */
+ machine_data->dai.ops = &mpc8610_hpcd_ops;
+
+- mpc8610_hpcd_machine.dai_link = &machine_data->dai;
++ machine_data->machine.probe = mpc8610_hpcd_machine_probe;
++ machine_data->machine.remove = mpc8610_hpcd_machine_remove;
++ machine_data->machine.name = "MPC8610 HPCD";
++ machine_data->machine.num_links = 1;
++ machine_data->machine.dai_link = &machine_data->dai;
+
+ /* Allocate a new audio platform device structure */
+ sound_device = platform_device_alloc("soc-audio", -1);
+@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
+ goto error;
+ }
+
+- machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
++ machine_data->sound_devdata.card = &machine_data->machine;
+ machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
+ machine_data->machine.platform = &fsl_soc_platform;
+
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- kernel.spec 26 Jan 2009 07:19:13 -0000 1.1231
+++ kernel.spec 26 Jan 2009 21:46:33 -0000 1.1232
@@ -1006,7 +1006,7 @@
done
%endif
-#ApplyPatch git-linus.diff
+ApplyPatch git-linus.diff
# This patch adds a "make nonint_oldconfig" which is non-interactive and
# also gives a list of missing options at the end. Useful for automated
@@ -1172,7 +1172,7 @@
ApplyPatch linux-2.6-net-tulip-interrupt.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+#ApplyPatch drm-next.patch
ApplyPatch drm-modesetting-radeon.patch
#ApplyPatch drm-nouveau.patch
@@ -1772,6 +1772,11 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
+- Update git-linus.diff to bf50c903faba4ec7686ee8a570ac384b0f20814d.
+- drm-next.patch merged.
+- linux-2.6.28-sunrpc-ipv6-rpcbind.patch: update for Kconfig moves.
+
* Sat Jan 24 2009 Hans de Goede <hdegoede at redhat.com>
- Fix atk0110 sensor numbering
linux-2.6.28-sunrpc-ipv6-rpcbind.patch:
Index: linux-2.6.28-sunrpc-ipv6-rpcbind.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.28-sunrpc-ipv6-rpcbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.28-sunrpc-ipv6-rpcbind.patch 23 Jan 2009 20:19:55 -0000 1.1
+++ linux-2.6.28-sunrpc-ipv6-rpcbind.patch 26 Jan 2009 21:46:33 -0000 1.2
@@ -1,7 +1,28 @@
-diff -up linux-2.6.28.i686/fs/Kconfig.save linux-2.6.28.i686/fs/Kconfig
---- linux-2.6.28.i686/fs/Kconfig.save 2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/fs/Kconfig 2009-01-23 14:15:31.000000000 -0500
-@@ -1401,28 +1401,6 @@ config SUNRPC_XPRT_RDMA
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index 64f1c31..cc3bf45 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -56,12 +56,11 @@ unsigned long nlmsvc_timeout;
+ * If the kernel has IPv6 support available, always listen for
+ * both AF_INET and AF_INET6 requests.
+ */
+-#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \
+- defined(CONFIG_SUNRPC_REGISTER_V4)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ static const sa_family_t nlmsvc_family = AF_INET6;
+-#else /* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
++#else /* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
+ static const sa_family_t nlmsvc_family = AF_INET;
+-#endif /* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
++#endif /* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
+
+ /*
+ * These can be set at insmod time (useful for NFS as root filesystem),
+diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
+index eda4a7a..d143c05 100644
+--- a/net/sunrpc/Kconfig
++++ b/net/sunrpc/Kconfig
+@@ -18,28 +18,6 @@ config SUNRPC_XPRT_RDMA
If unsure, say N.
@@ -30,29 +51,11 @@
config RPCSEC_GSS_KRB5
tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
depends on SUNRPC && EXPERIMENTAL
-diff -up linux-2.6.28.i686/fs/lockd/svc.c.save linux-2.6.28.i686/fs/lockd/svc.c
---- linux-2.6.28.i686/fs/lockd/svc.c.save 2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/fs/lockd/svc.c 2009-01-23 14:15:31.000000000 -0500
-@@ -56,12 +56,11 @@ unsigned long nlmsvc_timeout;
- * If the kernel has IPv6 support available, always listen for
- * both AF_INET and AF_INET6 requests.
- */
--#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \
-- defined(CONFIG_SUNRPC_REGISTER_V4)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- static const sa_family_t nlmsvc_family = AF_INET6;
--#else /* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
-+#else /* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
- static const sa_family_t nlmsvc_family = AF_INET;
--#endif /* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
-+#endif /* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
-
- /*
- * These can be set at insmod time (useful for NFS as root filesystem),
-diff -up linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c
---- linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save 2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c 2009-01-23 14:14:41.000000000 -0500
-@@ -124,12 +124,6 @@ static const struct sockaddr_in rpcb_ina
+diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
+index 03ae007..888c205 100644
+--- a/net/sunrpc/rpcb_clnt.c
++++ b/net/sunrpc/rpcb_clnt.c
+@@ -124,12 +124,6 @@ static const struct sockaddr_in rpcb_inaddr_loopback = {
.sin_port = htons(RPCBIND_PORT),
};
@@ -65,7 +68,7 @@
static struct rpc_clnt *rpcb_create_local(struct sockaddr *addr,
size_t addrlen, u32 version)
{
-@@ -176,9 +170,10 @@ static struct rpc_clnt *rpcb_create(char
+@@ -176,9 +170,10 @@ static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr,
return rpc_create(&args);
}
@@ -78,7 +81,7 @@
struct rpc_clnt *rpcb_clnt;
int result, error = 0;
-@@ -192,7 +187,7 @@ static int rpcb_register_call(struct soc
+@@ -192,7 +187,7 @@ static int rpcb_register_call(struct sockaddr *addr, size_t addrlen,
error = PTR_ERR(rpcb_clnt);
if (error < 0) {
@@ -87,7 +90,7 @@
"server (errno %d).\n", -error);
return error;
}
-@@ -254,9 +249,7 @@ int rpcb_register(u32 prog, u32 vers, in
+@@ -254,9 +249,7 @@ int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port)
if (port)
msg.rpc_proc = &rpcb_procedures2[RPCBPROC_SET];
@@ -98,7 +101,7 @@
}
/*
-@@ -284,9 +277,7 @@ static int rpcb_register_netid4(struct s
+@@ -284,9 +277,7 @@ static int rpcb_register_netid4(struct sockaddr_in *address_to_register,
if (port)
msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
@@ -109,7 +112,7 @@
}
/*
-@@ -318,9 +309,7 @@ static int rpcb_register_netid6(struct s
+@@ -318,9 +309,7 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
if (port)
msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
@@ -120,9 +123,10 @@
}
/**
-diff -up linux-2.6.28.i686/net/sunrpc/svc.c.save linux-2.6.28.i686/net/sunrpc/svc.c
---- linux-2.6.28.i686/net/sunrpc/svc.c.save 2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/net/sunrpc/svc.c 2009-01-23 14:14:41.000000000 -0500
+diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
+index c51fed4..5baac0a 100644
+--- a/net/sunrpc/svc.c
++++ b/net/sunrpc/svc.c
@@ -719,8 +719,6 @@ svc_exit_thread(struct svc_rqst *rqstp)
}
EXPORT_SYMBOL_GPL(svc_exit_thread);
@@ -132,7 +136,7 @@
/*
* Register an "inet" protocol family netid with the local
* rpcbind daemon via an rpcbind v4 SET request.
-@@ -741,6 +739,7 @@ static int __svc_rpcb_register4(const u3
+@@ -741,6 +739,7 @@ static int __svc_rpcb_register4(const u32 program, const u32 version,
.sin_port = htons(port),
};
char *netid;
@@ -140,7 +144,7 @@
switch (protocol) {
case IPPROTO_UDP:
-@@ -750,11 +749,20 @@ static int __svc_rpcb_register4(const u3
+@@ -750,11 +749,20 @@ static int __svc_rpcb_register4(const u32 program, const u32 version,
netid = RPCBIND_NETID_TCP;
break;
default:
@@ -164,7 +168,7 @@
}
/*
-@@ -777,6 +785,7 @@ static int __svc_rpcb_register6(const u3
+@@ -777,6 +785,7 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
.sin6_port = htons(port),
};
char *netid;
@@ -172,7 +176,7 @@
switch (protocol) {
case IPPROTO_UDP:
-@@ -786,11 +795,21 @@ static int __svc_rpcb_register6(const u3
+@@ -786,11 +795,21 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
netid = RPCBIND_NETID_TCP6;
break;
default:
@@ -196,7 +200,7 @@
}
/*
-@@ -799,7 +818,8 @@ static int __svc_rpcb_register6(const u3
+@@ -799,7 +818,8 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
* Returns zero on success; a negative errno value is returned
* if any error occurs.
*/
@@ -206,7 +210,7 @@
const sa_family_t family,
const unsigned short protocol,
const unsigned short port)
-@@ -808,13 +828,14 @@ static int __svc_register(const u32 prog
+@@ -808,13 +828,14 @@ static int __svc_register(const u32 program, const u32 version,
switch (family) {
case AF_INET:
@@ -223,7 +227,7 @@
/*
* Work around bug in some versions of Linux rpcbind
-@@ -825,33 +846,17 @@ static int __svc_register(const u32 prog
+@@ -825,33 +846,17 @@ static int __svc_register(const u32 program, const u32 version,
*/
__svc_rpcb_register4(program, version,
protocol, port);
@@ -264,7 +268,7 @@
/**
* svc_register - register an RPC service with the local portmapper
* @serv: svc_serv struct for the service to register
-@@ -886,8 +891,9 @@ int svc_register(const struct svc_serv *
+@@ -886,8 +891,9 @@ int svc_register(const struct svc_serv *serv, const unsigned short proto,
if (progp->pg_vers[i]->vs_hidden)
continue;
@@ -276,7 +280,7 @@
if (error < 0)
break;
}
-@@ -896,26 +902,10 @@ int svc_register(const struct svc_serv *
+@@ -896,26 +902,10 @@ int svc_register(const struct svc_serv *serv, const unsigned short proto,
return error;
}
@@ -307,7 +311,7 @@
static void __svc_unregister(const u32 program, const u32 version,
const char *progname)
{
-@@ -926,8 +916,6 @@ static void __svc_unregister(const u32 p
+@@ -926,8 +916,6 @@ static void __svc_unregister(const u32 program, const u32 version,
__func__, progname, version, error);
}
More information about the scm-commits
mailing list